Merge branch 'ISF_ValidationUpdate_master' into 'master'

Further clean-up of ISF_Validation ART jobs

See merge request atlas/athena!49467

Simulation/Tests/ISF_Validation/test/test_MC16_ATLFAST3_QS_ttbar.sh

@@ -32,7 +32,7 @@ Sim_tf.py \
 
 rc=$?
 rc2=-9999
-echo  "art-result: $rc simulation"
+echo  "art-result: $rc simOLD"
 if [ $rc -eq 0 ]
 then
     ArtPackage=$1

Simulation/Tests/ISF_Validation/test/test_MC16_ATLFAST3_ttbar.sh

@@ -32,7 +32,7 @@ Sim_tf.py \
 
 rc=$?
 rc2=-9999
-echo  "art-result: $rc simulation"
+echo  "art-result: $rc simOLD"
 if [ $rc -eq 0 ]
 then
     ArtPackage=$1

Simulation/Tests/ISF_Validation/test/test_MC16_ATLFASTIIF_Acts_ttbar.sh

@@ -24,7 +24,7 @@ Sim_tf.py \
 
 rc=$?
 rc2=-9999
-echo  "art-result: $rc simulation"
+echo  "art-result: $rc simOLD"
 if [ $rc -eq 0 ]
 then
   ArtPackage=$1

Simulation/Tests/ISF_Validation/test/test_MC16_ATLFASTIIF_G4MS_ttbar.sh

@@ -27,7 +27,7 @@ Sim_tf.py \
 
 rc=$?
 rc2=-9999
-echo  "art-result: $rc simulation"
+echo  "art-result: $rc simOLD"
 if [ $rc -eq 0 ]
 then
     ArtPackage=$1

Simulation/Tests/ISF_Validation/test/test_MC16_ATLFASTIIF_ttbar.sh

@@ -27,7 +27,7 @@ Sim_tf.py \
 
 rc=$?
 rc2=-9999
-echo  "art-result: $rc simulation"
+echo  "art-result: $rc simOLD"
 if [ $rc -eq 0 ]
 then
     ArtPackage=$1

Simulation/Tests/ISF_Validation/test/test_MC16_ATLFASTII_ttbar.sh

@@ -29,7 +29,7 @@ Sim_tf.py \
 
 rc=$?
 rc2=-9999
-echo  "art-result: $rc simulation"
+echo  "art-result: $rc simOLD"
 if [ $rc -eq 0 ]
 then
     ArtPackage=$1

Simulation/Tests/ISF_Validation/test/test_MC16_FullG4_QS_ZPrimebb_ExtraParticles.sh

-#!/bin/sh
-#
-# art-description: MC16-style simulation using FullG4_QS and the ExtraParticles package
-# art-include: 21.0/Athena
-# art-include: 21.0/AthSimulation
-# art-include: 21.3/Athena
-# art-include: 21.9/Athena
-# art-include: master/Athena
-# art-include: master/AthSimulation
-# art-type: grid
-# art-output: test.HITS.pool.root
-# art-output: truth.root
-
-# MC16 setup
-# ATLAS-R2-2016-01-00-01 and OFLCOND-MC16-SDR-14
-Sim_tf.py \
---conditionsTag 'default:OFLCOND-MC16-SDR-14' \
---physicsList 'FTFP_BERT_ATL' \
---truthStrategy 'MC15aPlus' \
---simulator 'FullG4_QS' \
---postInclude 'default:PyJobTransforms/UseFrontier.py' \
---preInclude 'EVNTtoHITS:SimulationJobOptions/preInclude.BeamPipeKill.py,SimulationJobOptions/preInclude.FrozenShowersFCalOnly.py,SimulationJobOptions/preInclude.ExtraParticles.py' \
---preExec 'EVNTtoHITS:simFlags.TightMuonStepping=True;simFlags.OptionalUserActionList.addAction("G4UA::VerboseSelectorTool");simFlags.UserActionConfig.addConfig("G4UA::VerboseSelectorTool","TargetEvent",-1);simFlags.UserActionConfig.addConfig("G4UA::VerboseSelectorTool","TargetPdgIDs", [413, 511, 513, 521]);simFlags.UserActionConfig.addConfig("G4UA::VerboseSelectorTool","TargetTrack",999999999);simFlags.UserActionConfig.addConfig("G4UA::VerboseSelectorTool","VerboseLevel",2);' \
---DataRunNumber '284500' \
---geometryVersion 'default:ATLAS-R2-2016-01-00-01' \
---inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/ISF_Validation/user.sgargiul.ZPrimebb.FlatPt.9999_EVNT.pool.root" \
---outputHITSFile "test.HITS.pool.root" \
---maxEvents 5 \
---imf False
-
-rc=$?
-rc2=-9999
-echo  "art-result: $rc simulation"
-if [ $rc -eq 0 ]
-then
-    ArtPackage=$1
-    ArtJobName=$2
-    art.py compare grid --entries 5 ${ArtPackage} ${ArtJobName} --mode=semi-detailed
-    rc2=$?
-fi
-
-echo  "art-result: $rc2 regression"

