* rename Particle_t enum Unknown to UnknownParticle, to coordinate with

src/programs/Simulation/GEN2HDDM/GEN2HDDM_jpsi.cc

@@ -352,7 +352,7 @@ void Usage(void)
 int Str2GeantParticleID(char *str)
 {
    if (strcmp(str, "unknown") == 0 || strcmp(str, "Unknown") == 0)
-      return Unknown;
+      return UnknownParticle;
    if (strcmp(str, "gamma") == 0 || strcmp(str, "Gamma") == 0)
       return Gamma;
    if (strcmp(str, "positron") == 0 || strcmp(str, "Positron") == 0)

src/programs/Simulation/GEN2HDDM/GEN2HDDM_new.cc

@@ -460,7 +460,7 @@ void Usage(void)
 int Str2GeantParticleID(char *str)
 {
    if (strcmp(str, "unknown") == 0 || strcmp(str, "Unknown") == 0)
-      return Unknown;
+      return UnknownParticle;
    if (strcmp(str, "gamma") == 0 || strcmp(str, "Gamma") == 0)
       return Gamma;
    if (strcmp(str, "positron") == 0 || strcmp(str, "Positron") == 0)

src/programs/Simulation/HDGeant/SConscript

@@ -27,7 +27,7 @@ else:
 			version_string = postgcc[0:vers_end]
 		else:
 			version_string = postgcc
-		versions = version_string.split('.')
+		versions = (version_string + ".0.0").split('.')
 		if int(versions[0]) >= 4 and int(versions[1]) >= 8 or int(versions[0]) >= 5:
 			env.PrependUnique(FORTRANFLAGS = ['-fno-aggressive-loop-optimizations'])
 

src/programs/Simulation/decay_evtgen/decay_evtgen.cc

@@ -39,7 +39,7 @@ using namespace std;
 
 typedef struct {
 	int id = -1;
-	Particle_t type = Unknown;
+	Particle_t type = UnknownParticle;
 	int pdgtype = -1;   
 	bool decayed = false;
 	TLorentzVector momentum;
@@ -228,7 +228,7 @@ void DecayParticles(hddm_s::HDDM * hddmevent, vector< gen_particle_info_t > &par
 			default:
 				myGenerator->generateDecay(parent);
 				if(parent->getNDaug() > 0) 
-					part.hddmProduct->setType(Unknown);  // zero out particle type info so that hdgeant won't decay the particle.  maybe there is a better way?
+					part.hddmProduct->setType(UnknownParticle);  // zero out particle type info so that hdgeant won't decay the particle.  maybe there is a better way?
 				break;
 		}
 

src/programs/Simulation/decay_evtgen/evtgenParticleString.h

@@ -8,7 +8,7 @@ inline static char* EvtGenOutputString(Particle_t p)
   p = RemapParticleID(p);
 
   switch (p) {
-  case Unknown:
+  case UnknownParticle:
     return (char*)"Unknown";
   case Gamma:
     return (char*)"gamma";

src/programs/Simulation/genEtaRegge/genEtaRegge.cc

@@ -370,7 +370,7 @@ void WriteEvent(unsigned int eventNumber,TLorentzVector &beam,TLorentzVector &ta
    for (unsigned int i=0;i<particle_vectors.size();i++,ps->mult++){
      Particle_t my_particle=particle_types[i];
      if(particle_decayed[i])
-	     ps->in[ps->mult].type = Unknown;  // zero out particle type info so that hdgeant won't decay the particle.  maybe there is a better way?
+	     ps->in[ps->mult].type = UnknownParticle;  // zero out particle type info so that hdgeant won't decay the particle.  maybe there is a better way?
 	 else
 	     ps->in[ps->mult].type = my_particle;
      ps->in[ps->mult].pdgtype = PDGtype(my_particle);
@@ -1191,7 +1191,7 @@ int main(int narg, char *argv[])
 		}
 
 		for (int j=0;j<num_decay_particles;j++){
-			if (particle_types[j]!=Unknown) {
+			if (particle_types[j]!=UnknownParticle) {
 				output_particle_vectors.push_back(*phase_space.GetDecay(j));
 				output_particle_types.push_back(particle_types[j]);
 			} else {

src/programs/Simulation/gen_ALP/gen_ALP.cc

@@ -328,8 +328,8 @@ void fini()
 	p2().setPz(v2.Z());
 	p2().setE(v2.T());
       } else if (str_decay == "a") {
-	ps(1).setType(Unknown);
-	ps(1).setPdgtype(PDGtype(Unknown));
+	ps(1).setType(UnknownParticle);
+	ps(1).setPdgtype(PDGtype(UnknownParticle));
 	ps(1).setId(2);
 	ps(1).setParentid(1);
 	ps(1).setMech(1);

src/programs/Simulation/gen_primex_eta_he4/gen_primex_eta_he4.cc

@@ -251,8 +251,8 @@ int main( int argc, char* argv[] ){
   TH1F * m_h_PFermi = new TH1F("PFermi", "", 1000, 0.0, 1.0);
   Particle_t t_target;
   Particle_t t_meson;
-  Particle_t t_spectator = Unknown;
-  Particle_t t_participant = Unknown;
+  Particle_t t_spectator = UnknownParticle;
+  Particle_t t_participant = UnknownParticle;
   if (ReadFile->GetConfigName("fermi_file") != "" && ReadFile->GetConfigName("participant") != "" && ReadFile->GetConfigName("spectator") != "") {
     m_Fermi_file = ReadFile->GetConfigName("fermi_file");
     cout << "Fermi_file " << m_Fermi_file << endl;

src/programs/Simulation/gen_schannel/gen_schannel.cc

@@ -232,7 +232,7 @@ void WriteEvent(unsigned int eventNumber, TLorentzVector &beam, float vert[3],
    origin->vy = vert[1];
    origin->vz = vert[2];
    // Final state particle
-   ps->in[0].type = Unknown;  // zero out particle type info so that hdgeant won't decay the particle.  maybe there is a better way?
+   ps->in[0].type = UnknownParticle;  // zero out particle type info so that hdgeant won't decay the particle.  maybe there is a better way?
    //ps->in[0].type = particle_type;
    ps->in[0].pdgtype = particle_type;
    ps->in[0].id = 0; /* unique value for this particle within the event */

src/programs/Simulation/gen_whizard/HddmOut.h

@@ -123,7 +123,7 @@ class HddmOut {
     } else if (evt.rxn != "a_to_e") {
 
       for (int i = 0; i < (evt.nGen -1); i ++) {
-	Particle_t TYPE = Unknown;
+	Particle_t TYPE = UnknownParticle;
 	if (evt.pdg[i] == 11) TYPE = Electron; 
 	if (evt.pdg[i] == -11) TYPE = Positron;
 	if (evt.pdg[i] == 22) TYPE = Gamma; 

src/programs/Simulation/geneta/bg_hddm.cc

@@ -181,7 +181,7 @@ int GEANT_to_PDG(Particle_t type)
 
    map<Particle_t, int>::iterator iter = GEANT_to_PDG_map.find(type);
    if (iter == GEANT_to_PDG_map.end())
-      type = Unknown;
+      type = UnknownParticle;
 
    return GEANT_to_PDG_map[type];
 }
@@ -192,7 +192,7 @@ int GEANT_to_PDG(Particle_t type)
 void InitializePDGGEANTmaps(void)
 {
    // Set values in GEANT_to_PDG_map first, then copy them into PDG_to_GEANT_map
-   GEANT_to_PDG_map[Unknown]   = 0;
+   GEANT_to_PDG_map[UnknownParticle]   = 0;
    GEANT_to_PDG_map[Gamma]     = 22;
    GEANT_to_PDG_map[Positron]  = -11;
    GEANT_to_PDG_map[Electron]  = 11;

src/programs/Simulation/genr8_2_hddm/genr8_2_hddm.cc

@@ -293,7 +293,7 @@ void Usage(void)
 int Str2GeantParticleID(char *str)
 {
    if (strcmp(str, "unknown") == 0 || strcmp(str, "Unknown") == 0)
-      return Unknown;
+      return UnknownParticle;
    if (strcmp(str, "gamma") == 0 || strcmp(str, "Gamma") == 0)
       return Gamma;
    if (strcmp(str, "positron") == 0 || strcmp(str, "Positron") == 0)