From bd086a8d69e2e68e7564344eee4bde1bbc81ecbb Mon Sep 17 00:00:00 2001
From: John Derek Chapman <chapman@hep.phy.cam.ac.uk>
Date: Mon, 3 Oct 2016 15:24:13 +0200
Subject: [PATCH] share/skeleton.HITtoRDO.py: add missing check for the
presence of HGTDOn in runArgs. ATLASSIM-2908. Tagging:
SimuJobTransforms-00-31-18 (SimuJobTransforms-00-31-18)
* share/skeleton.HITtoRDO.py: add missing check for the presence
of HGTDOn in runArgs. ATLASSIM-2908
* Tagging: SimuJobTransforms-00-31-18
2016-09-29 Marcelo Vogel <marcelo.vogel@cern.ch>
* share/skeleton.EVGENtoHIT_MC12.py: include AthenaMP_EventService.py
* Tagging: SimuJobTransforms-00-31-17
2016-09-02 John Chapman <John.Chapman@cern.ch>
* test/test_digi_mergeHIT, test/test_digi_unmergeHIT,
test/test_diffmerged, test/test_digi_mu, test/test_pileup - use
skip_if_AthSimulation.sh from ISF_Validation to conveniently
disable individual ATN tests for AthSimulation builds.
* Tagging: SimuJobTransforms-00-31-16
2016-09-01 Marcelo Vogel <marcelo.vogel@cern.ch>
...
(Long ChangeLog diff - truncated)
Former-commit-id: e4f879a4368ea133c99a3ffc997bd104bafe0828
---
Simulation/SimuJobTransforms/python/simTrfArgs.py | 3 +++
Simulation/SimuJobTransforms/share/skeleton.EVGENtoHIT_ISF.py | 4 ++++
.../SimuJobTransforms/share/skeleton.EVGENtoHIT_MC12.py | 4 ++++
Simulation/SimuJobTransforms/share/skeleton.HITtoRDO.py | 2 +-
Simulation/SimuJobTransforms/test/test_diffmerged | 2 +-
Simulation/SimuJobTransforms/test/test_digi_mergeHIT | 2 +-
Simulation/SimuJobTransforms/test/test_digi_mu | 2 +-
Simulation/SimuJobTransforms/test/test_digi_unmergeHIT | 2 +-
Simulation/SimuJobTransforms/test/test_pileup | 4 ++--
9 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/Simulation/SimuJobTransforms/python/simTrfArgs.py b/Simulation/SimuJobTransforms/python/simTrfArgs.py
index eb6d7d30ef6..a6aa6cc872d 100644
--- a/Simulation/SimuJobTransforms/python/simTrfArgs.py
+++ b/Simulation/SimuJobTransforms/python/simTrfArgs.py
@@ -200,6 +200,9 @@ def addCommonSimDigTrfArgs(parser):
parser.add_argument('--jobNumber',
type=argFactory(argInt),
help='The number of this job in the current RunDependentSimulation task.', group='SimDigi')
+ parser.add_argument('--eventService',
+ type=argFactory(argBool),
+ help='Switch AthenaMP to the Event Service configuration', group='SimDigi')
def addHITSMergeArgs(parser):
# Use arggroup to get these arguments in their own sub-section (of --help)
diff --git a/Simulation/SimuJobTransforms/share/skeleton.EVGENtoHIT_ISF.py b/Simulation/SimuJobTransforms/share/skeleton.EVGENtoHIT_ISF.py
index a117c58a341..11e99cb7155 100644
--- a/Simulation/SimuJobTransforms/share/skeleton.EVGENtoHIT_ISF.py
+++ b/Simulation/SimuJobTransforms/share/skeleton.EVGENtoHIT_ISF.py
@@ -115,6 +115,10 @@ if hasattr(runArgs, "inputEVNT_CAVERNFile"):
if hasattr(runArgs, "outputEVNT_CAVERNTRFile"):
include('SimulationJobOptions/preInclude.G4WriteCavern.py')
+# Avoid command line preInclude for event service
+if hasattr(runArgs, "eventService") and runArgs.eventService:
+ include('AthenaMP/AthenaMP_EventService.py')
+
from ISF_Config.ISF_jobProperties import ISF_Flags
if jobproperties.Beam.beamType.get_Value() == 'cosmics':
ISF_Flags.Simulator.set_Value_and_Lock('CosmicsG4')
diff --git a/Simulation/SimuJobTransforms/share/skeleton.EVGENtoHIT_MC12.py b/Simulation/SimuJobTransforms/share/skeleton.EVGENtoHIT_MC12.py
index 85952836c6a..2380799e4a6 100644
--- a/Simulation/SimuJobTransforms/share/skeleton.EVGENtoHIT_MC12.py
+++ b/Simulation/SimuJobTransforms/share/skeleton.EVGENtoHIT_MC12.py
@@ -112,6 +112,10 @@ if hasattr(runArgs, "inputEVNT_CAVERNFile"):
include('SimulationJobOptions/preInclude.G4ReadCavern.py')
if hasattr(runArgs, "outputEVNT_CAVERNTRFile"):
include('SimulationJobOptions/preInclude.G4WriteCavern.py')
+
+# Avoid command line preInclude for event service
+if hasattr(runArgs, "eventService") and runArgs.eventService:
+ include('AthenaMP/AthenaMP_EventService.py')
if jobproperties.Beam.beamType.get_Value() == 'cosmics':
include('SimulationJobOptions/preInclude.Cosmics.py')
diff --git a/Simulation/SimuJobTransforms/share/skeleton.HITtoRDO.py b/Simulation/SimuJobTransforms/share/skeleton.HITtoRDO.py
index 72aebf9c6f5..d9406d810f3 100644
--- a/Simulation/SimuJobTransforms/share/skeleton.HITtoRDO.py
+++ b/Simulation/SimuJobTransforms/share/skeleton.HITtoRDO.py
@@ -342,7 +342,7 @@ if hasattr(runArgs,"doAllNoise"):
digitizationFlags.doCaloNoise=False
digitizationFlags.doMuonNoise=False
-if hasattr(runArgs,"LucidOn") or hasattr(runArgs,"ALFAOn") or hasattr(runArgs,"ZDCOn") or hasattr(runArgs,"AFPOn") or hasattr(runArgs,"FwdRegionOn"):
+if hasattr(runArgs,"LucidOn") or hasattr(runArgs,"ALFAOn") or hasattr(runArgs,"ZDCOn") or hasattr(runArgs,"AFPOn") or hasattr(runArgs,"FwdRegionOn") or hasattr(runArgs,"HGTDOn"):
if not 'DetFlags' in dir():
#if you configure one detflag, you're responsible for configuring them all!
from AthenaCommon.DetFlags import DetFlags
diff --git a/Simulation/SimuJobTransforms/test/test_diffmerged b/Simulation/SimuJobTransforms/test/test_diffmerged
index 37e1b2a67aa..018dc325905 100755
--- a/Simulation/SimuJobTransforms/test/test_diffmerged
+++ b/Simulation/SimuJobTransforms/test/test_diffmerged
@@ -7,6 +7,6 @@
## Diff the output files from test_digi_mergeHIT and test_digi_unmergeHIT
## TODO: Reinstate with new input files
-diffPoolFiles.py mu_E50_eta0-25_${GEOMETRY}.merged.rdo.pool.root mu_E50_eta0-25_${GEOMETRY}.unmerged.rdo.pool.root | \
+skip_if_AthSimulation.sh diffPoolFiles.py mu_E50_eta0-25_${GEOMETRY}.merged.rdo.pool.root mu_E50_eta0-25_${GEOMETRY}.unmerged.rdo.pool.root | \
sed 's/\[ERR\]\(.*\)POOLContainer_DataHeaderForm$/\[WARN\]\1POOLContainer_DataHeaderForm/g' | \
sed 's/## Comparison : \[ERR\]/## Comparison : \[WARN\]/g'
diff --git a/Simulation/SimuJobTransforms/test/test_digi_mergeHIT b/Simulation/SimuJobTransforms/test/test_digi_mergeHIT
index 46b151bfa55..2c0b754677d 100755
--- a/Simulation/SimuJobTransforms/test/test_digi_mergeHIT
+++ b/Simulation/SimuJobTransforms/test/test_digi_mergeHIT
@@ -29,6 +29,6 @@ if [[ $? -ne 0 ]]; then
echo "ERROR: $TRF not found"
exit 2
fi
-cmd="$TRF --inputHITSFile=$INPUTFILE --outputRDOFile=$RDOFILE --maxEvents=2 --skipEvents=11 --geometryVersion=$GEOMETRY --digiSeedOffset1=$DIGIOFFSET1 --digiSeedOffset2=$DIGIOFFSET2 --conditionsTag=$IOVDBGLOBALTAG --DataRunNumber $DATARUNNUMBER $ARGS"
+cmd="skip_if_AthSimulation.sh $TRF --inputHITSFile=$INPUTFILE --outputRDOFile=$RDOFILE --maxEvents=2 --skipEvents=11 --geometryVersion=$GEOMETRY --digiSeedOffset1=$DIGIOFFSET1 --digiSeedOffset2=$DIGIOFFSET2 --conditionsTag=$IOVDBGLOBALTAG --DataRunNumber $DATARUNNUMBER $ARGS"
echo $cmd
$cmd
diff --git a/Simulation/SimuJobTransforms/test/test_digi_mu b/Simulation/SimuJobTransforms/test/test_digi_mu
index a61eecd1708..a0516c6960d 100755
--- a/Simulation/SimuJobTransforms/test/test_digi_mu
+++ b/Simulation/SimuJobTransforms/test/test_digi_mu
@@ -29,6 +29,6 @@ if [[ $? -ne 0 ]]; then
echo "ERROR: $TRF not found"
exit 2
fi
-cmd="$TRF --inputHITSFile=$INPUTFILE --outputRDOFile=$RDOFILE --maxEvents=5 --skipEvents=0 --geometryVersion=$GEOMETRY --digiSeedOffset1=$DIGIOFFSET1 --digiSeedOffset2=$DIGIOFFSET2 --conditionsTag=$IOVDBGLOBALTAG --DataRunNumber $DATARUNNUMBER $@"
+cmd="skip_if_AthSimulation.sh $TRF --inputHITSFile=$INPUTFILE --outputRDOFile=$RDOFILE --maxEvents=5 --skipEvents=0 --geometryVersion=$GEOMETRY --digiSeedOffset1=$DIGIOFFSET1 --digiSeedOffset2=$DIGIOFFSET2 --conditionsTag=$IOVDBGLOBALTAG --DataRunNumber $DATARUNNUMBER $@"
echo $cmd
$cmd
diff --git a/Simulation/SimuJobTransforms/test/test_digi_unmergeHIT b/Simulation/SimuJobTransforms/test/test_digi_unmergeHIT
index 63aed65cca7..fd62f5efcf2 100755
--- a/Simulation/SimuJobTransforms/test/test_digi_unmergeHIT
+++ b/Simulation/SimuJobTransforms/test/test_digi_unmergeHIT
@@ -31,6 +31,6 @@ if [[ $? -ne 0 ]]; then
echo "ERROR: $TRF not found"
exit 2
fi
-cmd="$TRF --inputHITSFile=$INPUTLIST --outputRDOFile=$RDOFILE --maxEvents=2 --skipEvents=11 --geometryVersion=$GEOMETRY --digiSeedOffset1=$DIGIOFFSET1 --digiSeedOffset2=$DIGIOFFSET2 --conditionsTag=$IOVDBGLOBALTAG --DataRunNumber $DATARUNNUMBER $ARGS"
+cmd="skip_if_AthSimulation.sh $TRF --inputHITSFile=$INPUTLIST --outputRDOFile=$RDOFILE --maxEvents=2 --skipEvents=11 --geometryVersion=$GEOMETRY --digiSeedOffset1=$DIGIOFFSET1 --digiSeedOffset2=$DIGIOFFSET2 --conditionsTag=$IOVDBGLOBALTAG --DataRunNumber $DATARUNNUMBER $ARGS"
echo $cmd
$cmd
diff --git a/Simulation/SimuJobTransforms/test/test_pileup b/Simulation/SimuJobTransforms/test/test_pileup
index e299965f29a..36ebf396d33 100755
--- a/Simulation/SimuJobTransforms/test/test_pileup
+++ b/Simulation/SimuJobTransforms/test/test_pileup
@@ -21,7 +21,7 @@ LUMI=Test
DBRELEASETARBALL=NONE
MINBIASFILE=$TESTDATA/minbias_Inelastic-pythia8-7000_${GEOMETRY}.hits.pool.root
-CAVERNFILE=$TESTDATA/cavernbg-pythia8-7000_${GEOMETRY}.hits.pool.root
+#CAVERNFILE=$TESTDATA/cavernbg-pythia8-7000_${GEOMETRY}.hits.pool.root
TRF=Digi_tf.py
which $TRF
@@ -29,6 +29,6 @@ if [[ $? -ne 0 ]]; then
echo "ERROR: $TRF not found"
exit 2
fi
-cmd="$TRF --inputHITSFile $INPUTFILE --outputRDOFile $RDOFILE --maxEvents 10 --skipEvents 0 --geometryVersion $GEOMETRY --digiSeedOffset1 $DIGIOFFSET1 --digiSeedOffset2 $DIGIOFFSET2 --inputLowPtMinbiasHitsFile $MINBIASFILE --inputCavernHitsFile $CAVERNFILE --numberOfCavernBkg 1 --numberOfLowPtMinBias 1.0 --bunchSpacing 450 --pileupInitialBunch -1 --pileupFinalBunch 1 --conditionsTag $IOVDBGLOBALTAG --DataRunNumber $DATARUNNUMBER $ARGS"
+cmd="skip_if_AthSimulation.sh $TRF --inputHITSFile $INPUTFILE --outputRDOFile $RDOFILE --maxEvents 10 --skipEvents 0 --geometryVersion $GEOMETRY --digiSeedOffset1 $DIGIOFFSET1 --digiSeedOffset2 $DIGIOFFSET2 --inputLowPtMinbiasHitsFile $MINBIASFILE --numberOfLowPtMinBias 1.0 --bunchSpacing 450 --pileupInitialBunch -1 --pileupFinalBunch 1 --conditionsTag $IOVDBGLOBALTAG --DataRunNumber $DATARUNNUMBER $ARGS"
echo $cmd
$cmd
--
GitLab