Simulation/Tests/ISF_Validation/test/test_MC16_FullG4_QS_ttbar.sh

-#!/bin/sh
-#
-# art-description: MC16-style simulation using FullG4_QS
-# art-include: 21.0/Athena
-# art-include: 21.3/Athena
-# art-include: 21.9/Athena
-# art-include: master/Athena
-# art-type: grid
-# art-output: test.HITS.pool.root
-# art-output: truth.root
-
-# MC16 setup
-# ATLAS-R2-2016-01-00-01 and OFLCOND-MC16-SDR-14
-Sim_tf.py \
---conditionsTag 'default:OFLCOND-MC16-SDR-14' \
---physicsList 'FTFP_BERT_ATL' \
---truthStrategy 'MC15aPlus' \
---simulator 'FullG4_QS' \
---postInclude 'default:PyJobTransforms/UseFrontier.py' \
---preInclude 'EVNTtoHITS:SimulationJobOptions/preInclude.BeamPipeKill.py,SimulationJobOptions/preInclude.FrozenShowersFCalOnly.py' \
---preExec 'EVNTtoHITS:simFlags.TightMuonStepping=True' \
---DataRunNumber '284500' \
---geometryVersion 'default:ATLAS-R2-2016-01-00-01' \
---inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.evgen.EVNT.e4993.EVNT.08166201._000012.pool.root.1" \
---outputHITSFile "test.HITS.pool.root" \
---maxEvents 4 \
---imf False
-
-rc=$?
-rc2=-9999
-echo  "art-result: $rc simulation"
-if [ $rc -eq 0 ]
-then
-    ArtPackage=$1
-    ArtJobName=$2
-    art.py compare grid --entries 4 ${ArtPackage} ${ArtJobName} --mode=semi-detailed
-    rc2=$?
-fi
-
-echo  "art-result: $rc2 regression"

Simulation/Tests/ISF_Validation/test/test_MC16_FullG4_ttbar.sh

@@ -28,7 +28,7 @@ Sim_tf.py \
 
 rc=$?
 rc2=-9999
-echo  "art-result: $rc simulation"
+echo  "art-result: $rc simOLD"
 if [ $rc -eq 0 ]
 then
     ArtPackage=$1

Simulation/Tests/ISF_Validation/test/test_MC16_G4FastCalo_ttbar.sh

 #!/bin/sh
 #
 # art-description: MC16-style simulation using G4FastCalo
-# art-include: 21.0/Athena
-# art-include: 21.3/Athena
-# art-include: 21.9/Athena
-# art-include: master/Athena
 # art-type: grid
 # art-output: test.HITS.pool.root
 # art-output: truth.root
@@ -28,7 +24,7 @@ Sim_tf.py \
 
 rc=$?
 rc2=-9999
-echo  "art-result: $rc simulation"
+echo  "art-result: $rc simOLD"
 if [ $rc -eq 0 ]
 then
     ArtPackage=$1

Simulation/Tests/ISF_Validation/test/test_MC21_FullG4MT_QS_ttbar.sh

