Merging changes in Analysis with changes in MonteCarlo. No conflicts

Merge branch 'master' of gitlab.engr.illinois.edu:rlongo/JZCaPA

MonteCarlo/config/config.cfg

@@ -13,25 +13,25 @@
 nModules:                      1
 
 mod1Type:                      4
-mod2Type:                      1
-mod3Type:                      2
-mod4Type:                      2
+mod2Type:                      4
+mod3Type:                      4
+mod4Type:                      1
 
 #Custom categorizes (use same syntax for modN -- w/ 5 being the max # of mods supported)
-mod1CasingThickness:           0.605
-mod1NStripsPerGap:             70
+mod1CasingThickness:           7.94
+mod1NStripsPerGap:             52
 # W and Pb are two currently enabled
 mod1AbsorberMat:               W
-mod1AbsorberThickness:         3.
-mod1AbsorberHeight:            180.0
+mod1AbsorberThickness:         10.2
+mod1AbsorberHeight:            182.8
 # AbsorberWdith is only used if NStripsPerGap = 0 -- ie absorber only mode
 mod1AbsorberWidth:             90.
 # CoreDiameter should never be 0 -- even in absorber only mode
-mod1CoreDiameter:              0.75
+mod1CoreDiameter:              1.5
 # Number of absorber layers assumed 1 fewer than # of radiators, unless 0 Radiators is entered, in which case the entire "module" is assumed to be an absorber block (like in test beam case when a Pb block is inserted)
-mod1NRadiators:                5
+mod1NRadiators:                12
 # make sure you account for core + 2*cladding thickness + any empty buffer space
-mod1RadiatorGapLength:         1.
+mod1RadiatorGapLength:         2.
 mod1CoreIndexRefraction:       1.46
 mod1Cladding:                  NO
 # only if cladding enabled
@@ -39,12 +39,12 @@ mod1CladdingThickness:         0.
 mod1CladdingIndexRefraction:   1.43
 
 #Custom categorizes (use same syntax for modN -- w/ 5 being the max # of mods supported)
-mod2CasingThickness:           0.605
+mod2CasingThickness:           7.94
 mod2NStripsPerGap:             52
 # W and Pb are two currently enabled
 mod2AbsorberMat:               W
-mod2AbsorberThickness:         16.0
-mod2AbsorberHeight:            180.0
+mod2AbsorberThickness:         10.2
+mod2AbsorberHeight:            182.8
 # AbsorberWidth is only used if NStripsPerGap = 0 -- ie absorber only mode
 mod2AbsorberWidth:             90.
 mod2CoreDiameter:              1.5
@@ -52,20 +52,20 @@ mod2CoreDiameter:              1.5
 mod2NRadiators:                12
 mod2RadiatorGapLength:         2
 mod2CoreIndexRefraction:       1.46
-mod2Cladding:                  YES
+mod2Cladding:                  NO
 # only if cladding enabled
 mod2CladdingThickness:         0.1
 mod2CladdingIndexRefraction:   1.43
 
 #Custom categorizes (use same syntax for modN -- w/ 5 being the max # of mods supported)
-mod3CasingThickness:           0.605
+mod3CasingThickness:           7.94
 mod3NStripsPerGap:             52
 # W and Pb are two currently enabled
 mod3AbsorberMat:               W
-mod3AbsorberThickness:         10.0
+mod3AbsorberThickness:         10.2
 # AbsorberWidth is only used if NStripsPerGap = 0 -- ie absorber only mode
 mod3AbsorberWidth:             90.
-mod3AbsorberHeight:            180.0
+mod3AbsorberHeight:            182.8
 mod3CoreDiameter:              1.5
 # Number of absorber layers assumed 1 fewer than # of radiators
 mod3NRadiators:                12

MonteCarlo/src/.#ModType

-mike@ui.32422:1531839901
\ No newline at end of file

MonteCarlo/src/PhysicsList.cc

@@ -330,30 +330,21 @@ StepMax* PhysicsList::GetStepMaxProcess()
 void PhysicsList::AddStepMax()
 {
   // Step limitation seen as a process
-#if G4VERSION_NUMBER >= 1030
-  auto theParticleIterator1 = GetParticleIterator();
-   
-  theParticleIterator1->reset();
-       
-  while ((*theParticleIterator1)()) {
-	
-    G4ParticleDefinition* particle = theParticleIterator1->value();
-# else
-	
+  
+    auto theParticleIterator = GetParticleIterator();
+
     theParticleIterator->reset();
   
     while ((*theParticleIterator)()) {
       G4ParticleDefinition* particle = theParticleIterator->value();
-#endif
       G4ProcessManager* pmanager = particle->GetProcessManager();
 
       if (fStepMaxProcess->IsApplicable(*particle) && !particle->IsShortLived())
-	{
-	  if (pmanager) pmanager ->AddDiscreteProcess(fStepMaxProcess);
-	}
-    }
-  }
-
+		{
+			if (pmanager) pmanager ->AddDiscreteProcess(fStepMaxProcess);
+		}
+   }
+ }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 

MonteCarlo/src/SharedData.cc

@@ -19,7 +19,8 @@ SharedData :: SharedData ()
   m_eventCounter = 0;     
   m_outputFileName = "myOut.root";
   m_configFileName = std::getenv("JZCaPA");
-  m_configFileName.replace(m_configFileName.length()-15,15,"JZCaPA/config/config.cfg");
+  m_configFileName.replace(m_configFileName.length()-15,15,"/JZCaPA/MonteCarlo/config/config.cfg");
+ // std::cout << "* current config file path * = " << m_configFileName << std::endl;
  // m_configFileName = "config/config.cfg";
   m_fout = NULL;
   m_tree = NULL;
@@ -37,6 +38,7 @@ SharedData :: SharedData ( const std::string& outputFileName,
   m_eventCounter = 0;
   m_outputFileName = outputFileName;
   m_configFileName = configFileName;
+ // std::cout << "* current config file path * = " << m_configFileName << std::endl;
   m_fout = NULL ;
   m_tree = NULL;
   m_config = NULL;
@@ -69,7 +71,7 @@ void SharedData :: Initialize()
   m_config       = new TEnv ();
   int success;
   success = m_config->ReadFile( m_configFileName.c_str(), EEnvLevel(0));
-  std::cout << " Config File " <<  m_configFileName.c_str() << " read successfully (0 = success) " << success << std::endl;
+  std::cout << " Config File path = " <<  m_configFileName.c_str() << " Check if read successfully (0 = success) " << success << std::endl;
 }
 
 /** @brief Function to add an output histo.

MonteCarlo/zdc.cc

@@ -67,7 +67,13 @@ int main(int argc,char** argv)
   // Choose the Random engine
   G4Random::setTheEngine(new CLHEP::RanecuEngine);
   // Get some arguments for RunManager
-  TString cfgName = "config/config.cfg";
+  
+  // Aric's fix for finding config file location
+  TString m_configFileName = std::getenv("JZCaPA");
+  m_configFileName.Replace(m_configFileName.Length()-15,15,"/JZCaPA/MonteCarlo/config/config.cfg");
+  TString cfgName = m_configFileName;
+  //std::cout << "config file path = " << cfgName << std::endl;
+ 
   
   if( argc == 4 ){
     TString arg;