diff --git a/Simulation/G4Atlas/G4AtlasApps/test/test_AtlasG4_cosmics_configuration.py b/Simulation/G4Atlas/G4AtlasApps/test/test_AtlasG4_cosmics_configuration.py
index c1648c11b13c213caf38da38b24b50802482655c..5f452ffb53d3fb29b079d59cb8fda427a59e3104 100755
--- a/Simulation/G4Atlas/G4AtlasApps/test/test_AtlasG4_cosmics_configuration.py
+++ b/Simulation/G4Atlas/G4AtlasApps/test/test_AtlasG4_cosmics_configuration.py
@@ -23,7 +23,7 @@ class TestAtlasG4Cosmics(unittest.TestCase):
'--CosmicFilterVolume', 'Calo',
'--CosmicFilterVolume2', 'NONE',
'--CosmicPtSlice', 'NONE',
- '--outputEVNT_COSMICSTRFile', 'test.TR.pool.root',
+ '--outputEVNT_TRFile', 'test.TR.pool.root',
'--beamType', 'cosmics',
# would otherwise fail due to missing HITS file:
'--outputFileValidation', 'False',
diff --git a/Simulation/ISF/ISF_Validation/test/ISF_Validation_TestConfiguration.xml b/Simulation/ISF/ISF_Validation/test/ISF_Validation_TestConfiguration.xml
index 31a31577b619a6832da3da6eab523190a6f957d2..7854451ab9786d6a58b2c21e60eee38bbc854c77 100644
--- a/Simulation/ISF/ISF_Validation/test/ISF_Validation_TestConfiguration.xml
+++ b/Simulation/ISF/ISF_Validation/test/ISF_Validation_TestConfiguration.xml
@@ -484,7 +484,7 @@
<jobTransform userJobId="G4_cosmics_1sim">
<doc>Running cosmic simulation transform from track records</doc>
<jobTransformJobName>G4_cosmics_1sim</jobTransformJobName>
- <jobTransformCmd>Sim_tf.py --simulator MC12G4 --inputEVNT_COSMICSFile /afs/cern.ch/atlas/offline/ProdData/16.6.X/16.6.7.Y/Cosmics.TR.pool.root --outputHITSFile testCosmics.HITS.pool.root --maxEvents -1 --randomSeed 1234 --DataRunNumber '10' --geometryVersion ATLAS-R2-2015-03-01-00_VALIDATION --conditionsTag OFLCOND-RUN12-SDR-19 --firstEvent 0 --physicsList QGSP_BERT --preInclude SimulationJobOptions/preInclude.Cosmics.py --beamType cosmics</jobTransformCmd>
+ <jobTransformCmd>Sim_tf.py --simulator MC12G4 --inputEVNT_TRFile /afs/cern.ch/atlas/offline/ProdData/16.6.X/16.6.7.Y/Cosmics.TR.pool.root --outputHITSFile testCosmics.HITS.pool.root --maxEvents -1 --randomSeed 1234 --DataRunNumber '10' --geometryVersion ATLAS-R2-2015-03-01-00_VALIDATION --conditionsTag OFLCOND-RUN12-SDR-19 --firstEvent 0 --physicsList QGSP_BERT --preInclude SimulationJobOptions/preInclude.Cosmics.py --beamType cosmics</jobTransformCmd>
<group>ISF_Validation_sim</group>
<queue>short</queue>
<!-- add in some tests later -->
@@ -493,7 +493,7 @@
<jobTransform userJobId="G4_cosmicsTR_1sim">
<doc>Running cosmic simulation transform from track records</doc>
<jobTransformJobName>G4_cosmicsTR_1sim</jobTransformJobName>
- <jobTransformCmd>Sim_tf.py --simulator MC12G4 --outputEVNT_COSMICSTRFile 'testCosmics.TR.pool.root' --outputHITSFile 'testCosmics.HITS.pool.root' --maxEvents '1500' --randomSeed '1234' --DataRunNumber '10' --physicsList 'QGSP_BERT' --CosmicFilterVolume 'Calo' --CosmicFilterVolume2 'NONE' --preInclude 'SimulationJobOptions/preInclude.Cosmics.py' --geometryVersion 'ATLAS-R2-2015-03-01-00_VALIDATION' --conditionsTag 'OFLCOND-RUN12-SDR-19' --CosmicPtSlice 'NONE' --beamType 'cosmics'</jobTransformCmd>
+ <jobTransformCmd>Sim_tf.py --simulator MC12G4 --outputEVNT_TRFile 'testCosmics.TR.pool.root' --outputHITSFile 'testCosmics.HITS.pool.root' --maxEvents '1500' --randomSeed '1234' --DataRunNumber '10' --physicsList 'QGSP_BERT' --CosmicFilterVolume 'Calo' --CosmicFilterVolume2 'NONE' --preInclude 'SimulationJobOptions/preInclude.Cosmics.py' --geometryVersion 'ATLAS-R2-2015-03-01-00_VALIDATION' --conditionsTag 'OFLCOND-RUN12-SDR-19' --CosmicPtSlice 'NONE' --beamType 'cosmics'</jobTransformCmd>
<group>ISF_Validation_sim</group>
<queue>medium</queue>
<!-- add in some tests later -->
diff --git a/Simulation/ISF/ISF_Validation/test/test_Sim_FullG4_CosmicSim.sh b/Simulation/ISF/ISF_Validation/test/test_Sim_FullG4_CosmicSim.sh
index 3d5684b363fa66973613c8d70fccfd76e3f77681..6555294ebf2f8d4baac7121a9acefb600484cd43 100755
--- a/Simulation/ISF/ISF_Validation/test/test_Sim_FullG4_CosmicSim.sh
+++ b/Simulation/ISF/ISF_Validation/test/test_Sim_FullG4_CosmicSim.sh
@@ -3,7 +3,7 @@
# art-description: Run cosmics simulation using ISF with the FullG4 simulator, generating events on-the-fly, using 2015 geometry and conditions
# art-type: grid
-Sim_tf.py --conditionsTag 'OFLCOND-RUN12-SDR-19' --physicsList 'QGSP_BERT' --truthStrategy 'MC12' --simulator 'FullG4' --outputEVNT_COSMICSTRFile 'test.TR.pool.root' --outputHITSFile 'test.HITS.pool.root' --maxEvents '1500' --randomSeed '1234' --DataRunNumber '10' --CosmicFilterVolume 'Calo' --CosmicFilterVolume2 'NONE' --preInclude 'SimulationJobOptions/preInclude.Cosmics.py' --geometryVersion 'ATLAS-R2-2015-03-01-00_VALIDATION' --CosmicPtSlice 'NONE' --beamType 'cosmics'
+Sim_tf.py --conditionsTag 'OFLCOND-RUN12-SDR-19' --physicsList 'QGSP_BERT' --truthStrategy 'MC12' --simulator 'FullG4' --outputEVNT_TRFile 'test.TR.pool.root' --outputHITSFile 'test.HITS.pool.root' --maxEvents '1500' --randomSeed '1234' --DataRunNumber '10' --CosmicFilterVolume 'Calo' --CosmicFilterVolume2 'NONE' --preInclude 'SimulationJobOptions/preInclude.Cosmics.py' --geometryVersion 'ATLAS-R2-2015-03-01-00_VALIDATION' --CosmicPtSlice 'NONE' --beamType 'cosmics'
SCRIPT_DIRECTORY=$1
PACKAGE=$2
diff --git a/Simulation/ISF/ISF_Validation/test/test_Sim_FullG4_CosmicSimTR.sh b/Simulation/ISF/ISF_Validation/test/test_Sim_FullG4_CosmicSimTR.sh
index 94361f1e65c1990e4e5a3a622aa8ce1e52348957..07829434443fc4b8e129c9b40b334486be02b70c 100755
--- a/Simulation/ISF/ISF_Validation/test/test_Sim_FullG4_CosmicSimTR.sh
+++ b/Simulation/ISF/ISF_Validation/test/test_Sim_FullG4_CosmicSimTR.sh
@@ -3,7 +3,7 @@
# art-description: Run cosmics simulation using ISF with the FullG4 simulator, using TrackRecords as input, using 2015 geometry and conditions
# art-type: grid
-Sim_tf.py --conditionsTag 'OFLCOND-RUN12-SDR-19' --physicsList 'QGSP_BERT' --truthStrategy 'MC12' --simulator 'FullG4' --inputEVNT_COSMICSFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/CommonInputs/Cosmics.TR.pool.root' --outputHITSFile 'test.HITS.pool.root' --maxEvents -1 --randomSeed 1234 --DataRunNumber '10' --geometryVersion 'ATLAS-R2-2015-03-01-00_VALIDATION' --firstEvent 0 --preInclude 'SimulationJobOptions/preInclude.Cosmics.py' --beamType 'cosmics'
+Sim_tf.py --conditionsTag 'OFLCOND-RUN12-SDR-19' --physicsList 'QGSP_BERT' --truthStrategy 'MC12' --simulator 'FullG4' --inputEVNT_TRFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/CommonInputs/Cosmics.TR.pool.root' --outputHITSFile 'test.HITS.pool.root' --maxEvents -1 --randomSeed 1234 --DataRunNumber '10' --geometryVersion 'ATLAS-R2-2015-03-01-00_VALIDATION' --firstEvent 0 --preInclude 'SimulationJobOptions/preInclude.Cosmics.py' --beamType 'cosmics'
SCRIPT_DIRECTORY=$1
PACKAGE=$2
diff --git a/Simulation/SimuJobTransforms/python/SimTransformUtils.py b/Simulation/SimuJobTransforms/python/SimTransformUtils.py
index d693795bbab9ac93d0521c4afd46a3a731003fea..27553bed7c6c74f035a066304ba4296ad0f85dae 100644
--- a/Simulation/SimuJobTransforms/python/SimTransformUtils.py
+++ b/Simulation/SimuJobTransforms/python/SimTransformUtils.py
@@ -59,10 +59,15 @@ def addRDOValidArguments(parser):
## @brief Add ISF transform substep
# @param overlayTransform If @c True use the tweaked version of in/outData for an overlay job
def addSimulationSubstep(executorSet, overlayTransform = False):
+ TRExe = athenaExecutor(name = 'TRtoHITS', skeletonFile = 'SimuJobTransforms/skeleton.EVGENtoHIT_ISF.py',
+ substep = 'simTRIn', tryDropAndReload = False, perfMonFile = 'ntuple.pmon.gz',
+ inData=['EVNT_TR'],
+ outData=['HITS','NULL'] )
+ executorSet.add(TRExe)
SimExe = athenaExecutor(name = 'EVNTtoHITS', skeletonFile = 'SimuJobTransforms/skeleton.EVGENtoHIT_ISF.py',
substep = 'sim', tryDropAndReload = False, perfMonFile = 'ntuple.pmon.gz',
- inData=['NULL','EVNT','EVNT_CAVERN','EVNT_COSMICS'],
- outData=['EVNT_CAVERNTR','EVNT_COSMICSTR','HITS','NULL'] )
+ inData=['NULL','EVNT'],
+ outData=['EVNT_TR','HITS','NULL'] )
if overlayTransform:
from PyJobTransforms.trfUtils import releaseIsOlderThan
if releaseIsOlderThan(20,3):
@@ -74,10 +79,14 @@ def addSimulationSubstep(executorSet, overlayTransform = False):
executorSet.add(SimExe)
def addAtlasG4Substep(executorSet):
+ executorSet.add(athenaExecutor(name = 'AtlasG4TfTRIn', skeletonFile = 'SimuJobTransforms/skeleton.EVGENtoHIT_MC12.py',
+ substep = 'simTRIn', tryDropAndReload = False,
+ inData=['EVNT_TR'],
+ outData=['HITS','NULL'] ))
executorSet.add(athenaExecutor(name = 'AtlasG4Tf', skeletonFile = 'SimuJobTransforms/skeleton.EVGENtoHIT_MC12.py',
- substep = 'sim', tryDropAndReload = False,
- inData=['NULL','EVNT','EVNT_CAVERN','EVNT_COSMICS'],
- outData=['EVNT_CAVERNTR','EVNT_COSMICSTR','HITS','NULL'] ))
+ substep = 'sim', tryDropAndReload = False,
+ inData=['NULL','EVNT'],
+ outData=['EVNT_TR','HITS','NULL'] ))
def addConfigurableSimSubstep(executorSet, confName, extraSkeleton, confSubStep, confInData, confOutData, confExtraRunargs, confRuntimeRunargs):
executorSet.add(athenaExecutor(name = confName, skeletonFile = extraSkeleton + ['SimuJobTransforms/skeleton.EVGENtoHIT_MC12.py'],
@@ -126,10 +135,19 @@ def appendAtlasG4Substep(trf):
addAtlasG4Substep(executor)
trf.appendToExecutorSet(executor)
+def appendConfigurableSimTRInSubstep(trf, confName = 'AtlasG4TfTRIn',
+ extraSkeleton = [], confSubstep = 'simTRIn',
+ confInData=['EVNT_TR'],
+ confOutData=['HITS','NULL'],
+ confExtraRunargs=None, confRuntimeRunargs=None ):
+ executor = set()
+ addConfigurableSimSubstep(executor, confName, extraSkeleton, confSubStep, confInData, confOutData, confExtraRunargs, confRuntimeRunargs )
+ trf.appendToExecutorSet(executor)
+
def appendConfigurableSimSubstep(trf, confName = 'AtlasG4Tf',
extraSkeleton = [], confSubstep = 'sim',
- confInData=['NULL','EVNT','EVNT_CAVERN','EVNT_COSMICS'],
- confOutData=['EVNT_CAVERNTR','EVNT_COSMICSTR','HITS','NULL'],
+ confInData=['NULL','EVNT'],
+ confOutData=['EVNT_TR','HITS','NULL'],
confExtraRunargs=None, confRuntimeRunargs=None ):
executor = set()
addConfigurableSimSubstep(executor, confName, extraSkeleton, confSubStep, confInData, confOutData, confExtraRunargs, confRuntimeRunargs )
diff --git a/Simulation/SimuJobTransforms/python/simTrfArgs.py b/Simulation/SimuJobTransforms/python/simTrfArgs.py
index 0e6fd040ccd955deb565a57e8f57e8d9a10a3058..f4a8912f3ad3b86ec3bb812674efb1c450c488e6 100644
--- a/Simulation/SimuJobTransforms/python/simTrfArgs.py
+++ b/Simulation/SimuJobTransforms/python/simTrfArgs.py
@@ -132,21 +132,16 @@ def addCosmicsTrfArgs(parser):
type=argFactory(argString),
help='Cosmic Pt Slice', group='Cosmics')
-## Add arguments used by simulation jobs which may write out TrackRecord files
+## Add arguments used by simulation jobs which may read in or write out TrackRecord files
def addTrackRecordArgs(parser):
parser.defineArgGroup('TrackRecords', 'TrackRecord related options')
- parser.add_argument('--inputEVNT_COSMICSFile', nargs='+',
+ parser.add_argument('--inputEVNT_TRFile', nargs='+',
type=argFactory(argPOOLFile, io='input'),
- help='Input Track Record file - sometimes used in Cosmic ray simulation jobs.', group='TrackRecords')
- parser.add_argument('--outputEVNT_COSMICSTRFile', nargs='+',
+ help='Input Track Record file - sometimes used in Cosmic ray or cavern background simulation jobs.', group='TrackRecords')
+ parser.add_argument('--outputEVNT_TRFile', nargs='+',
type=argFactory(argPOOLFile, io='output', type='evnt'),
- help='Output Track Record file - sometimes used in Cosmic ray simulation jobs.', group='TrackRecords')
- parser.add_argument('--inputEVNT_CAVERNFile', nargs='+',
- type=argFactory(argPOOLFile, io='input'),
- help='Input Track Record file - sometimes used in Cavern Background simulation jobs.', group='TrackRecords')
- parser.add_argument('--outputEVNT_CAVERNTRFile', nargs='+',
- type=argFactory(argPOOLFile, io='output', type='evnt'),
- help='Output Track Record file - sometimes used in Cavern Background simulation jobs.', group='TrackRecords')
+ help='Output Track Record file - sometimes used in Cosmic ray or cavern background simulation jobs.', group='TrackRecords')
+
## Add arguments used only by ISF-based simulation jobs
def addSim_tfArgs(parser):
diff --git a/Simulation/SimuJobTransforms/scripts/AtlasG4_tf.py b/Simulation/SimuJobTransforms/scripts/AtlasG4_tf.py
index 410df5517915090159bd6bafed38b2af9ba8d65b..a9fd126fb748936062300cacbc2acc16ce814490 100755
--- a/Simulation/SimuJobTransforms/scripts/AtlasG4_tf.py
+++ b/Simulation/SimuJobTransforms/scripts/AtlasG4_tf.py
@@ -26,7 +26,7 @@ from SimuJobTransforms.simTrfArgs import addForwardDetTrfArgs, addCosmicsTrfArgs
import PyJobTransforms.trfArgClasses as trfArgClasses
# Prodsys hack...
-ListOfDefaultPositionalKeys=['--AFPOn', '--ALFAOn', '--CosmicFilterVolume', '--CosmicFilterVolume2', '--CosmicPtSlice', '--DBRelease', '--DataRunNumber', '--FwdRegionOn', '--LucidOn', '--ZDCOn', '--amiConfig', '--amiMetadataTag', '--asetup', '--athena', '--athenaopts', '--beamType', '--checkEventCount', '--command', '--conditionsTag', '--enableLooperKiller', '--env', '--eventAcceptanceEfficiency', '--execOnly', '--firstEvent', '--geometryVersion', '--ignoreErrors', '--ignoreFiles', '--ignorePatterns', '--imf', '--inputEVNTFile', '--inputEVNT_CAVERNFile', '--inputEVNT_COSMICSFile', '--jobNumber', '--maxEvents', '--outputEVNT_CAVERNTRFile', '--outputEVNT_COSMICSTRFile', '--outputHITSFile', '--physicsList', '--postExec', '--postInclude', '--preExec', '--preInclude', '--randomSeed', '--reportName', '--reportType', '--runNumber', '--showGraph', '--showPath', '--showSteps', '--skipEvents', '--skipFileValidation', '--skipInputFileValidation', '--skipOutputFileValidation', '--tcmalloc', '--useISF']
+ListOfDefaultPositionalKeys=['--AFPOn', '--ALFAOn', '--CosmicFilterVolume', '--CosmicFilterVolume2', '--CosmicPtSlice', '--DBRelease', '--DataRunNumber', '--FwdRegionOn', '--LucidOn', '--ZDCOn', '--amiConfig', '--amiMetadataTag', '--asetup', '--athena', '--athenaopts', '--beamType', '--checkEventCount', '--command', '--conditionsTag', '--enableLooperKiller', '--env', '--eventAcceptanceEfficiency', '--execOnly', '--firstEvent', '--geometryVersion', '--ignoreErrors', '--ignoreFiles', '--ignorePatterns', '--imf', '--inputEVNTFile', '--inputEVNT_TRFile', '--jobNumber', '--maxEvents', '--outputEVNT_TRFile', '--outputHITSFile', '--physicsList', '--postExec', '--postInclude', '--preExec', '--preInclude', '--randomSeed', '--reportName', '--reportType', '--runNumber', '--showGraph', '--showPath', '--showSteps', '--skipEvents', '--skipFileValidation', '--skipInputFileValidation', '--skipOutputFileValidation', '--tcmalloc', '--useISF']
@stdTrfExceptionHandler
@sigUsrStackTrace
diff --git a/Simulation/SimuJobTransforms/scripts/Sim_tf.py b/Simulation/SimuJobTransforms/scripts/Sim_tf.py
index d0f3e60ecbffddefdc9e878b40861f0e8bcb7d14..02e220fe51074702f950cbd3ce8b0fba300149f0 100755
--- a/Simulation/SimuJobTransforms/scripts/Sim_tf.py
+++ b/Simulation/SimuJobTransforms/scripts/Sim_tf.py
@@ -26,7 +26,7 @@ from SimuJobTransforms.simTrfArgs import addForwardDetTrfArgs, addCosmicsTrfArgs
import PyJobTransforms.trfArgClasses as trfArgClasses
# Prodsys hack...
-ListOfDefaultPositionalKeys=['--AFPOn', '--ALFAOn', '--CosmicFilterVolume', '--CosmicFilterVolume2', '--CosmicPtSlice', '--DBRelease', '--DataRunNumber', '--FwdRegionOn', '--LucidOn', '--ZDCOn', '--amiConfig', '--amiMetadataTag', '--asetup', '--athena', '--athenaopts', '--beamType', '--checkEventCount', '--command', '--conditionsTag', '--enableLooperKiller', '--env', '--eventAcceptanceEfficiency', '--execOnly', '--firstEvent', '--geometryVersion', '--ignoreErrors', '--ignoreFiles', '--ignorePatterns', '--imf', '--inputEVNTFile', '--inputEVNT_CAVERNFile', '--inputEVNT_COSMICSFile', '--jobNumber', '--maxEvents', '--outputEVNT_CAVERNTRFile', '--outputEVNT_COSMICSTRFile', '--outputHITSFile', '--physicsList', '--postExec', '--postInclude', '--preExec', '--preInclude', '--randomSeed', '--reportName', '--reportType', '--runNumber', '--showGraph', '--showPath', '--showSteps', '--simulator', '--skipEvents', '--skipFileValidation', '--skipInputFileValidation', '--skipOutputFileValidation', '--tcmalloc', '--useISF']
+ListOfDefaultPositionalKeys=['--AFPOn', '--ALFAOn', '--CosmicFilterVolume', '--CosmicFilterVolume2', '--CosmicPtSlice', '--DBRelease', '--DataRunNumber', '--FwdRegionOn', '--LucidOn', '--ZDCOn', '--amiConfig', '--amiMetadataTag', '--asetup', '--athena', '--athenaopts', '--beamType', '--checkEventCount', '--command', '--conditionsTag', '--enableLooperKiller', '--env', '--eventAcceptanceEfficiency', '--execOnly', '--firstEvent', '--geometryVersion', '--ignoreErrors', '--ignoreFiles', '--ignorePatterns', '--imf', '--inputEVNTFile', '--inputEVNT_TRFile', '--jobNumber', '--maxEvents', '--outputEVNT_TRFile', '--outputHITSFile', '--physicsList', '--postExec', '--postInclude', '--preExec', '--preInclude', '--randomSeed', '--reportName', '--reportType', '--runNumber', '--showGraph', '--showPath', '--showSteps', '--simulator', '--skipEvents', '--skipFileValidation', '--skipInputFileValidation', '--skipOutputFileValidation', '--tcmalloc', '--useISF']
@stdTrfExceptionHandler
@sigUsrStackTrace
diff --git a/Simulation/SimuJobTransforms/share/skeleton.EVGENtoHIT_ISF.py b/Simulation/SimuJobTransforms/share/skeleton.EVGENtoHIT_ISF.py
index 45a4e93142df5d93bea90d432ef083807fe273d8..ff91e4b98cef3417cf6b4c1267e291981aa4b2d3 100644
--- a/Simulation/SimuJobTransforms/share/skeleton.EVGENtoHIT_ISF.py
+++ b/Simulation/SimuJobTransforms/share/skeleton.EVGENtoHIT_ISF.py
@@ -46,10 +46,8 @@ if hasattr(runArgs, "inputFile"):
# We don't expect both inputFile and inputEVNT*File to be specified
if hasattr(runArgs, "inputEVNTFile"):
setInputEvgenFileJobProperties( runArgs.inputEVNTFile )
-elif hasattr(runArgs, "inputEVNT_COSMICSFile"):
- setInputEvgenFileJobProperties( runArgs.inputEVNT_COSMICSFile )
-elif hasattr(runArgs, "inputEVNT_CAVERNFile"):
- setInputEvgenFileJobProperties( runArgs.inputEVNT_CAVERNFile )
+elif hasattr(runArgs, "inputEVNT_TRFile"):
+ setInputEvgenFileJobProperties( runArgs.inputEVNT_TRFile )
elif hasattr(runArgs, "inputEVNT_STOPPEDFile"):
setInputEvgenFileJobProperties( runArgs.inputEVNT_STOPPEDFile )
elif jobproperties.Beam.beamType.get_Value() == 'cosmics':
@@ -62,7 +60,7 @@ else:
## Handle cosmics configs
if jobproperties.Beam.beamType.get_Value() == 'cosmics':
simFlags.load_cosmics_flags()
- if hasattr(runArgs, "inputEVNT_COSMICSFile"):
+ if hasattr(runArgs, "inputEVNT_TRFile"):
if simFlags.CosmicFilterVolumeName.statusOn and simFlags.CosmicFilterVolumeName.get_Value() != "Muon":
atlasG4log.warning("Filtering was already done. Using CosmicFilterVolumeName=Muon rather than "
"provided value (%s)" % str(runArgs.CosmicFilterVolumeName))
@@ -110,10 +108,11 @@ if hasattr(runArgs, "inputEVNT_STOPPEDFile"):
include('SimulationJobOptions/preInclude.ReadStoppedParticles.py')
# Avoid command line preInclude for cavern background
-if hasattr(runArgs, "inputEVNT_CAVERNFile"):
- include('SimulationJobOptions/preInclude.G4ReadCavern.py')
-if hasattr(runArgs, "outputEVNT_CAVERNTRFile"):
- include('SimulationJobOptions/preInclude.G4WriteCavern.py')
+if jobproperties.Beam.beamType.get_Value() != 'cosmics':
+ if hasattr(runArgs, "inputEVNT_TRFile"):
+ include('SimulationJobOptions/preInclude.G4ReadCavern.py')
+ if hasattr(runArgs, "outputEVNT_TRFile"):
+ include('SimulationJobOptions/preInclude.G4WriteCavern.py')
# Avoid command line preInclude for event service
if hasattr(runArgs, "eventService") and runArgs.eventService:
@@ -219,11 +218,11 @@ elif hasattr(runArgs,'jobNumber'):
## Handle cosmics track record
from AthenaCommon.BeamFlags import jobproperties
if jobproperties.Beam.beamType.get_Value() == 'cosmics':
- if hasattr(runArgs, "inputEVNT_COSMICSFile"):
+ if hasattr(runArgs, "inputEVNT_TRFile"):
simFlags.ReadTR = athenaCommonFlags.PoolEvgenInput()[0]
else:
- if hasattr(runArgs, "outputEVNT_COSMICSTRFile"):
- simFlags.WriteTR = runArgs.outputEVNT_COSMICSTRFile
+ if hasattr(runArgs, "outputEVNT_TRFile"):
+ simFlags.WriteTR = runArgs.outputEVNT_TRFile
#include( 'CosmicGenerator/jobOptions_ConfigCosmicProd.py' )
## Add filters for non-cosmics simulation
diff --git a/Simulation/SimuJobTransforms/share/skeleton.EVGENtoHIT_MC12.py b/Simulation/SimuJobTransforms/share/skeleton.EVGENtoHIT_MC12.py
index b7d55349e538e1f37fa0a1466ed13422927c5b44..0c5bd7961fbace2a48ccde204347a9f6403b508e 100644
--- a/Simulation/SimuJobTransforms/share/skeleton.EVGENtoHIT_MC12.py
+++ b/Simulation/SimuJobTransforms/share/skeleton.EVGENtoHIT_MC12.py
@@ -44,10 +44,8 @@ if hasattr(runArgs, "inputFile"):
# We don't expect both inputFile and inputEVNT*File to be specified
if hasattr(runArgs, "inputEVNTFile"):
setInputEvgenFileJobProperties( runArgs.inputEVNTFile )
-elif hasattr(runArgs, "inputEVNT_COSMICSFile"):
- setInputEvgenFileJobProperties( runArgs.inputEVNT_COSMICSFile )
-elif hasattr(runArgs, "inputEVNT_CAVERNFile"):
- setInputEvgenFileJobProperties( runArgs.inputEVNT_CAVERNFile )
+elif hasattr(runArgs, "inputEVNT_TRFile"):
+ setInputEvgenFileJobProperties( runArgs.inputEVNT_TRFile )
elif hasattr(runArgs, "inputEVNT_STOPPEDFile"):
setInputEvgenFileJobProperties( runArgs.inputEVNT_STOPPEDFile )
elif jobproperties.Beam.beamType.get_Value() == 'cosmics':
@@ -60,7 +58,7 @@ else:
## Handle cosmics configs
if jobproperties.Beam.beamType.get_Value() == 'cosmics':
simFlags.load_cosmics_flags()
- if hasattr(runArgs, "inputEVNT_COSMICSFile"):
+ if hasattr(runArgs, "inputEVNT_TRFile"):
if simFlags.CosmicFilterVolumeName.statusOn and simFlags.CosmicFilterVolumeName.get_Value() != "Muon":
atlasG4log.warning("Filtering was already done. Using CosmicFilterVolumeName=Muon rather than "
"provided value (%s)" % str(runArgs.CosmicFilterVolumeName))
@@ -108,10 +106,11 @@ if hasattr(runArgs, "inputEVNT_STOPPEDFile"):
include('SimulationJobOptions/preInclude.ReadStoppedParticles.py')
# Avoid command line preInclude for cavern background
-if hasattr(runArgs, "inputEVNT_CAVERNFile"):
- include('SimulationJobOptions/preInclude.G4ReadCavern.py')
-if hasattr(runArgs, "outputEVNT_CAVERNTRFile"):
- include('SimulationJobOptions/preInclude.G4WriteCavern.py')
+if jobproperties.Beam.beamType.get_Value() != 'cosmics':
+ if hasattr(runArgs, "inputEVNT_TRFile"):
+ include('SimulationJobOptions/preInclude.G4ReadCavern.py')
+ if hasattr(runArgs, "outputEVNT_TRFile"):
+ include('SimulationJobOptions/preInclude.G4WriteCavern.py')
# Avoid command line preInclude for event service
if hasattr(runArgs, "eventService") and runArgs.eventService:
@@ -202,11 +201,11 @@ elif hasattr(runArgs,'jobNumber'):
## Handle cosmics track record
from AthenaCommon.BeamFlags import jobproperties
if jobproperties.Beam.beamType.get_Value() == 'cosmics':
- if hasattr(runArgs, "inputEVNT_COSMICSFile"):
+ if hasattr(runArgs, "inputEVNT_TRFile"):
simFlags.ReadTR = athenaCommonFlags.PoolEvgenInput()[0]
else:
- if hasattr(runArgs, "outputEVNT_COSMICSTRFile"):
- simFlags.WriteTR = runArgs.outputEVNT_COSMICSTRFile
+ if hasattr(runArgs, "outputEVNT_TRFile"):
+ simFlags.WriteTR = runArgs.outputEVNT_TRFile
include( 'CosmicGenerator/jobOptions_ConfigCosmicProd.py' )
diff --git a/Simulation/Tests/SimCoreTests/test/SimCoreTests_TestConfiguration.xml b/Simulation/Tests/SimCoreTests/test/SimCoreTests_TestConfiguration.xml
index 0aadcd25120daa1f65d5342256626787fc1ab86c..6c30792c6257228e8dc2d987250cefc5eed3e237 100644
--- a/Simulation/Tests/SimCoreTests/test/SimCoreTests_TestConfiguration.xml
+++ b/Simulation/Tests/SimCoreTests/test/SimCoreTests_TestConfiguration.xml
@@ -459,7 +459,7 @@
<jobTransform userJobId="CavernBg_EVNT2TR">
<doc>Reading min bias events, write cavern background track records</doc>
<jobTransformJobName>CavernBg_EVNT2TR</jobTransformJobName>
- <jobTransformCmd>AtlasG4_tf.py --inputEVNTFile '/afs/cern.ch/atlas/offline/ProdData/16.6.X/16.6.7.Y/minbias_Inelastic_low-pythia8-7000.evgen.pool.root' --outputHITSFile 'discard.HITS.pool.root' --outputEVNT_CAVERNTRFile 'test.EVNT.pool.root' --maxEvents '2' --skipEvents '0' --randomSeed '5678' --geometryVersion 'ATLAS-R2-2015-03-01-00_VALIDATION' --conditionsTag 'OFLCOND-RUN12-SDR-19' --DataRunNumber '222525' --physicsList 'QGSP_BERT_HP' --postInclude 'PyJobTransforms/UseFrontier.py'
+ <jobTransformCmd>AtlasG4_tf.py --inputEVNTFile '/afs/cern.ch/atlas/offline/ProdData/16.6.X/16.6.7.Y/minbias_Inelastic_low-pythia8-7000.evgen.pool.root' --outputHITSFile 'discard.HITS.pool.root' --outputEVNT_TRFile 'test.EVNT.pool.root' --maxEvents '2' --skipEvents '0' --randomSeed '5678' --geometryVersion 'ATLAS-R2-2015-03-01-00_VALIDATION' --conditionsTag 'OFLCOND-RUN12-SDR-19' --DataRunNumber '222525' --physicsList 'QGSP_BERT_HP' --postInclude 'PyJobTransforms/UseFrontier.py'
</jobTransformCmd>
<group>SimCoreJobTransformTests</group>
<queue>medium</queue>
@@ -608,7 +608,7 @@
<jobTransform userJobId="CosmicSimTR">
<doc>Running cosmic simulation transform from track records</doc>
<jobTransformJobName>CosmicSimTR</jobTransformJobName>
- <jobTransformCmd>AtlasG4_tf.py --inputEVNT_COSMICSFile '/afs/cern.ch/atlas/offline/ProdData/16.6.X/16.6.7.Y/Cosmics.TR.pool.root' --outputHITSFile 'test.HITS.pool.root' --maxEvents '-1' --randomSeed '1234' --geometryVersion 'ATLAS-R2-2015-03-01-00_VALIDATION' --conditionsTag 'OFLCOND-RUN12-SDR-19' --physicsList 'FTFP_BERT' --DataRunNumber '222525' --firstEvent '0' --beamType 'cosmics' --postInclude 'PyJobTransforms/UseFrontier.py'
+ <jobTransformCmd>AtlasG4_tf.py --inputEVNT_TRFile '/afs/cern.ch/atlas/offline/ProdData/16.6.X/16.6.7.Y/Cosmics.TR.pool.root' --outputHITSFile 'test.HITS.pool.root' --maxEvents '-1' --randomSeed '1234' --geometryVersion 'ATLAS-R2-2015-03-01-00_VALIDATION' --conditionsTag 'OFLCOND-RUN12-SDR-19' --physicsList 'FTFP_BERT' --DataRunNumber '222525' --firstEvent '0' --beamType 'cosmics' --postInclude 'PyJobTransforms/UseFrontier.py'
</jobTransformCmd>
<group>SimCoreJobTransformTests</group>
<queue>short</queue>
@@ -1566,7 +1566,7 @@
<jobTransform userJobId="CosmicSim">
<doc>Running cosmic simulation transform</doc>
<jobTransformJobName>CosmicSim</jobTransformJobName>
- <jobTransformCmd>AtlasG4_tf.py --outputHITSFile 'test.HITS.pool.root' --maxEvents '1500' --randomSeed '1234' --DataRunNumber '222525' --CosmicFilterVolume 'Calo' --CosmicFilterVolume2 'NONE' --geometryVersion 'ATLAS-R2-2015-03-01-00_VALIDATION' --conditionsTag 'OFLCOND-RUN12-SDR-19' --physicsList 'FTFP_BERT' --CosmicPtSlice 'NONE' --outputEVNT_COSMICSTRFile 'test.TR.pool.root' --beamType 'cosmics' --postInclude 'PyJobTransforms/UseFrontier.py'
+ <jobTransformCmd>AtlasG4_tf.py --outputHITSFile 'test.HITS.pool.root' --maxEvents '1500' --randomSeed '1234' --DataRunNumber '222525' --CosmicFilterVolume 'Calo' --CosmicFilterVolume2 'NONE' --geometryVersion 'ATLAS-R2-2015-03-01-00_VALIDATION' --conditionsTag 'OFLCOND-RUN12-SDR-19' --physicsList 'FTFP_BERT' --CosmicPtSlice 'NONE' --outputEVNT_TRFile 'test.TR.pool.root' --beamType 'cosmics' --postInclude 'PyJobTransforms/UseFrontier.py'
</jobTransformCmd>
<group>SimCoreJobTransformTests</group>
<queue>short</queue>
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_CavernBg_EVNT2TR.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_CavernBg_EVNT2TR.sh
index 09a22ce1db69dd8e17522f0f35fb78cd8bcb7358..c9cb0e2c64a95b27bfba58beb79f712f64700b3b 100755
--- a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_CavernBg_EVNT2TR.sh
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_CavernBg_EVNT2TR.sh
@@ -3,7 +3,7 @@
# art-description: Run simulation outside ISF, reading min bias events, write cavern background track records, using 2015 geometry and conditions
# art-type: grid
-AtlasG4_tf.py --inputEVNTFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/minbias_Inelastic_low-pythia8-7000.evgen.pool.root' --outputHITSFile 'discard.HITS.pool.root' --outputEVNT_CAVERNTRFile 'test.EVNT.pool.root' --maxEvents '2' --skipEvents '0' --randomSeed '5678' --geometryVersion 'ATLAS-R2-2015-03-01-00_VALIDATION' --conditionsTag 'OFLCOND-RUN12-SDR-19' --DataRunNumber '222525' --physicsList 'QGSP_BERT_HP' --postInclude 'PyJobTransforms/UseFrontier.py'
+AtlasG4_tf.py --inputEVNTFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/minbias_Inelastic_low-pythia8-7000.evgen.pool.root' --outputHITSFile 'discard.HITS.pool.root' --outputEVNT_TRFile 'test.EVNT.pool.root' --maxEvents '2' --skipEvents '0' --randomSeed '5678' --geometryVersion 'ATLAS-R2-2015-03-01-00_VALIDATION' --conditionsTag 'OFLCOND-RUN12-SDR-19' --DataRunNumber '222525' --physicsList 'QGSP_BERT_HP' --postInclude 'PyJobTransforms/UseFrontier.py'
SCRIPT_DIRECTORY=$1
PACKAGE=$2
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_CosmicSim.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_CosmicSim.sh
index dc690fb9bac707c6932b3e9eea82b6653f772f21..70d2f7b26d15f238d53672307f67c7fdb28447fd 100755
--- a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_CosmicSim.sh
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_CosmicSim.sh
@@ -3,7 +3,7 @@
# art-description: Run cosmics simulation outside ISF, generating events on-the-fly, using 2015 geometry and conditions
# art-type: grid
-AtlasG4_tf.py --outputHITSFile 'test.HITS.pool.root' --maxEvents '1500' --randomSeed '1234' --DataRunNumber '222525' --CosmicFilterVolume 'Calo' --CosmicFilterVolume2 'NONE' --geometryVersion 'ATLAS-R2-2015-03-01-00_VALIDATION' --conditionsTag 'OFLCOND-RUN12-SDR-19' --physicsList 'FTFP_BERT' --CosmicPtSlice 'NONE' --outputEVNT_COSMICSTRFile 'test.TR.pool.root' --beamType 'cosmics' --postInclude 'PyJobTransforms/UseFrontier.py'
+AtlasG4_tf.py --outputHITSFile 'test.HITS.pool.root' --maxEvents '1500' --randomSeed '1234' --DataRunNumber '222525' --CosmicFilterVolume 'Calo' --CosmicFilterVolume2 'NONE' --geometryVersion 'ATLAS-R2-2015-03-01-00_VALIDATION' --conditionsTag 'OFLCOND-RUN12-SDR-19' --physicsList 'FTFP_BERT' --CosmicPtSlice 'NONE' --outputEVNT_TRFile 'test.TR.pool.root' --beamType 'cosmics' --postInclude 'PyJobTransforms/UseFrontier.py'
SCRIPT_DIRECTORY=$1
PACKAGE=$2
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_CosmicSimTR.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_CosmicSimTR.sh
index 9b393ee738c4a9a9cc00a1ca3aefd5d79517007b..e11176404b271460ec08f12cbc05ef423ff926d1 100755
--- a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_CosmicSimTR.sh
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_CosmicSimTR.sh
@@ -3,7 +3,7 @@
# art-description: Run cosmics simulation outside ISF, using TrackRecords as input, using 2015 geometry and conditions
# art-type: grid
-AtlasG4_tf.py --inputEVNT_COSMICSFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/CommonInputs/Cosmics.TR.pool.root' --outputHITSFile 'test.HITS.pool.root' --maxEvents '-1' --randomSeed '1234' --geometryVersion 'ATLAS-R2-2015-03-01-00_VALIDATION' --conditionsTag 'OFLCOND-RUN12-SDR-19' --physicsList 'FTFP_BERT' --DataRunNumber '222525' --firstEvent '0' --beamType 'cosmics' --postInclude 'PyJobTransforms/UseFrontier.py'
+AtlasG4_tf.py --inputEVNT_TRFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/CommonInputs/Cosmics.TR.pool.root' --outputHITSFile 'test.HITS.pool.root' --maxEvents '-1' --randomSeed '1234' --geometryVersion 'ATLAS-R2-2015-03-01-00_VALIDATION' --conditionsTag 'OFLCOND-RUN12-SDR-19' --physicsList 'FTFP_BERT' --DataRunNumber '222525' --firstEvent '0' --beamType 'cosmics' --postInclude 'PyJobTransforms/UseFrontier.py'
SCRIPT_DIRECTORY=$1
PACKAGE=$2