+#!/bin/sh
+#
+# art-description: Run simulation using ISF with the FullG4MT_QS simulator, reading 13 TeV ttbar events, writing HITS, using 2021 geometry and MC21 conditions
+# art-include: master/Athena
+# art-type: grid
+# art-output: *.pool.root
+# art-output: log.*
+# art-output: Config*.pkl
+
+Sim_tf.py \
+--CA True \
+--conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-03' \
+--simulator 'FullG4MT_QS' \
+--postInclude 'PyJobTransforms.TransformUtils.UseFrontier' \
+--preInclude 'EVNTtoHITS:Campaigns.MC21Simulation' \
+--DataRunNumber '330000' \
+--geometryVersion 'default:ATLAS-R3S-2021-02-00-00' \
+--inputEVNTFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.evgen.EVNT.e4993.EVNT.08166201._000012.pool.root.1' \
+--outputHITSFile 'test.CA.HITS.pool.root' \
+--maxEvents '4' \
+--postExec 'with open("ConfigSimCA.pkl", "wb") as f: cfg.store(f)' \
+--imf False
+
+rc=$?
+mv log.EVNTtoHITS log.EVNTtoHITS_CA
+echo  "art-result: $rc simCA"
+
+Sim_tf.py \
+--conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-03' \
+--simulator 'FullG4MT_QS' \
+--postInclude 'default:PyJobTransforms/UseFrontier.py' \
+--preInclude 'EVNTtoHITS:Campaigns/MC21Simulation.py,SimulationJobOptions/preInclude.ExtraParticles.py,SimulationJobOptions/preInclude.G4ExtraProcesses.py' \
+--DataRunNumber '330000' \
+--geometryVersion 'default:ATLAS-R3S-2021-02-00-00' \
+--inputEVNTFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.evgen.EVNT.e4993.EVNT.08166201._000012.pool.root.1' \
+--outputHITSFile 'test.CA.HITS.pool.root' \
+--maxEvents '4' \
+--imf False \
+--athenaopts '"--config-only=ConfigSimCG.pkl"'
+
+Sim_tf.py \
+--conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-03' \
+--simulator 'FullG4MT_QS' \
+--postInclude 'default:PyJobTransforms/UseFrontier.py' \
+--preInclude 'EVNTtoHITS:Campaigns/MC21Simulation.py,SimulationJobOptions/preInclude.ExtraParticles.py,SimulationJobOptions/preInclude.G4ExtraProcesses.py' \
+--DataRunNumber '330000' \
+--geometryVersion 'default:ATLAS-R3S-2021-02-00-00' \
+--inputEVNTFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.evgen.EVNT.e4993.EVNT.08166201._000012.pool.root.1' \
+--outputHITSFile 'test.HITS.pool.root' \
+--maxEvents '4' \
+--imf False
+
+rc2=$?
+mv log.EVNTtoHITS log.EVNTtoHITS_OLD
+echo  "art-result: $rc2 simOLD"
+
+rc3=-9999
+if [ $rc -eq 0 ] && [ $rc2 -eq 0 ]
+then
+    acmd.py diff-root test.HITS.pool.root test.CA.HITS.pool.root --error-mode resilient --mode=semi-detailed --order-trees --ignore-leaves RecoTimingObj_p1_EVNTtoHITS_timings index_ref
+    rc3=$?
+fi
+echo  "art-result: $rc3 OLDvsCA"
+
+rc4=-9999
+if [ $rc2 -eq 0 ]
+then
+    ArtPackage=$1
+    ArtJobName=$2
+    art.py compare grid --entries 4 ${ArtPackage} ${ArtJobName} --mode=semi-detailed --file=test.HITS.pool.root
+    rc4=$?
+fi
+echo  "art-result: $rc4 regression"

Simulation/Tests/ISF_Validation/test/test_RUN2_FullG4MT_QS_ttbar.sh

