share/g4/preInclude.ParticleID.py - revert change in...

share/g4/preInclude.ParticleID.py - revert change in SimulationJobOptions-00-06-09-09, as this branch is now only for 19.2.X.Y. share/specialConfig/preInclude.Rhadrons.py - updates obo Sascha Mehlhase. ATLASSIM-2275. Tagging: SimulationJobOptions-00-06-09-11 (SimulationJobOptions-00-06-09-11)

	* Tagging: SimulationJobOptions-00-06-09-11
	* share/g4/preInclude.ParticleID.py - revert change in
	SimulationJobOptions-00-06-09-09, as this branch is now only for
	19.2.X.Y.
	* share/specialConfig/preInclude.Rhadrons.py - updates obo Sascha
	Mehlhase. ATLASSIM-2275

2015-10-04  Zach Marshall <ZLMarshall@lbl.gov>

	* Tagging: SimulationJobOptions-00-06-09-10
	* Back-port of flux recording fragment

2015-09-21  John Chapman  <John.Chapman@cern.ch>

	* Tagging: SimulationJobOptions-00-06-09-09
	* share/g4/preInclude.ParticleID.py (particleid_setupcalos):
	remove call to LArG4GlobalOptions.SetDoCalibHitParticleID
	method. ATLASSIM-2070.

Simulation/SimulationJobOptions/share/g4/preInclude.G4FluxRecording.py

+include.block('SimulationJobOptions/preInclude.G4FluxRecording.py')
+## Set some sim flags to take care of Neutron BG
+from G4AtlasApps.SimFlags import simFlags
+simFlags.CalibrationRun.set_Off() # Turn off calibration hits (just a waste)
+simFlags.RecordFlux=True
+simFlags.NeutronTimeCut = int(2**31 - 1) #probably not required.
+simFlags.NeutronTimeCut.set_Off()
+simFlags.CavernBG = 'Write'
\ No newline at end of file

Simulation/SimulationJobOptions/share/g4/preInclude.ParticleID.py

@@ -9,13 +9,11 @@
 
 def particleid_setupcalos():
     from G4AtlasApps import AtlasG4Eng
-    #atlasG4log.info("ParticleID Setting new LArG4GlobalOptions")
     plar = AtlasG4Eng.G4Eng.Dict_DetConfig.get('PyLArG4RunControl')
     plar.LArG4GlobalOptions.SetDoCalibHitParticleID(True)
     plar.LArG4GlobalOptions.printMe()
     from G4AtlasApps.SimFlags import simFlags
     if not hasattr(simFlags, "ParticleID"):
-        #atlasG4log.info("ParticleID Setting new TileG4SimOptions")
         ptile = AtlasG4Eng.G4Eng.Dict_DetConfig.get('PyTileSimUtils')
         ptile.TileG4SimOptions.SetDoCalibHitParticleID(True)
         ptile.TileG4SimOptions.printMe()

Simulation/SimulationJobOptions/share/specialConfig/preInclude.Rhadrons.py

@@ -406,8 +406,8 @@ if simdict.has_key("DECAYS"):
   from PythiaRhad_i.PythiaRhad_iConf import PythiaRhad
   genSeq +=PythiaRhad()
   genSeq.PythiaRhad.useAtlasPythiaTune09=False
-  #genSeq.PythiaRhad.Tune_Name="PYTUNE_103"
-  genSeq.PythiaRhad.Tune_Name="ATLAS_20110003"
+  genSeq.PythiaRhad.Tune_Name="PYTUNE_103"
+  #genSeq.PythiaRhad.Tune_Name="ATLAS_20110003"
   genSeq.PythiaRhad.PythiaCommand += [
     "pyinit pylisti 12",
     "pyinit pylistf 1",
@@ -539,6 +539,7 @@ if simdict.has_key("DECAYS"):
     genSeq.PythiaRhad.boost_rh_to_rest_frame=True
     genSeq.PythiaRhad.rotate_rh=True
     genSeq.PythiaRhad.translate_rh_to_stopping_position=True
+    genSeq.PythiaRhad.EnableAfterInitialize=False # added for PythiaRhad_i-00-04-02
     genSeq.PythiaRhad.StoppingInput = [ [ 0,0,0,0,0,0 ] ]
     try:
       include("StoppingInput.txt")
@@ -580,22 +581,22 @@ if simdict.has_key("DECAYS"):
         "pydat3 mdme 1975 1 0",
         "pymssm imss 11 0"      # switch off gravitino, just to be sure we don't get gluon decay through it
       ]
-      if simdict.has_key("NOGLUINOLIGHTSQUARKDECAY"):
-        print "preInclude.Rhadrons: NOGLUINOLIGHTSQUARKDECAY"
-        genSeq.PythiaRhad.PythiaCommand += [
-          "pydat3 mdme 2000 1 0",
-          "pydat3 mdme 2001 1 0",
-          "pydat3 mdme 2002 1 0",
-          "pydat3 mdme 2003 1 0",
-          "pydat3 mdme 2004 1 0"
-        ]
-      if simdict.has_key("NOGLUINOTTBARDECAY"):
-        print "preInclude.Rhadrons: NOGLUINOTTBARDECAY"
-        genSeq.PythiaRhad.PythiaCommand += [
-          "pydat3 mdme 2005 1 0"
-        ]
-      if ('GBALLPROB' in globals()):
-        genSeq.PythiaRhad.GluinoBallProbability=GBALLPROB
+    if simdict.has_key("NOGLUINOLIGHTSQUARKDECAY"):
+      print "preInclude.Rhadrons: NOGLUINOLIGHTSQUARKDECAY"
+      genSeq.PythiaRhad.PythiaCommand += [
+        "pydat3 mdme 2000 1 0",
+        "pydat3 mdme 2001 1 0",
+        "pydat3 mdme 2002 1 0",
+        "pydat3 mdme 2003 1 0",
+        "pydat3 mdme 2004 1 0"
+      ]
+    if simdict.has_key("NOGLUINOTTBARDECAY"):
+      print "preInclude.Rhadrons: NOGLUINOTTBARDECAY"
+      genSeq.PythiaRhad.PythiaCommand += [
+        "pydat3 mdme 2005 1 0"
+      ]
+    if ('GBALLPROB' in globals()):
+      genSeq.PythiaRhad.GluinoBallProbability=GBALLPROB
   elif (simdict["CASE"]=='stop'):
     genSeq.PythiaRhad.RunGluinoHadrons=False
     genSeq.PythiaRhad.RunStopHadrons=True
@@ -606,6 +607,7 @@ if simdict.has_key("DECAYS"):
     genSeq.PythiaRhad.boost_rh_to_rest_frame=True
     genSeq.PythiaRhad.rotate_rh=True
     genSeq.PythiaRhad.translate_rh_to_stopping_position=True
+    genSeq.PythiaRhad.EnableAfterInitialize=False # added for PythiaRhad_i-00-04-02
     genSeq.PythiaRhad.StoppingInput = [ [ 0,0,0,0,0,0 ] ]
     try:
       include("StoppingInput.txt")
@@ -650,6 +652,7 @@ if simdict.has_key("DECAYS"):
     genSeq.PythiaRhad.boost_rh_to_rest_frame=True
     genSeq.PythiaRhad.rotate_rh=True
     genSeq.PythiaRhad.translate_rh_to_stopping_position=True
+    genSeq.PythiaRhad.EnableAfterInitialize=False # added for PythiaRhad_i-00-04-02
     genSeq.PythiaRhad.StoppingInput = [ [ 0,0,0,0,0,0 ] ]
     try:
       include("StoppingInput.txt")