+#!/bin/sh
+#
+# art-description: Run simulation using ISF with the FullG4MT_QS simulator, reading ttbar events, writing HITS, using RUN2 Best Knowledge geometry and MC21 conditions, 13 TeV input (unvalidated)
+# art-include: master/Athena
+# art-type: grid
+# art-output: *.pool.root
+# art-output: log.*
+# art-output: Config*.pkl
+
+Sim_tf.py \
+--CA True \
+--conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-03' \
+--simulator 'FullG4MT_QS' \
+--postInclude 'PyJobTransforms.TransformUtils.UseFrontier' \
+--preInclude 'EVNTtoHITS:Campaigns.MC21Simulation' \
+--DataRunNumber '284500' \
+--geometryVersion 'default:ATLAS-R2-2016-01-02-01' \
+--inputEVNTFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.evgen.EVNT.e4993.EVNT.08166201._000012.pool.root.1' \
+--outputHITSFile 'test.CA.HITS.pool.root' \
+--maxEvents '4' \
+--postExec 'with open("ConfigSimCA.pkl", "wb") as f: cfg.store(f)' \
+--imf False
+
+rc=$?
+mv log.EVNTtoHITS log.EVNTtoHITS_CA
+echo  "art-result: $rc simCA"
+
+Sim_tf.py \
+--conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-03' \
+--simulator 'FullG4MT_QS' \
+--postInclude 'default:PyJobTransforms/UseFrontier.py' \
+--preInclude 'EVNTtoHITS:Campaigns/MC21Simulation.py,SimulationJobOptions/preInclude.ExtraParticles.py,SimulationJobOptions/preInclude.G4ExtraProcesses.py' \
+--DataRunNumber '284500' \
+--geometryVersion 'default:ATLAS-R2-2016-01-02-01' \
+--inputEVNTFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.evgen.EVNT.e4993.EVNT.08166201._000012.pool.root.1' \
+--outputHITSFile 'test.CA.HITS.pool.root' \
+--maxEvents '4' \
+--imf False \
+--athenaopts '"--config-only=ConfigSimCG.pkl"'
+
+Sim_tf.py \
+--conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-03' \
+--simulator 'FullG4MT_QS' \
+--postInclude 'default:PyJobTransforms/UseFrontier.py' \
+--preInclude 'EVNTtoHITS:Campaigns/MC21Simulation.py,SimulationJobOptions/preInclude.ExtraParticles.py,SimulationJobOptions/preInclude.G4ExtraProcesses.py' \
+--DataRunNumber '284500' \
+--geometryVersion 'default:ATLAS-R2-2016-01-02-01' \
+--inputEVNTFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.evgen.EVNT.e4993.EVNT.08166201._000012.pool.root.1' \
+--outputHITSFile 'test.HITS.pool.root' \
+--maxEvents '4' \
+--imf False
+
+rc2=$?
+mv log.EVNTtoHITS log.EVNTtoHITS_OLD
+echo  "art-result: $rc2 simOLD"
+
+rc3=-9999
+if [ $rc -eq 0 ] && [ $rc2 -eq 0 ]
+then
+    acmd.py diff-root test.HITS.pool.root test.CA.HITS.pool.root --error-mode resilient --mode=semi-detailed --order-trees --ignore-leaves RecoTimingObj_p1_EVNTtoHITS_timings index_ref
+    rc3=$?
+fi
+echo  "art-result: $rc3 OLDvsCA"
+
+rc4=-9999
+if [ $rc2 -eq 0 ]
+then
+    ArtPackage=$1
+    ArtJobName=$2
+    art.py compare grid --entries 4 ${ArtPackage} ${ArtJobName} --mode=semi-detailed --file=test.HITS.pool.root
+    rc4=$?
+fi
+echo  "art-result: $rc4 regression"

Simulation/Tests/ISF_Validation/test/test_RUN3_FullG4_QS_ZPrime.sh

@@ -5,29 +5,68 @@
 # art-include: master/AthSimulation
 # art-type: grid
 # art-output: test.HITS.pool.root
+#/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/ISF_Validation/EVNT.04607198._000001.pool.root.1
+Sim_tf.py \
+--CA True \
+--conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-03' \
+--simulator 'FullG4MT_QS' \
+--postInclude 'PyJobTransforms.TransformUtils.UseFrontier' \
+--preInclude 'EVNTtoHITS:Campaigns.MC21Simulation,SimuJobTransforms.SimulationHelpers.enableFrozenShowersFCalOnly' \
+--DataRunNumber '330000' \
+--geometryVersion 'default:ATLAS-R3S-2021-02-00-00' \
+--inputEVNTFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/ISF_Validation/EVNT.04607198._000001.pool.root.1' \
+--outputHITSFile 'test.CA.HITS.pool.root' \
+--maxEvents '10' \
+--postExec 'with open("ConfigSimCA.pkl", "wb") as f: cfg.store(f)' \
+--imf False
+
+rc=$?
+mv log.EVNTtoHITS log.EVNTtoHITS_CA
+echo  "art-result: $rc simCA"
 
-# RUN3 setup - Frozen Showers currently off by default
-# ATLAS-R3S-2021-02-00-00 and OFLCOND-MC21-SDR-RUN3-03
 Sim_tf.py \
 --conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-03' \
---simulator 'FullG4_QS' \
+--simulator 'FullG4MT_QS' \
 --postInclude 'default:PyJobTransforms/UseFrontier.py' \
---preInclude 'EVNTtoHITS:Campaigns/MC21Simulation.py,SimulationJobOptions/preInclude.FrozenShowersFCalOnly.py' \
---geometryVersion 'default:ATLAS-R3S-2021-02-00-00_VALIDATION' \
---inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/ISF_Validation/EVNT.04607198._000001.pool.root.1" \
---outputHITSFile "test.HITS.pool.root" \
---maxEvents 10 \
+--preInclude 'EVNTtoHITS:Campaigns/MC21Simulation.py,SimulationJobOptions/preInclude.FrozenShowersFCalOnly.py,SimulationJobOptions/preInclude.ExtraParticles.py,SimulationJobOptions/preInclude.G4ExtraProcesses.py' \
+--DataRunNumber '330000' \
+--geometryVersion 'default:ATLAS-R3S-2021-02-00-00' \
+--inputEVNTFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/ISF_Validation/EVNT.04607198._000001.pool.root.1' \
+--outputHITSFile 'test.CA.HITS.pool.root' \
+--maxEvents '10' \
+--imf False \
+--athenaopts '"--config-only=ConfigSimCG.pkl"'
+
+Sim_tf.py \
+--conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-03' \
+--simulator 'FullG4MT_QS' \
+--postInclude 'default:PyJobTransforms/UseFrontier.py' \
+--preInclude 'EVNTtoHITS:Campaigns/MC21Simulation.py,SimulationJobOptions/preInclude.FrozenShowersFCalOnly.py,SimulationJobOptions/preInclude.ExtraParticles.py,SimulationJobOptions/preInclude.G4ExtraProcesses.py' \
+--DataRunNumber '330000' \
+--geometryVersion 'default:ATLAS-R3S-2021-02-00-00' \
+--inputEVNTFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/ISF_Validation/EVNT.04607198._000001.pool.root.1' \
+--outputHITSFile 'test.HITS.pool.root' \
+--maxEvents '10' \
 --imf False
 
-rc=$?
-rc2=-9999
-echo  "art-result: $rc simulation"
-if [ $rc -eq 0 ]
+rc2=$?
+mv log.EVNTtoHITS log.EVNTtoHITS_OLD
+echo  "art-result: $rc2 simOLD"
+
+rc3=-9999
+if [ $rc -eq 0 ] && [ $rc2 -eq 0 ]
+then
+    acmd.py diff-root test.HITS.pool.root test.CA.HITS.pool.root --error-mode resilient --mode=semi-detailed --order-trees --ignore-leaves RecoTimingObj_p1_EVNTtoHITS_timings index_ref
+    rc3=$?
+fi
+echo  "art-result: $rc3 OLDvsCA"
+
+rc4=-9999
+if [ $rc2 -eq 0 ]
 then
     ArtPackage=$1
     ArtJobName=$2
-    art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName} --mode=semi-detailed
-    rc2=$?
+    art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName} --mode=semi-detailed --file=test.HITS.pool.root
+    rc4=$?
 fi
-
-echo  "art-result: $rc2 regression"
+echo  "art-result: $rc4 regression"

Simulation/Tests/ISF_Validation/test/test_RUN3_FullG4_QS_ttbar.sh

+#!/bin/sh
+#
+# art-description: MC21-style simulation using FullG4MT_QS (13 TeV ttbar input - needs updating)
+# art-include: master/Athena
+# art-type: grid
+# art-output: *.pool.root
+# art-output: log.*
+# art-output: Config*.pkl
+
+Sim_tf.py \
+--CA True \
+--conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-03' \
+--simulator 'FullG4MT_QS' \
+--postInclude 'PyJobTransforms.TransformUtils.UseFrontier' \
+--preInclude 'EVNTtoHITS:Campaigns.MC21Simulation,SimuJobTransforms.SimulationHelpers.enableFrozenShowersFCalOnly' \
+--DataRunNumber '330000' \
+--geometryVersion 'default:ATLAS-R3S-2021-02-00-00' \
+--inputEVNTFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.evgen.EVNT.e4993.EVNT.08166201._000012.pool.root.1' \
+--outputHITSFile 'test.CA.HITS.pool.root' \
+--maxEvents '10' \
+--postExec 'with open("ConfigSimCA.pkl", "wb") as f: cfg.store(f)' \
+--imf False
+
+rc=$?
+mv log.EVNTtoHITS log.EVNTtoHITS_CA
+echo  "art-result: $rc simCA"
+
+Sim_tf.py \
+--conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-03' \
+--simulator 'FullG4MT_QS' \
+--postInclude 'default:PyJobTransforms/UseFrontier.py' \
+--preInclude 'EVNTtoHITS:Campaigns/MC21Simulation.py,SimulationJobOptions/preInclude.FrozenShowersFCalOnly.py,SimulationJobOptions/preInclude.ExtraParticles.py,SimulationJobOptions/preInclude.G4ExtraProcesses.py' \
+--DataRunNumber '330000' \
+--geometryVersion 'default:ATLAS-R3S-2021-02-00-00' \
+--inputEVNTFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.evgen.EVNT.e4993.EVNT.08166201._000012.pool.root.1' \
+--outputHITSFile 'test.CA.HITS.pool.root' \
+--maxEvents '10' \
+--imf False \
+--athenaopts '"--config-only=ConfigSimCG.pkl"'
+
+Sim_tf.py \
+--conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-03' \
+--simulator 'FullG4MT_QS' \
+--postInclude 'default:PyJobTransforms/UseFrontier.py' \
+--preInclude 'EVNTtoHITS:Campaigns/MC21Simulation.py,SimulationJobOptions/preInclude.FrozenShowersFCalOnly.py,SimulationJobOptions/preInclude.ExtraParticles.py,SimulationJobOptions/preInclude.G4ExtraProcesses.py' \
+--DataRunNumber '330000' \
+--geometryVersion 'default:ATLAS-R3S-2021-02-00-00' \
+--inputEVNTFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.evgen.EVNT.e4993.EVNT.08166201._000012.pool.root.1' \
+--outputHITSFile 'test.HITS.pool.root' \
+--maxEvents '10' \
+--imf False
+
+rc2=$?
+mv log.EVNTtoHITS log.EVNTtoHITS_OLD
+echo  "art-result: $rc2 simOLD"
+
+rc3=-9999
+if [ $rc -eq 0 ] && [ $rc2 -eq 0 ]
+then
+    acmd.py diff-root test.HITS.pool.root test.CA.HITS.pool.root --error-mode resilient --mode=semi-detailed --order-trees --ignore-leaves RecoTimingObj_p1_EVNTtoHITS_timings index_ref
+    rc3=$?
+fi
+echo  "art-result: $rc3 OLDvsCA"
+
+rc4=-9999
+if [ $rc2 -eq 0 ]
+then
+    ArtPackage=$1
+    ArtJobName=$2
+    art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName} --mode=semi-detailed --file=test.HITS.pool.root
+    rc4=$?
+fi
+echo  "art-result: $rc4 regression"

Simulation/Tests/ISF_Validation/test/test_RUN3_FullG4_minbias.sh

@@ -20,7 +20,7 @@ Sim_tf.py \
 
 rc=$?
 rc2=-9999
-echo  "art-result: $rc simulation"
+echo  "art-result: $rc simOLD"
 if [ $rc -eq 0 ]
 then
     ArtPackage=$1

Simulation/Tests/ISF_Validation/test/test_RUN3_FullG4_ttbar.sh

-#!/bin/sh
-#
-# art-description: MC21-style simulation using FullG4 (13 TeV ttbar input - needs updating)
-# art-include: master/Athena
-# art-type: grid
-# art-output: test.HITS.pool.root
-
-# RUN3 setup - Frozen Showers currently off by default
-# ATLAS-R3S-2021-02-00-00 and OFLCOND-MC21-SDR-RUN3-03
-Sim_tf.py \
---conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-03' \
---simulator 'FullG4' \
---postInclude 'default:PyJobTransforms/UseFrontier.py' \
---preInclude 'EVNTtoHITS:Campaigns/MC21Simulation.py,SimulationJobOptions/preInclude.FrozenShowersFCalOnly.py' \
---geometryVersion 'default:ATLAS-R3S-2021-02-00-00_VALIDATION' \
---inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.evgen.EVNT.e4993.EVNT.08166201._000012.pool.root.1" \
---outputHITSFile "test.HITS.pool.root" \
---maxEvents 10 \
---imf False
-
-rc=$?
-rc2=-9999
-echo  "art-result: $rc simulation"
-if [ $rc -eq 0 ]
-then
-    ArtPackage=$1
-    ArtJobName=$2
-    art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName} --mode=semi-detailed
-    rc2=$?
-fi
-
-echo  "art-result: $rc2 regression"

Simulation/Tests/ISF_Validation/test/test_RUN3_FullG4_ttbar_CAvsCG.sh

-#!/bin/sh
-#
-# art-description: MC21-style simulation using FullG4
-# art-include: master/Athena
-# art-type: grid
-# art-output: test.CG.HITS.pool.root
-# art-output: test.CA.HITS.pool.root
-# art-output: Config*
-
-# RUN3 setup
-# ATLAS-R3S-2021-02-00-00 and OFLCOND-MC21-SDR-RUN3-03
-Sim_tf.py \
---conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-03' \
---simulator 'FullG4MT' \
---postInclude 'default:PyJobTransforms/UseFrontier.py' \
---preInclude 'EVNTtoHITS:Campaigns/MC21Simulation.py,SimulationJobOptions/preInclude.FrozenShowersFCalOnly.py' \
---geometryVersion 'default:ATLAS-R3S-2021-02-00-00_VALIDATION' \
---inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.evgen.EVNT.e4993.EVNT.08166201._000012.pool.root.1" \
---outputHITSFile "test.CG.HITS.pool.root" \
---maxEvents 3 \
---imf False \
---athenaopts '"--config-only=ConfigCG.pkl"'
-
-Sim_tf.py \
---conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-03' \
---simulator 'FullG4MT' \
---postInclude 'default:PyJobTransforms/UseFrontier.py' \
---preInclude 'EVNTtoHITS:Campaigns/MC21Simulation.py,SimulationJobOptions/preInclude.FrozenShowersFCalOnly.py' \
---geometryVersion 'default:ATLAS-R3S-2021-02-00-00_VALIDATION' \
---inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.evgen.EVNT.e4993.EVNT.08166201._000012.pool.root.1" \
---outputHITSFile "test.CG.HITS.pool.root" \
---maxEvents 3 \
---imf False
-
-rc1=$?
-status=$rc1
-echo "art-result: $rc1 simulation CG"
-
-rc2=-999
-if [ $rc1 -eq 0 ]
-then
-  Sim_tf.py \
-  --CA \
-  --conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-03' \
-  --simulator 'FullG4MT' \
-  --postExec 'with open("ConfigCA.pkl", "wb") as f: cfg.store(f)' \
-  --postInclude 'default:PyJobTransforms.UseFrontier' \
-  --preInclude 'EVNTtoHITS:Campaigns.MC21Simulation,SimuJobTransforms.SimulationHelpers.enableFrozenShowersFCalOnly' \
-  --geometryVersion 'default:ATLAS-R3S-2021-02-00-00' \
-  --inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.evgen.EVNT.e4993.EVNT.08166201._000012.pool.root.1" \
-  --outputHITSFile "test.CA.HITS.pool.root" \
-  --maxEvents 3 \
-  --imf False
-
-  rc2=$?
-  status=$rc2
-fi
-
-echo  "art-result: $rc2 simulation CA"
-
-rc3=-999
-if [ $rc2 -eq 0 ]
-then
-  # Compare the outputs
-  acmd.py diff-root test.CG.HITS.pool.root test.CA.HITS.pool.root \
-    --error-mode resilient \
-    --ignore-leaves RecoTimingObj_p1_EVNTtoHITS_timings index_ref
-  rc3=$?
-  status=$rc3
-fi
-
-echo "art-result: $rc3 comparison"
-
-exit $status

Simulation/Tests/ISF_Validation/test/test_RUN4_FullG4_minbias.sh

@@ -26,7 +26,7 @@ Sim_tf.py \
 
 rc=$?
 status=$rc
-echo "art-result: $rc simulation"
+echo "art-result: $rc simCA"
 
 rc2=-9999
 if [ $rc -eq 0 ]
@@ -41,6 +41,6 @@ then
   status=$rc2
 fi
 
-echo "art-result: $rc2 filtering"
+echo "art-result: $rc2 FilterHitCA"
 
 exit $status

Simulation/Tests/ISF_Validation/test/test_RUN4_FullG4_single_muon.sh

@@ -22,6 +22,6 @@ Sim_tf.py \
 --imf False
 
 rc=$?
-echo "art-result: $rc simulation"
+echo "art-result: $rc simCA"
 
 exit $rc

Simulation/Tests/ISF_Validation/test/test_RUN4_FullG4_single_neutrino.sh

@@ -22,6 +22,6 @@ Sim_tf.py \
 --imf False
 
 rc=$?
-echo "art-result: $rc simulation"
+echo "art-result: $rc simCA"
 
 exit $rc