diff --git a/Simulation/G4Atlas/G4AtlasApps/python/SimEnums.py b/Simulation/G4Atlas/G4AtlasApps/python/SimEnums.py index a8944735ad518f32f9395f9710e38fdee600c0ef..fd4f21a47030c8dd89680387eb7f8c24d5813b63 100644 --- a/Simulation/G4Atlas/G4AtlasApps/python/SimEnums.py +++ b/Simulation/G4Atlas/G4AtlasApps/python/SimEnums.py @@ -45,6 +45,9 @@ class SimulationFlavour(FlagEnum): ATLFAST3MT_QS = 'ATLFAST3MT_QS' ATLFAST3F_G4MS = 'ATLFAST3F_G4MS' + def usesFastCaloSim(self): + return 'ATLFAST' in self.value + def isQuasiStable(self): return 'QS' in self.value diff --git a/Simulation/ISF/ISF_Config/share/AllDet_detDescr.py b/Simulation/ISF/ISF_Config/share/AllDet_detDescr.py index eb8305d13058dc4aa498d179b6bfe2e596717390..77a493a8254451c0d5685cc3636334966739f3ef 100644 --- a/Simulation/ISF/ISF_Config/share/AllDet_detDescr.py +++ b/Simulation/ISF/ISF_Config/share/AllDet_detDescr.py @@ -13,7 +13,7 @@ if DetFlags.detdescr.any_on(): from AtlasGeoModel import SetupRecoGeometry import os - if "AthSimulation_DIR" not in os.environ: + if "AthSimulation_DIR" not in os.environ and ("ATLFAST" in ISF_Flags.Simulator() or ISF_Flags.Simulator() in ["G4FastCalo", 'FatrasGammaCones_FastCalo', 'G4BHadronsOnly_FastCalo', 'G4GammaCones', 'G4GammaCones_FastCalo']): if DetFlags.detdescr.LAr_on(): protectedInclude( "LArDetDescr/LArDetDescr_joboptions.py" ) diff --git a/Simulation/Tests/ISF_Validation/test/test_ATLFASTIIF_ttbar_2evts.sh b/Simulation/Tests/ISF_Validation/test/test_ATLFASTIIF_ttbar_2evts.sh index b6b07778b6da2fd9e7915208340d1c20d2b54108..920d82f848ebe28ec41a8c1f12eba2cc215a5f78 100755 --- a/Simulation/Tests/ISF_Validation/test/test_ATLFASTIIF_ttbar_2evts.sh +++ b/Simulation/Tests/ISF_Validation/test/test_ATLFASTIIF_ttbar_2evts.sh @@ -16,6 +16,7 @@ Sim_tf.py \ --truthStrategy 'MC12' \ --simulator 'ATLFASTIIF' \ --postInclude 'default:PyJobTransforms/UseFrontier.py' \ +--preInclude 'EVNTtoHITS:Campaigns/MC16Simulation.py' \ --DataRunNumber '222525' \ --geometryVersion 'default:ATLAS-R2-2015-03-01-00_VALIDATION' \ --inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/ISF_Validation/mc12_valid.110401.PowhegPythia_P2012_ttbar_nonallhad.evgen.EVNT.e3099.01517252._000001.pool.root.1" \ diff --git a/Simulation/Tests/ISF_Validation/test/test_ATLFASTII_ttbar_2evts.sh b/Simulation/Tests/ISF_Validation/test/test_ATLFASTII_ttbar_2evts.sh index 654071172b2c9653a9bdd5f828229197cf90e21f..05ebfcb2b3a6535e6477b6c20fec718c2f19758f 100755 --- a/Simulation/Tests/ISF_Validation/test/test_ATLFASTII_ttbar_2evts.sh +++ b/Simulation/Tests/ISF_Validation/test/test_ATLFASTII_ttbar_2evts.sh @@ -16,7 +16,7 @@ Sim_tf.py \ --truthStrategy 'MC12' \ --simulator 'ATLFASTII' \ --postInclude 'default:PyJobTransforms/UseFrontier.py' \ ---preInclude 'EVNTtoHITS:SimulationJobOptions/preInclude.BeamPipeKill.py' \ +--preInclude 'EVNTtoHITS:Campaigns/MC16Simulation.py' \ --DataRunNumber '222525' \ --geometryVersion 'default:ATLAS-R2-2015-03-01-00_VALIDATION' \ --inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/ISF_Validation/mc12_valid.110401.PowhegPythia_P2012_ttbar_nonallhad.evgen.EVNT.e3099.01517252._000001.pool.root.1" \ diff --git a/Simulation/Tests/ISF_Validation/test/test_AtlasG4_FullG4_comparison.sh b/Simulation/Tests/ISF_Validation/test/test_AtlasG4_FullG4_comparison.sh index 8aa32cb96fbc3a8cbd8317a908443796abf8f4fe..56d40ef28230dd86e3593be7b6b264c52c03007a 100755 --- a/Simulation/Tests/ISF_Validation/test/test_AtlasG4_FullG4_comparison.sh +++ b/Simulation/Tests/ISF_Validation/test/test_AtlasG4_FullG4_comparison.sh @@ -15,13 +15,9 @@ export TRF_ECHO=1 Sim_tf.py \ --conditionsTag 'default:OFLCOND-MC16-SDR-14' \ ---physicsList 'FTFP_BERT_ATL' \ ---truthStrategy 'MC15aPlus' \ --simulator 'FullG4' \ --postInclude 'default:PyJobTransforms/UseFrontier.py' \ ---preInclude 'EVNTtoHITS:SimulationJobOptions/preInclude.BeamPipeKill.py' \ ---preExec 'EVNTtoHITS:simFlags.TightMuonStepping=True' \ ---DataRunNumber '284500' \ +--preInclude 'EVNTtoHITS:Campaigns/MC16Simulation.py' \ --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 "HITS.FullG4.pool.root" \ @@ -33,13 +29,9 @@ echo "art-result: $rc1 simulation FullG4" AtlasG4_tf.py \ --conditionsTag 'default:OFLCOND-MC16-SDR-14' \ ---physicsList 'FTFP_BERT_ATL' \ ---truthStrategy 'MC15aPlus' \ --postInclude 'default:PyJobTransforms/UseFrontier.py' \ ---preInclude 'sim:SimulationJobOptions/preInclude.BeamPipeKill.py' \ ---preExec 'sim:simFlags.TightMuonStepping=True' \ +--preInclude 'EVNTtoHITS:Campaigns/MC16Simulation.py' \ --postExec 'sim:topSeq.BeamEffectsAlg.ISFRun=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 "HITS.AtlasG4.pool.root" \ diff --git a/Simulation/Tests/ISF_Validation/test/test_FatrasGammaCones_FastCalo_2evts.sh b/Simulation/Tests/ISF_Validation/test/test_FatrasGammaCones_FastCalo_2evts.sh index 2e19c68eba95e5c1cff50ea3187cc77a4c0b009d..13166f7b4054b49a8ef807e54aff4a33e151eeec 100755 --- a/Simulation/Tests/ISF_Validation/test/test_FatrasGammaCones_FastCalo_2evts.sh +++ b/Simulation/Tests/ISF_Validation/test/test_FatrasGammaCones_FastCalo_2evts.sh @@ -17,6 +17,7 @@ Sim_tf.py \ --simulator 'FatrasGammaCones_FastCalo' \ --postInclude 'default:PyJobTransforms/UseFrontier.py' \ --preInclude 'EVNTtoHITS:SimulationJobOptions/preInclude.BeamPipeKill.py' \ +--postExec 'EVNTtoHITS:from IOVDbSvc.CondDB import conddb;conddb.addOverride("/TILE/OFL02/CALIB/SFR","TileOfl02CalibSfr-SIM-07")' \ --DataRunNumber '222525' \ --geometryVersion 'default:ATLAS-R2-2015-03-01-00_VALIDATION' \ --inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/ISF_Validation/mc12_valid.110401.PowhegPythia_P2012_ttbar_nonallhad.evgen.EVNT.e3099.01517252._000001.pool.root.1" \ diff --git a/Simulation/Tests/ISF_Validation/test/test_G4BHadronsOnly_FastCalo_2evts.sh b/Simulation/Tests/ISF_Validation/test/test_G4BHadronsOnly_FastCalo_2evts.sh index 365b343092da47396f561baf680815f7ecf2e5b3..d9f82778fa8659a6539f55ed23d6f3707d873975 100755 --- a/Simulation/Tests/ISF_Validation/test/test_G4BHadronsOnly_FastCalo_2evts.sh +++ b/Simulation/Tests/ISF_Validation/test/test_G4BHadronsOnly_FastCalo_2evts.sh @@ -17,6 +17,7 @@ Sim_tf.py \ --simulator 'G4BHadronsOnly_FastCalo' \ --postInclude 'default:PyJobTransforms/UseFrontier.py' \ --preInclude 'EVNTtoHITS:SimulationJobOptions/preInclude.BeamPipeKill.py' \ +--postExec 'EVNTtoHITS:from IOVDbSvc.CondDB import conddb;conddb.addOverride("/TILE/OFL02/CALIB/SFR","TileOfl02CalibSfr-SIM-07")' \ --DataRunNumber '222525' \ --geometryVersion 'default:ATLAS-R2-2015-03-01-00_VALIDATION' \ --inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/ISF_Validation/mc12_8TeV.208301.Pythia8B_AU2_CTEQ6L1_bb_m4mu4.evgen.EVNT.e1623_tid01053634_00.__018241.pool.root.1" \ diff --git a/Simulation/Tests/ISF_Validation/test/test_G4GammaCones_2evts.sh b/Simulation/Tests/ISF_Validation/test/test_G4GammaCones_2evts.sh index 605353561c7b3a381b8206bcf01e9ea55b7dc3e2..b35b5abd27c3f90b7a8fa2f5714f70b5bbfb7197 100755 --- a/Simulation/Tests/ISF_Validation/test/test_G4GammaCones_2evts.sh +++ b/Simulation/Tests/ISF_Validation/test/test_G4GammaCones_2evts.sh @@ -17,6 +17,7 @@ Sim_tf.py \ --simulator 'G4GammaCones' \ --postInclude 'default:PyJobTransforms/UseFrontier.py' \ --preInclude 'EVNTtoHITS:SimulationJobOptions/preInclude.BeamPipeKill.py' \ +--postExec 'EVNTtoHITS:from IOVDbSvc.CondDB import conddb;conddb.addOverride("/TILE/OFL02/CALIB/SFR","TileOfl02CalibSfr-SIM-07")' \ --DataRunNumber '222525' \ --geometryVersion 'default:ATLAS-R2-2015-03-01-00_VALIDATION' \ --inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/ISF_Validation/mc12_valid.110401.PowhegPythia_P2012_ttbar_nonallhad.evgen.EVNT.e3099.01517252._000001.pool.root.1" \ diff --git a/Simulation/Tests/ISF_Validation/test/test_G4GammaCones_FastCalo_2evts.sh b/Simulation/Tests/ISF_Validation/test/test_G4GammaCones_FastCalo_2evts.sh index 291eb53093af3bf9e09235668983bc7ca6a1b865..8d2dc79378e78c2972623d8ecab0bfa7a69eaf0b 100755 --- a/Simulation/Tests/ISF_Validation/test/test_G4GammaCones_FastCalo_2evts.sh +++ b/Simulation/Tests/ISF_Validation/test/test_G4GammaCones_FastCalo_2evts.sh @@ -17,6 +17,7 @@ Sim_tf.py \ --simulator 'G4GammaCones_FastCalo' \ --postInclude 'default:PyJobTransforms/UseFrontier.py' \ --preInclude 'EVNTtoHITS:SimulationJobOptions/preInclude.BeamPipeKill.py' \ +--postExec 'EVNTtoHITS:from IOVDbSvc.CondDB import conddb;conddb.addOverride("/TILE/OFL02/CALIB/SFR","TileOfl02CalibSfr-SIM-07")' \ --DataRunNumber '222525' \ --geometryVersion 'default:ATLAS-R2-2015-03-01-00_VALIDATION' \ --inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/ISF_Validation/mc12_valid.110401.PowhegPythia_P2012_ttbar_nonallhad.evgen.EVNT.e3099.01517252._000001.pool.root.1" \ diff --git a/Simulation/Tests/ISF_Validation/test/test_MC16_ATLFAST3F_G4MS_ttbar.sh b/Simulation/Tests/ISF_Validation/test/test_MC16_ATLFAST3F_G4MS_ttbar.sh index bff1b3663d09169e48f3c8763826de91069b0ee8..f5d4d128019b56a89681f6750fdb7cae859ca5c2 100755 --- a/Simulation/Tests/ISF_Validation/test/test_MC16_ATLFAST3F_G4MS_ttbar.sh +++ b/Simulation/Tests/ISF_Validation/test/test_MC16_ATLFAST3F_G4MS_ttbar.sh @@ -14,12 +14,8 @@ Sim_tf.py \ --conditionsTag 'default:OFLCOND-MC16-SDR-14' \ ---physicsList 'FTFP_BERT_ATL' \ ---truthStrategy 'MC15aPlus' \ --simulator 'ATLFAST3F_G4MS' \ ---postInclude 'default:PyJobTransforms/UseFrontier.py' \ ---preExec 'EVNTtoHITS:simFlags.TightMuonStepping=True' \ ---DataRunNumber '284500' \ +--preInclude 'EVNTtoHITS:Campaigns/MC16Simulation.py' \ --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" \ diff --git a/Simulation/Tests/ISF_Validation/test/test_MC16_ATLFAST3_QS_ttbar.sh b/Simulation/Tests/ISF_Validation/test/test_MC16_ATLFAST3_QS_ttbar.sh index 1a682df5c99ee68a15267a863d9af6983a18fa3d..d3a0fd6ad9c60c32909474f29e5feb2a343af139 100755 --- a/Simulation/Tests/ISF_Validation/test/test_MC16_ATLFAST3_QS_ttbar.sh +++ b/Simulation/Tests/ISF_Validation/test/test_MC16_ATLFAST3_QS_ttbar.sh @@ -18,13 +18,9 @@ unset ATHENA_CORE_NUMBER Sim_tf.py \ --conditionsTag 'default:OFLCOND-MC16-SDR-14' \ ---physicsList 'FTFP_BERT_ATL' \ ---truthStrategy 'MC15aPlus' \ --simulator 'ATLFAST3_QS' \ --postInclude 'default:PyJobTransforms/UseFrontier.py' \ ---preInclude 'EVNTtoHITS:SimulationJobOptions/preInclude.BeamPipeKill.py,SimulationJobOptions/preInclude.FrozenShowersFCalOnly.py' \ ---preExec 'EVNTtoHITS:simFlags.TightMuonStepping=True;import InDetRecExample.TrackingCommon as kludgeTheConfig;kludgeTheConfig.use_tracking_geometry_cond_alg=False' \ ---DataRunNumber '284500' \ +--preInclude 'EVNTtoHITS:Campaigns/MC16Simulation.py' \ --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" \ diff --git a/Simulation/Tests/ISF_Validation/test/test_MC16_ATLFAST3_ttbar.sh b/Simulation/Tests/ISF_Validation/test/test_MC16_ATLFAST3_ttbar.sh index 7ef2fdd341f49ce643f60ce537c4bd43b6a3f0c3..88472e63243045066a6850d05318d0c5b413aa94 100755 --- a/Simulation/Tests/ISF_Validation/test/test_MC16_ATLFAST3_ttbar.sh +++ b/Simulation/Tests/ISF_Validation/test/test_MC16_ATLFAST3_ttbar.sh @@ -18,12 +18,9 @@ unset ATHENA_CORE_NUMBER Sim_tf.py \ --conditionsTag 'default:OFLCOND-MC16-SDR-14' \ ---physicsList 'FTFP_BERT_ATL' \ ---truthStrategy 'MC15aPlus' \ --simulator 'ATLFAST3' \ --postInclude 'default:PyJobTransforms/UseFrontier.py' \ ---preInclude 'EVNTtoHITS:SimulationJobOptions/preInclude.BeamPipeKill.py,SimulationJobOptions/preInclude.FrozenShowersFCalOnly.py' \ ---preExec 'EVNTtoHITS:simFlags.TightMuonStepping=True;import InDetRecExample.TrackingCommon as kludgeTheConfig;kludgeTheConfig.use_tracking_geometry_cond_alg=False' \ +--preInclude 'EVNTtoHITS:Campaigns/MC16Simulation.py' \ --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" \ diff --git a/Simulation/Tests/ISF_Validation/test/test_MC16_ATLFASTIIF_Acts_ttbar.sh b/Simulation/Tests/ISF_Validation/test/test_MC16_ATLFASTIIF_Acts_ttbar.sh index a7f9a9127ab43e3c8dc2612b41c0257434214973..d7522b6109460cbe110bd1892065e114d89d5511 100755 --- a/Simulation/Tests/ISF_Validation/test/test_MC16_ATLFASTIIF_Acts_ttbar.sh +++ b/Simulation/Tests/ISF_Validation/test/test_MC16_ATLFASTIIF_Acts_ttbar.sh @@ -11,12 +11,9 @@ Sim_tf.py \ --conditionsTag 'default:OFLCOND-MC16-SDR-14' \ - --physicsList 'FTFP_BERT_ATL' \ - --truthStrategy 'MC15aPlus' \ --simulator 'ATLFASTIIF_ACTS' \ --postInclude 'default:PyJobTransforms/UseFrontier.py' 'EVNTtoHITS:G4AtlasTests/postInclude.DCubeTest.py' \ - --preExec 'EVNTtoHITS:simFlags.TightMuonStepping=True' \ - --DataRunNumber '284500' \ + --preInclude 'EVNTtoHITS:Campaigns/MC16Simulation.py' \ --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" \ diff --git a/Simulation/Tests/ISF_Validation/test/test_MC16_ATLFASTIIF_G4MS_ttbar.sh b/Simulation/Tests/ISF_Validation/test/test_MC16_ATLFASTIIF_G4MS_ttbar.sh index bec15ac7bacae97699ec1c20128e6feda91e52e0..c6afb560829c795904d5463191dde9d5562fa260 100755 --- a/Simulation/Tests/ISF_Validation/test/test_MC16_ATLFASTIIF_G4MS_ttbar.sh +++ b/Simulation/Tests/ISF_Validation/test/test_MC16_ATLFASTIIF_G4MS_ttbar.sh @@ -14,12 +14,9 @@ Sim_tf.py \ --conditionsTag 'default:OFLCOND-MC16-SDR-14' \ ---physicsList 'FTFP_BERT_ATL' \ ---truthStrategy 'MC15aPlus' \ --simulator 'ATLFASTIIF_G4MS' \ --postInclude 'default:PyJobTransforms/UseFrontier.py' 'EVNTtoHITS:G4AtlasTests/postInclude.DCubeTest.py' \ ---preExec 'EVNTtoHITS:simFlags.TightMuonStepping=True' \ ---DataRunNumber '284500' \ +--preInclude 'EVNTtoHITS:Campaigns/MC16Simulation.py' \ --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" \ diff --git a/Simulation/Tests/ISF_Validation/test/test_MC16_ATLFASTIIF_ttbar.sh b/Simulation/Tests/ISF_Validation/test/test_MC16_ATLFASTIIF_ttbar.sh index 74d9abdb8440a375e326ba06a63cde15686b5210..7f9200e68ca68db4ac6abfa484561d31c9782738 100755 --- a/Simulation/Tests/ISF_Validation/test/test_MC16_ATLFASTIIF_ttbar.sh +++ b/Simulation/Tests/ISF_Validation/test/test_MC16_ATLFASTIIF_ttbar.sh @@ -14,12 +14,9 @@ Sim_tf.py \ --conditionsTag 'default:OFLCOND-MC16-SDR-14' \ ---physicsList 'FTFP_BERT_ATL' \ ---truthStrategy 'MC15aPlus' \ --simulator 'ATLFASTIIF' \ --postInclude 'default:PyJobTransforms/UseFrontier.py' 'EVNTtoHITS:G4AtlasTests/postInclude.DCubeTest.py' \ ---preExec 'EVNTtoHITS:simFlags.TightMuonStepping=True' \ ---DataRunNumber '284500' \ +--preInclude 'EVNTtoHITS:Campaigns/MC16Simulation.py' \ --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" \ diff --git a/Simulation/Tests/ISF_Validation/test/test_MC16_ATLFASTII_ttbar.sh b/Simulation/Tests/ISF_Validation/test/test_MC16_ATLFASTII_ttbar.sh index d070d9f17d7daf877d7fcb688e8b0a5c8c60cdb6..cf4f2fa95f6a0112fa62882ab41bb2a14d358761 100755 --- a/Simulation/Tests/ISF_Validation/test/test_MC16_ATLFASTII_ttbar.sh +++ b/Simulation/Tests/ISF_Validation/test/test_MC16_ATLFASTII_ttbar.sh @@ -15,13 +15,9 @@ Sim_tf.py \ --conditionsTag 'default:OFLCOND-MC16-SDR-14' \ ---physicsList 'FTFP_BERT_ATL' \ ---truthStrategy 'MC15aPlus' \ --simulator 'ATLFASTII' \ --postInclude 'default:PyJobTransforms/UseFrontier.py' 'EVNTtoHITS:G4AtlasTests/postInclude.DCubeTest.py' \ ---preInclude 'EVNTtoHITS:SimulationJobOptions/preInclude.BeamPipeKill.py' \ ---preExec 'EVNTtoHITS:simFlags.TightMuonStepping=True' \ ---DataRunNumber '284500' \ +--preInclude 'EVNTtoHITS:Campaigns/MC16Simulation.py' \ --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" \ diff --git a/Simulation/Tests/ISF_Validation/test/test_MC16_FullG4_ttbar.sh b/Simulation/Tests/ISF_Validation/test/test_MC16_FullG4_ttbar.sh index 5b4455bbd58ca4013ef280fa10c46ce135dc8e35..13f3697a118781a5709c7840f03b3b34489d0172 100755 --- a/Simulation/Tests/ISF_Validation/test/test_MC16_FullG4_ttbar.sh +++ b/Simulation/Tests/ISF_Validation/test/test_MC16_FullG4_ttbar.sh @@ -14,13 +14,9 @@ # 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' \ --postInclude 'default:PyJobTransforms/UseFrontier.py' \ ---preInclude 'EVNTtoHITS:SimulationJobOptions/preInclude.BeamPipeKill.py,SimulationJobOptions/preInclude.FrozenShowersFCalOnly.py' \ ---preExec 'EVNTtoHITS:simFlags.TightMuonStepping=True' \ ---DataRunNumber '284500' \ +--preInclude 'EVNTtoHITS:Campaigns/MC16Simulation.py' \ --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" \ diff --git a/Simulation/Tests/ISF_Validation/test/test_MC16_FullG4_ttbar_2evts.sh b/Simulation/Tests/ISF_Validation/test/test_MC16_FullG4_ttbar_2evts.sh index 83ff94ba13b5c2eb2104c56108d85706eaf98d27..355a6b4a43733a91a441a4e4bac4710321825ac5 100755 --- a/Simulation/Tests/ISF_Validation/test/test_MC16_FullG4_ttbar_2evts.sh +++ b/Simulation/Tests/ISF_Validation/test/test_MC16_FullG4_ttbar_2evts.sh @@ -18,9 +18,7 @@ Sim_tf.py \ --truthStrategy 'MC15aPlus' \ --simulator 'FullG4' \ --postInclude 'default:PyJobTransforms/UseFrontier.py' \ ---preInclude 'EVNTtoHITS:SimulationJobOptions/preInclude.BeamPipeKill.py,SimulationJobOptions/preInclude.FrozenShowersFCalOnly.py' \ ---preExec 'EVNTtoHITS:simFlags.TightMuonStepping=True' \ ---DataRunNumber '284500' \ +--preInclude 'EVNTtoHITS:Campaigns/MC16Simulation.py' \ --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 "Hits.pool.root" \ diff --git a/Simulation/Tests/ISF_Validation/test/test_MC16_G4FastCalo_ttbar.sh b/Simulation/Tests/ISF_Validation/test/test_MC16_G4FastCalo_ttbar.sh index cf5cae384b449b6b37f00a26255ae2e01e67847e..1a53e3157b2deed839670815c1152b84729aff03 100755 --- a/Simulation/Tests/ISF_Validation/test/test_MC16_G4FastCalo_ttbar.sh +++ b/Simulation/Tests/ISF_Validation/test/test_MC16_G4FastCalo_ttbar.sh @@ -10,13 +10,10 @@ # 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 'G4FastCalo' \ --postInclude 'default:PyJobTransforms/UseFrontier.py' \ ---preInclude 'EVNTtoHITS:SimulationJobOptions/preInclude.BeamPipeKill.py,SimulationJobOptions/preInclude.FrozenShowersFCalOnly.py' \ ---preExec 'EVNTtoHITS:simFlags.TightMuonStepping=True' 'from ISF_FastCaloSimServices.ISF_FastCaloSimJobProperties import ISF_FastCaloSimFlags;ISF_FastCaloSimFlags.ParamsInputFilename="FastCaloSim/MC16/TFCSparam_v012.root";import InDetRecExample.TrackingCommon as kludgeTheConfig;kludgeTheConfig.use_tracking_geometry_cond_alg=False' \ ---DataRunNumber '284500' \ +--preInclude 'EVNTtoHITS:Campaigns/MC16Simulation.py' \ +--preExec 'EVNTtoHITS:from ISF_FastCaloSimServices.ISF_FastCaloSimJobProperties import ISF_FastCaloSimFlags;ISF_FastCaloSimFlags.ParamsInputFilename="FastCaloSim/MC16/TFCSparam_v012.root"' \ --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" \ diff --git a/Simulation/Tests/ISF_Validation/test/test_ReSimulation.sh b/Simulation/Tests/ISF_Validation/test/test_ReSimulation.sh index c7c5027ee8478217b5b9c5495a212146b938cfd7..0f81cd5b15cae5157d7f24edf28dfdb90a95838d 100755 --- a/Simulation/Tests/ISF_Validation/test/test_ReSimulation.sh +++ b/Simulation/Tests/ISF_Validation/test/test_ReSimulation.sh @@ -14,13 +14,9 @@ MAXEVENTS=10 Sim_tf.py \ --conditionsTag 'default:OFLCOND-MC16-SDR-14' \ ---physicsList 'FTFP_BERT_ATL' \ ---truthStrategy 'MC15aPlus' \ --simulator 'FullG4' \ --postInclude 'default:PyJobTransforms/UseFrontier.py' \ ---preInclude 'EVNTtoHITS:SimulationJobOptions/preInclude.BeamPipeKill.py,SimulationJobOptions/preInclude.FrozenShowersFCalOnly.py' \ ---preExec 'EVNTtoHITS:simFlags.TightMuonStepping=True' \ ---DataRunNumber '284500' \ +--preInclude 'EVNTtoHITS:Campaigns/MC16Simulation.py' \ --geometryVersion 'default:ATLAS-R2-2016-01-00-01' \ --inputEVNTFile $INPUTEVNTFILE \ --outputHITSFile "original.HITS.pool.root" \ @@ -32,13 +28,9 @@ cp log.EVNTtoHITS log.EVNTtoHITS.initial ReSim_tf.py \ --conditionsTag 'ReSim:OFLCOND-MC16-SDR-14' \ ---physicsList 'FTFP_BERT_ATL' \ ---truthStrategy 'MC15aPlus' \ --simulator 'FullG4_QS' \ --postInclude 'ReSim:PyJobTransforms/UseFrontier.py' \ ---preInclude 'ReSim:SimulationJobOptions/preInclude.BeamPipeKill.py,SimulationJobOptions/preInclude.FrozenShowersFCalOnly.py,SimulationJobOptions/preInclude.ExtraParticles.py,SimulationJobOptions/preInclude.G4ExtraProcesses.py' \ ---preExec 'ReSim:simFlags.TightMuonStepping=True' \ ---DataRunNumber '284500' \ +--preInclude 'ReSim:Campaigns/MC16Simulation.py,SimulationJobOptions/preInclude.ExtraParticles.py,SimulationJobOptions/preInclude.G4ExtraProcesses.py' \ --geometryVersion 'ReSim:ATLAS-R2-2016-01-00-01' \ --inputHITSFile "original.HITS.pool.root" \ --outputHITS_RSMFile "resim.HITS.pool.root" \ diff --git a/Simulation/Tests/ISF_ValidationMT/test/test_MC16_ATLFAST3_ttbar_MTvsST.sh b/Simulation/Tests/ISF_ValidationMT/test/test_MC16_ATLFAST3_ttbar_MTvsST.sh index 1cefb13e85b7b6515905dd249af4a68489b928aa..920bd3b17c7ac1d9e7e90d688198e077cfcf3850 100755 --- a/Simulation/Tests/ISF_ValidationMT/test/test_MC16_ATLFAST3_ttbar_MTvsST.sh +++ b/Simulation/Tests/ISF_ValidationMT/test/test_MC16_ATLFAST3_ttbar_MTvsST.sh @@ -19,13 +19,9 @@ Sim_tf.py \ --maxEvents 10 \ --geometryVersion 'default:ATLAS-R2-2016-01-00-01' \ --conditionsTag 'default:OFLCOND-MC16-SDR-14' \ ---DataRunNumber '284500' \ ---physicsList 'FTFP_BERT_ATL' \ ---truthStrategy 'MC15aPlus' \ --simulator 'ATLFAST3MTEnergyOrdered' \ --postInclude 'default:PyJobTransforms/UseFrontier.py' \ ---preInclude 'EVNTtoHITS:SimulationJobOptions/preInclude.BeamPipeKill.py' \ ---preExec 'EVNTtoHITS:simFlags.TightMuonStepping=True' #\ +--preInclude 'EVNTtoHITS:Campaigns/MC16Simulation.py' #\ #--postExec 'EVNTtoHITS:ServiceMgr.MessageSvc.enableSuppression=False;topSeq.ISF_Kernel_ATLFAST3MT.OutputLevel=VERBOSE;' \ #--imf False @@ -45,13 +41,9 @@ then --maxEvents 10 \ --geometryVersion 'default:ATLAS-R2-2016-01-00-01' \ --conditionsTag 'default:OFLCOND-MC16-SDR-14' \ - --DataRunNumber '284500' \ - --physicsList 'FTFP_BERT_ATL' \ - --truthStrategy 'MC15aPlus' \ --simulator 'ATLFAST3MTEnergyOrdered' \ --postInclude 'default:PyJobTransforms/UseFrontier.py' \ - --preInclude 'EVNTtoHITS:SimulationJobOptions/preInclude.BeamPipeKill.py' \ - --preExec 'EVNTtoHITS:simFlags.TightMuonStepping=True' #\ + --preInclude 'EVNTtoHITS:Campaigns/MC16Simulation.py' #\ # --postExec 'EVNTtoHITS:ServiceMgr.MessageSvc.enableSuppression=False;topSeq.ISF_Kernel_ATLFAST3MT.OutputLevel=VERBOSE;' \ # --imf False rc2=$? @@ -70,13 +62,9 @@ then --maxEvents 10 \ --geometryVersion 'default:ATLAS-R2-2016-01-00-01' \ --conditionsTag 'default:OFLCOND-MC16-SDR-14' \ - --DataRunNumber '284500' \ - --physicsList 'FTFP_BERT_ATL' \ - --truthStrategy 'MC15aPlus' \ --simulator 'ATLFAST3EnergyOrdered' \ --postInclude 'default:PyJobTransforms/UseFrontier.py' \ - --preInclude 'EVNTtoHITS:SimulationJobOptions/preInclude.BeamPipeKill.py' \ - --preExec 'EVNTtoHITS:simFlags.TightMuonStepping=True' #\ + --preInclude 'EVNTtoHITS:Campaigns/MC16Simulation.py' #\ # --postExec 'EVNTtoHITS:ServiceMgr.MessageSvc.enableSuppression=False;topSeq.ISF_Kernel_ATLFAST3.OutputLevel=VERBOSE;ServiceMgr.ISF_AFIIParticleBrokerSvc.OutputLevel=VERBOSE;' \ # --imf False rc3=$? diff --git a/Simulation/Tests/ISF_ValidationMT/test/test_MC16_FullG4_QS_ttbar_MP.sh b/Simulation/Tests/ISF_ValidationMT/test/test_MC16_FullG4_QS_ttbar_MP.sh index c30de41cefcbe5e08786aa18554d67e6e12c7db6..bb1912f5a09c488e097f0c37a815662f39beb71f 100755 --- a/Simulation/Tests/ISF_ValidationMT/test/test_MC16_FullG4_QS_ttbar_MP.sh +++ b/Simulation/Tests/ISF_ValidationMT/test/test_MC16_FullG4_QS_ttbar_MP.sh @@ -18,13 +18,9 @@ export ATHENA_CORE_NUMBER=8 Sim_tf.py \ --multiprocess \ --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' \ +--preInclude 'EVNTtoHITS:Campaigns/MC16Simulation.py' \ --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" \ diff --git a/Simulation/Tests/ISF_ValidationMT/test/test_MC16_FullG4_ttbar_MP.sh b/Simulation/Tests/ISF_ValidationMT/test/test_MC16_FullG4_ttbar_MP.sh index da3f80854fb3eba09ad35ec9681e59b5a405357d..4b4b997ca32aba129e173e1917e7904831db1300 100755 --- a/Simulation/Tests/ISF_ValidationMT/test/test_MC16_FullG4_ttbar_MP.sh +++ b/Simulation/Tests/ISF_ValidationMT/test/test_MC16_FullG4_ttbar_MP.sh @@ -18,13 +18,9 @@ export ATHENA_CORE_NUMBER=8 Sim_tf.py \ --multiprocess \ --conditionsTag 'default:OFLCOND-MC16-SDR-14' \ ---physicsList 'FTFP_BERT_ATL' \ ---truthStrategy 'MC15aPlus' \ --simulator 'FullG4' \ --postInclude 'default:PyJobTransforms/UseFrontier.py' \ ---preInclude 'EVNTtoHITS:SimulationJobOptions/preInclude.BeamPipeKill.py,SimulationJobOptions/preInclude.FrozenShowersFCalOnly.py' \ ---preExec 'EVNTtoHITS:simFlags.TightMuonStepping=True' \ ---DataRunNumber '284500' \ +--preInclude 'EVNTtoHITS:Campaigns.MC16Simulation.py' \ --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" \ diff --git a/Simulation/Tests/ISF_ValidationMT/test/test_MC16_FullG4_ttbar_MTvsST.sh b/Simulation/Tests/ISF_ValidationMT/test/test_MC16_FullG4_ttbar_MTvsST.sh index 91257799bd8e77557fc01491ab9c41d1b22d192c..837c71a0bf37a2cff97dffafa2c92bee90067a8d 100755 --- a/Simulation/Tests/ISF_ValidationMT/test/test_MC16_FullG4_ttbar_MTvsST.sh +++ b/Simulation/Tests/ISF_ValidationMT/test/test_MC16_FullG4_ttbar_MTvsST.sh @@ -19,13 +19,9 @@ Sim_tf.py \ --maxEvents 10 \ --geometryVersion 'default:ATLAS-R2-2016-01-00-01' \ --conditionsTag 'default:OFLCOND-MC16-SDR-14' \ ---DataRunNumber '284500' \ ---physicsList 'FTFP_BERT_ATL' \ ---truthStrategy 'MC15aPlus' \ --simulator 'FullG4MT' \ --postInclude 'default:PyJobTransforms/UseFrontier.py' \ ---preInclude 'EVNTtoHITS:SimulationJobOptions/preInclude.BeamPipeKill.py' \ ---preExec 'EVNTtoHITS:simFlags.TightMuonStepping=True' \ +--preInclude 'EVNTtoHITS:Campaigns/MC16Simulation.py' \ --imf False rc=$? @@ -43,13 +39,9 @@ then --maxEvents 10 \ --geometryVersion 'default:ATLAS-R2-2016-01-00-01' \ --conditionsTag 'default:OFLCOND-MC16-SDR-14' \ - --DataRunNumber '284500' \ - --physicsList 'FTFP_BERT_ATL' \ - --truthStrategy 'MC15aPlus' \ --simulator 'FullG4MT' \ --postInclude 'default:PyJobTransforms/UseFrontier.py' \ - --preInclude 'EVNTtoHITS:SimulationJobOptions/preInclude.BeamPipeKill.py' \ - --preExec 'EVNTtoHITS:simFlags.TightMuonStepping=True' \ + --preInclude 'EVNTtoHITS:Campaigns/MC16Simulation.py' \ --imf False mv log.EVNTtoHITS log.FullG4MTAthena rc2=$? @@ -67,13 +59,9 @@ then --maxEvents 10 \ --geometryVersion 'default:ATLAS-R2-2016-01-00-01' \ --conditionsTag 'default:OFLCOND-MC16-SDR-14' \ - --DataRunNumber '284500' \ - --physicsList 'FTFP_BERT_ATL' \ - --truthStrategy 'MC15aPlus' \ --simulator 'FullG4' \ --postInclude 'default:PyJobTransforms/UseFrontier.py' \ - --preInclude 'EVNTtoHITS:SimulationJobOptions/preInclude.BeamPipeKill.py' \ - --preExec 'EVNTtoHITS:simFlags.TightMuonStepping=True' \ + --preInclude 'EVNTtoHITS:Campaigns/MC16Simulation.py' \ --imf False mv log.EVNTtoHITS log.FullG4Athena rc3=$? diff --git a/Simulation/Tests/ISF_ValidationMT/test/test_MC16_PassBackG4_ttbar_MTvsST.sh b/Simulation/Tests/ISF_ValidationMT/test/test_MC16_PassBackG4_ttbar_MTvsST.sh index eeb9c99ba35edc8dc4ebd3edce90478fc648811e..0b8f0c07d8cedebd0b3dd0119aee3c440cc27cfc 100755 --- a/Simulation/Tests/ISF_ValidationMT/test/test_MC16_PassBackG4_ttbar_MTvsST.sh +++ b/Simulation/Tests/ISF_ValidationMT/test/test_MC16_PassBackG4_ttbar_MTvsST.sh @@ -19,13 +19,9 @@ Sim_tf.py \ --maxEvents 10 \ --geometryVersion 'default:ATLAS-R2-2016-01-00-01' \ --conditionsTag 'default:OFLCOND-MC16-SDR-14' \ ---DataRunNumber '284500' \ ---physicsList 'FTFP_BERT_ATL' \ ---truthStrategy 'MC15aPlus' \ --simulator 'PassBackG4MT' \ --postInclude 'default:PyJobTransforms/UseFrontier.py' \ ---preInclude 'EVNTtoHITS:SimulationJobOptions/preInclude.BeamPipeKill.py' \ ---preExec 'EVNTtoHITS:simFlags.TightMuonStepping=True' \ +--preInclude 'EVNTtoHITS:Campaigns/MC16Simulation.py' \ --imf False rc=$? @@ -43,13 +39,9 @@ then --maxEvents 10 \ --geometryVersion 'default:ATLAS-R2-2016-01-00-01' \ --conditionsTag 'default:OFLCOND-MC16-SDR-14' \ - --DataRunNumber '284500' \ - --physicsList 'FTFP_BERT_ATL' \ - --truthStrategy 'MC15aPlus' \ --simulator 'PassBackG4MT' \ --postInclude 'default:PyJobTransforms/UseFrontier.py' \ - --preInclude 'EVNTtoHITS:SimulationJobOptions/preInclude.BeamPipeKill.py' \ - --preExec 'EVNTtoHITS:simFlags.TightMuonStepping=True' \ + --preInclude 'EVNTtoHITS:Campaigns/MC16Simulation.py' \ --imf False rc2=$? mv log.EVNTtoHITS log.PassBackG4MTAthena @@ -67,13 +59,9 @@ then --maxEvents 10 \ --geometryVersion 'default:ATLAS-R2-2016-01-00-01' \ --conditionsTag 'default:OFLCOND-MC16-SDR-14' \ - --DataRunNumber '284500' \ - --physicsList 'FTFP_BERT_ATL' \ - --truthStrategy 'MC15aPlus' \ --simulator 'PassBackG4' \ --postInclude 'default:PyJobTransforms/UseFrontier.py' \ - --preInclude 'EVNTtoHITS:SimulationJobOptions/preInclude.BeamPipeKill.py' \ - --preExec 'EVNTtoHITS:simFlags.TightMuonStepping=True' \ + --preInclude 'EVNTtoHITS:Campaigns/MC16Simulation.py' \ --postExec 'svcMgr.ISF_ParticleBrokerSvcNoOrdering.ParticleOrderingTool="ISF__EnergyParticleOrderingTool";svcMgr.ISF_ParticleBrokerSvcNoOrdering.AlwaysUseGeoIDSvc=True' \ --imf False rc3=$? diff --git a/Simulation/Tests/ISF_ValidationMT/test/test_RUN2_ATLFAST3MT_ttbar_CAvsCG.sh b/Simulation/Tests/ISF_ValidationMT/test/test_RUN2_ATLFAST3MT_ttbar_CAvsCG.sh index bf1705380a42c7fd4f6d787f666ad674ede63c8e..01bbb1a8993eae0019a1a70206deb5fa580aa2ac 100755 --- a/Simulation/Tests/ISF_ValidationMT/test/test_RUN2_ATLFAST3MT_ttbar_CAvsCG.sh +++ b/Simulation/Tests/ISF_ValidationMT/test/test_RUN2_ATLFAST3MT_ttbar_CAvsCG.sh @@ -15,12 +15,9 @@ unset ATHENA_CORE_NUMBER Sim_tf.py \ --CA \ --conditionsTag 'default:OFLCOND-MC16-SDR-RUN3-01' \ - --physicsList 'FTFP_BERT_ATL' \ - --truthStrategy 'MC15aPlus' \ --simulator 'ATLFAST3MT' \ --postInclude 'PyJobTransforms.UseFrontier' \ - --preInclude 'EVNTtoHITS:SimuJobTransforms.BeamPipeKill,SimuJobTransforms.TightMuonStepping' \ - --DataRunNumber '284500' \ + --preInclude 'EVNTtoHITS:Campaigns.MC16Simulation' \ --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" \ @@ -38,13 +35,9 @@ if [ $rc -eq 0 ] then Sim_tf.py \ --conditionsTag 'default:OFLCOND-MC16-SDR-RUN3-01' \ - --physicsList 'FTFP_BERT_ATL' \ - --truthStrategy 'MC15aPlus' \ --simulator 'ATLFAST3MT' \ --postInclude 'default:PyJobTransforms/UseFrontier.py' \ - --preInclude 'EVNTtoHITS:SimulationJobOptions/preInclude.BeamPipeKill.py' \ - --preExec 'EVNTtoHITS:simFlags.TightMuonStepping=True' \ - --DataRunNumber '284500' \ + --preInclude 'EVNTtoHITS:Campaigns/MC16Simulation.py' \ --geometryVersion 'default:ATLAS-R2-2016-01-02-01_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.CA.HITS.pool.root" \ @@ -54,13 +47,9 @@ then Sim_tf.py \ --conditionsTag 'default:OFLCOND-MC16-SDR-RUN3-01' \ - --physicsList 'FTFP_BERT_ATL' \ - --truthStrategy 'MC15aPlus' \ --simulator 'ATLFAST3MT' \ --postInclude 'default:PyJobTransforms/UseFrontier.py' \ - --preInclude 'EVNTtoHITS:SimulationJobOptions/preInclude.BeamPipeKill.py' \ - --preExec 'EVNTtoHITS:simFlags.TightMuonStepping=True' \ - --DataRunNumber '284500' \ + --preInclude 'EVNTtoHITS:Campaigns/MC16Simulation.py' \ --geometryVersion 'default:ATLAS-R2-2016-01-02-01_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" \ diff --git a/Simulation/Tests/ISF_ValidationMT/test/test_RUN3Sym_ATLFAST3F_G4MS_ttbar_CAvsCG.sh b/Simulation/Tests/ISF_ValidationMT/test/test_RUN3Sym_ATLFAST3F_G4MS_ttbar_CAvsCG.sh index 0555ead0609b9d5de529fc756e169eed9e3135a7..34cb17bcad6935abc4cf8b5c6c60bc436bc90abe 100755 --- a/Simulation/Tests/ISF_ValidationMT/test/test_RUN3Sym_ATLFAST3F_G4MS_ttbar_CAvsCG.sh +++ b/Simulation/Tests/ISF_ValidationMT/test/test_RUN3Sym_ATLFAST3F_G4MS_ttbar_CAvsCG.sh @@ -7,8 +7,6 @@ # art-output: log.* # art-output: Config*.pkl -# --preExec 'EVNTtoHITS:import InDetRecExample.TrackingCommon as kludgeTheConfig;kludgeTheConfig.use_tracking_geometry_cond_alg=False' \ - unset ATHENA_CORE_NUMBER # RUN3 setup @@ -16,11 +14,9 @@ unset ATHENA_CORE_NUMBER Sim_tf.py \ --CA \ --conditionsTag 'default:OFLCOND-MC16-SDR-RUN3-01' \ - --physicsList 'FTFP_BERT_ATL' \ - --truthStrategy 'MC15aPlus' \ --simulator 'ATLFAST3F_G4MS' \ --postInclude 'PyJobTransforms.UseFrontier' \ - --preInclude 'EVNTtoHITS:SimuJobTransforms.BeamPipeKill' \ + --preInclude 'EVNTtoHITS:Campaigns.MC16Simulation' \ --DataRunNumber '330000' \ --geometryVersion 'default:ATLAS-R3S-2021-01-00-02' \ --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" \ @@ -39,11 +35,9 @@ if [ $rc2 -eq -9999 ] then Sim_tf.py \ --conditionsTag 'default:OFLCOND-MC16-SDR-RUN3-01' \ - --physicsList 'FTFP_BERT_ATL' \ - --truthStrategy 'MC15aPlus' \ --simulator 'ATLFAST3F_G4MS' \ --postInclude 'default:PyJobTransforms/UseFrontier.py' \ - --preInclude 'EVNTtoHITS:SimulationJobOptions/preInclude.BeamPipeKill.py' \ + --preInclude 'EVNTtoHITS:Campaigns/MC16Simulation.py' \ --DataRunNumber '330000' \ --geometryVersion 'default:ATLAS-R3S-2021-01-00-02_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" \ @@ -54,11 +48,9 @@ then Sim_tf.py \ --conditionsTag 'default:OFLCOND-MC16-SDR-RUN3-01' \ - --physicsList 'FTFP_BERT_ATL' \ - --truthStrategy 'MC15aPlus' \ --simulator 'ATLFAST3F_G4MS' \ --postInclude 'default:PyJobTransforms/UseFrontier.py' \ - --preInclude 'EVNTtoHITS:SimulationJobOptions/preInclude.BeamPipeKill.py' \ + --preInclude 'EVNTtoHITS:Campaigns/MC16Simulation.py' \ --DataRunNumber '330000' \ --geometryVersion 'default:ATLAS-R3S-2021-01-00-02_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" \ diff --git a/Simulation/Tests/ISF_ValidationMT/test/test_RUN3Sym_ATLFAST3MT_QS_ttbar_CAvsCG.sh b/Simulation/Tests/ISF_ValidationMT/test/test_RUN3Sym_ATLFAST3MT_QS_ttbar_CAvsCG.sh index d63e890341030ed9f9f0b8fa49af7813e5e16f0c..2c484311dfa64054d07d226b83f5dbf83e15dacb 100755 --- a/Simulation/Tests/ISF_ValidationMT/test/test_RUN3Sym_ATLFAST3MT_QS_ttbar_CAvsCG.sh +++ b/Simulation/Tests/ISF_ValidationMT/test/test_RUN3Sym_ATLFAST3MT_QS_ttbar_CAvsCG.sh @@ -19,7 +19,7 @@ unset ATHENA_CORE_NUMBER --truthStrategy 'MC15aPlus' \ --simulator 'ATLFAST3MT_QS' \ --postInclude 'PyJobTransforms.UseFrontier' \ - --preInclude 'EVNTtoHITS:SimuJobTransforms.BeamPipeKill,SimuJobTransforms.TightMuonStepping' \ + --preInclude 'EVNTtoHITS:Campaigns.MC16Simulation' \ --DataRunNumber '330000' \ --geometryVersion 'default:ATLAS-R3S-2021-01-00-02' \ --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" \ @@ -38,12 +38,9 @@ if [ $rc -eq 0 ] then Sim_tf.py \ --conditionsTag 'default:OFLCOND-MC16-SDR-RUN3-01' \ - --physicsList 'FTFP_BERT_ATL' \ - --truthStrategy 'MC15aPlus' \ --simulator 'ATLFAST3MT_QS' \ --postInclude 'default:PyJobTransforms/UseFrontier.py' \ - --preInclude 'EVNTtoHITS:SimulationJobOptions/preInclude.BeamPipeKill.py,SimulationJobOptions/preInclude.ExtraParticles.py,SimulationJobOptions/preInclude.G4ExtraProcesses.py' \ - --preExec 'EVNTtoHITS:simFlags.TightMuonStepping=True;' \ + --preInclude 'EVNTtoHITS:Campaigns/MC16Simulation.py,SimulationJobOptions/preInclude.ExtraParticles.py,SimulationJobOptions/preInclude.G4ExtraProcesses.py' \ --DataRunNumber '330000' \ --geometryVersion 'default:ATLAS-R3S-2021-01-00-02_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" \ @@ -54,12 +51,9 @@ then Sim_tf.py \ --conditionsTag 'default:OFLCOND-MC16-SDR-RUN3-01' \ - --physicsList 'FTFP_BERT_ATL' \ - --truthStrategy 'MC15aPlus' \ --simulator 'ATLFAST3MT_QS' \ --postInclude 'default:PyJobTransforms/UseFrontier.py' \ - --preInclude 'EVNTtoHITS:SimulationJobOptions/preInclude.BeamPipeKill.py,SimulationJobOptions/preInclude.ExtraParticles.py,SimulationJobOptions/preInclude.G4ExtraProcesses.py' \ - --preExec 'EVNTtoHITS:simFlags.TightMuonStepping=True;' \ + --preInclude 'EVNTtoHITS:Campaigns/MC16Simulation.py,SimulationJobOptions/preInclude.ExtraParticles.py,SimulationJobOptions/preInclude.G4ExtraProcesses.py' \ --DataRunNumber '330000' \ --geometryVersion 'default:ATLAS-R3S-2021-01-00-02_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" \ diff --git a/Simulation/Tests/ISF_ValidationMT/test/test_RUN3Sym_ATLFAST3MT_ttbar_CAvsCG.sh b/Simulation/Tests/ISF_ValidationMT/test/test_RUN3Sym_ATLFAST3MT_ttbar_CAvsCG.sh index 81c5a3401dfb2bd179240914fe05406c415163b0..cd84bdb14eebaf7d0fcb7c34e9a5584b1636f675 100755 --- a/Simulation/Tests/ISF_ValidationMT/test/test_RUN3Sym_ATLFAST3MT_ttbar_CAvsCG.sh +++ b/Simulation/Tests/ISF_ValidationMT/test/test_RUN3Sym_ATLFAST3MT_ttbar_CAvsCG.sh @@ -15,11 +15,9 @@ unset ATHENA_CORE_NUMBER Sim_tf.py \ --CA \ --conditionsTag 'default:OFLCOND-MC16-SDR-RUN3-01' \ - --physicsList 'FTFP_BERT_ATL' \ - --truthStrategy 'MC15aPlus' \ --simulator 'ATLFAST3MT' \ --postInclude 'PyJobTransforms.UseFrontier' \ - --preInclude 'EVNTtoHITS:SimuJobTransforms.BeamPipeKill,SimuJobTransforms.TightMuonStepping' \ + --preInclude 'EVNTtoHITS:Campaigns.MC16Simulation' \ --DataRunNumber '330000' \ --geometryVersion 'default:ATLAS-R3S-2021-01-00-02' \ --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" \ @@ -38,12 +36,9 @@ if [ $rc -eq 0 ] then Sim_tf.py \ --conditionsTag 'default:OFLCOND-MC16-SDR-RUN3-01' \ - --physicsList 'FTFP_BERT_ATL' \ - --truthStrategy 'MC15aPlus' \ --simulator 'ATLFAST3MT' \ --postInclude 'default:PyJobTransforms/UseFrontier.py' \ - --preInclude 'EVNTtoHITS:SimulationJobOptions/preInclude.BeamPipeKill.py' \ - --preExec 'EVNTtoHITS:simFlags.TightMuonStepping=True;' \ + --preInclude 'EVNTtoHITS:Campaigns/MC16Simulation.py' \ --DataRunNumber '330000' \ --geometryVersion 'default:ATLAS-R3S-2021-01-00-02_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" \ @@ -54,12 +49,9 @@ then Sim_tf.py \ --conditionsTag 'default:OFLCOND-MC16-SDR-RUN3-01' \ - --physicsList 'FTFP_BERT_ATL' \ - --truthStrategy 'MC15aPlus' \ --simulator 'ATLFAST3MT' \ --postInclude 'default:PyJobTransforms/UseFrontier.py' \ - --preInclude 'EVNTtoHITS:SimulationJobOptions/preInclude.BeamPipeKill.py' \ - --preExec 'EVNTtoHITS:simFlags.TightMuonStepping=True' \ + --preInclude 'EVNTtoHITS:Campaigns/MC16Simulation.py' \ --DataRunNumber '330000' \ --geometryVersion 'default:ATLAS-R3S-2021-01-00-02_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" \ diff --git a/Simulation/Tests/ISF_ValidationMT/test/test_RUN3Sym_ATLFASTIIF_G4MS_ttbar_CAvsCG.sh b/Simulation/Tests/ISF_ValidationMT/test/test_RUN3Sym_ATLFASTIIF_G4MS_ttbar_CAvsCG.sh index 779ed67d58348807955578c3cf31595708b785a2..061bf83e4c826a80823febee99e40189b513de0e 100755 --- a/Simulation/Tests/ISF_ValidationMT/test/test_RUN3Sym_ATLFASTIIF_G4MS_ttbar_CAvsCG.sh +++ b/Simulation/Tests/ISF_ValidationMT/test/test_RUN3Sym_ATLFASTIIF_G4MS_ttbar_CAvsCG.sh @@ -7,8 +7,6 @@ # art-output: log.* # art-output: Config*.pkl -# --preExec 'EVNTtoHITS:import InDetRecExample.TrackingCommon as kludgeTheConfig;kludgeTheConfig.use_tracking_geometry_cond_alg=False' \ - unset ATHENA_CORE_NUMBER # RUN3 setup @@ -16,11 +14,9 @@ unset ATHENA_CORE_NUMBER Sim_tf.py \ --CA \ --conditionsTag 'default:OFLCOND-MC16-SDR-RUN3-01' \ - --physicsList 'FTFP_BERT_ATL' \ - --truthStrategy 'MC15aPlus' \ --simulator 'ATLFASTIIF_G4MS' \ --postInclude 'PyJobTransforms.UseFrontier' \ - --preInclude 'EVNTtoHITS:SimuJobTransforms.BeamPipeKill' \ + --preInclude 'EVNTtoHITS:Campaigns.MC16Simulation' \ --DataRunNumber '330000' \ --geometryVersion 'default:ATLAS-R3S-2021-01-00-02' \ --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" \ @@ -39,11 +35,9 @@ if [ $rc -eq 0 ] then Sim_tf.py \ --conditionsTag 'default:OFLCOND-MC16-SDR-RUN3-01' \ - --physicsList 'FTFP_BERT_ATL' \ - --truthStrategy 'MC15aPlus' \ --simulator 'ATLFASTIIF_G4MS' \ --postInclude 'default:PyJobTransforms/UseFrontier.py' \ - --preInclude 'EVNTtoHITS:SimulationJobOptions/preInclude.BeamPipeKill.py' \ + --preInclude 'EVNTtoHITS:Campaigns/MC16Simulation.py' \ --DataRunNumber '330000' \ --geometryVersion 'default:ATLAS-R3S-2021-01-00-02_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" \ @@ -54,11 +48,9 @@ then Sim_tf.py \ --conditionsTag 'default:OFLCOND-MC16-SDR-RUN3-01' \ - --physicsList 'FTFP_BERT_ATL' \ - --truthStrategy 'MC15aPlus' \ --simulator 'ATLFASTIIF_G4MS' \ --postInclude 'default:PyJobTransforms/UseFrontier.py' \ - --preInclude 'EVNTtoHITS:SimulationJobOptions/preInclude.BeamPipeKill.py' \ + --preInclude 'EVNTtoHITS:Campaigns/MC16Simulation.py' \ --DataRunNumber '330000' \ --geometryVersion 'default:ATLAS-R3S-2021-01-00-02_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" \ diff --git a/Simulation/Tests/ISF_ValidationMT/test/test_RUN3Sym_ATLFASTIIMT_ttbar_CAvsCG.sh b/Simulation/Tests/ISF_ValidationMT/test/test_RUN3Sym_ATLFASTIIMT_ttbar_CAvsCG.sh index 199d3ee52772defbe0b37f218d19f128c2031b6d..3081197ed29f6497270e9f01c0b8d86c76d31525 100755 --- a/Simulation/Tests/ISF_ValidationMT/test/test_RUN3Sym_ATLFASTIIMT_ttbar_CAvsCG.sh +++ b/Simulation/Tests/ISF_ValidationMT/test/test_RUN3Sym_ATLFASTIIMT_ttbar_CAvsCG.sh @@ -9,8 +9,6 @@ # art-output: Config*.pkl unset ATHENA_CORE_NUMBER -# --preExec 'EVNTtoHITS:simFlags.TightMuonStepping=True;import InDetRecExample.TrackingCommon as kludgeTheConfig;kludgeTheConfig.use_tracking_geometry_cond_alg=False' \ - # RUN3 setup # ATLAS-R3S-2021-01-00-02 and OFLCOND-MC16-SDR-RUN3-01 @@ -21,7 +19,7 @@ Sim_tf.py \ --truthStrategy 'MC15aPlus' \ --simulator 'ATLFASTIIMT' \ --postInclude 'PyJobTransforms.UseFrontier' \ - --preInclude 'EVNTtoHITS:SimuJobTransforms.BeamPipeKill,SimuJobTransforms.TightMuonStepping' \ + --preInclude 'EVNTtoHITS:Campaigns.MC16Simulation' \ --DataRunNumber '330000' \ --geometryVersion 'default:ATLAS-R3S-2021-01-00-02' \ --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" \ @@ -40,12 +38,9 @@ if [ $rc -eq 0 ] then Sim_tf.py \ --conditionsTag 'default:OFLCOND-MC16-SDR-RUN3-01' \ - --physicsList 'FTFP_BERT_ATL' \ - --truthStrategy 'MC15aPlus' \ --simulator 'ATLFASTIIMT' \ --postInclude 'default:PyJobTransforms/UseFrontier.py' \ - --preInclude 'EVNTtoHITS:SimulationJobOptions/preInclude.BeamPipeKill.py' \ - --preExec 'EVNTtoHITS:simFlags.TightMuonStepping=True' \ + --preInclude 'EVNTtoHITS:Campaigns/MC16Simulation.py' \ --DataRunNumber '330000' \ --geometryVersion 'default:ATLAS-R3S-2021-01-00-02_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" \ @@ -56,12 +51,9 @@ then Sim_tf.py \ --conditionsTag 'default:OFLCOND-MC16-SDR-RUN3-01' \ - --physicsList 'FTFP_BERT_ATL' \ - --truthStrategy 'MC15aPlus' \ --simulator 'ATLFASTIIMT' \ --postInclude 'default:PyJobTransforms/UseFrontier.py' \ - --preInclude 'EVNTtoHITS:SimulationJobOptions/preInclude.BeamPipeKill.py' \ - --preExec 'EVNTtoHITS:simFlags.TightMuonStepping=True' \ + --preInclude 'EVNTtoHITS:Campaigns/MC16Simulation.py' \ --DataRunNumber '330000' \ --geometryVersion 'default:ATLAS-R3S-2021-01-00-02_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" \ diff --git a/Simulation/Tests/ISF_ValidationMT/test/test_RUN3Sym_FullG4MT_QS_ttbar_CAvsCG.sh b/Simulation/Tests/ISF_ValidationMT/test/test_RUN3Sym_FullG4MT_QS_ttbar_CAvsCG.sh index 5289a8cee7dac07cdcae611fd0bc138c3eb97768..a7df8660cbb900d8404c377bce115e9c0f9cce1a 100755 --- a/Simulation/Tests/ISF_ValidationMT/test/test_RUN3Sym_FullG4MT_QS_ttbar_CAvsCG.sh +++ b/Simulation/Tests/ISF_ValidationMT/test/test_RUN3Sym_FullG4MT_QS_ttbar_CAvsCG.sh @@ -15,11 +15,9 @@ unset ATHENA_CORE_NUMBER Sim_tf.py \ --CA \ --conditionsTag 'default:OFLCOND-MC16-SDR-RUN3-01' \ - --physicsList 'FTFP_BERT_ATL' \ - --truthStrategy 'MC15aPlus' \ --simulator 'FullG4MT_QS' \ --postInclude 'PyJobTransforms.UseFrontier' \ - --preInclude 'EVNTtoHITS:SimuJobTransforms.BeamPipeKill,SimuJobTransforms.TightMuonStepping' \ + --preInclude 'EVNTtoHITS:Campaigns.MC16Simulation' \ --DataRunNumber '330000' \ --geometryVersion 'default:ATLAS-R3S-2021-01-00-02' \ --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" \ @@ -38,12 +36,9 @@ if [ $rc -eq 0 ] then Sim_tf.py \ --conditionsTag 'default:OFLCOND-MC16-SDR-RUN3-01' \ - --physicsList 'FTFP_BERT_ATL' \ - --truthStrategy 'MC15aPlus' \ --simulator 'FullG4MT_QS' \ --postInclude 'default:PyJobTransforms/UseFrontier.py' \ - --preInclude 'EVNTtoHITS:SimulationJobOptions/preInclude.BeamPipeKill.py,SimulationJobOptions/preInclude.ExtraParticles.py,SimulationJobOptions/preInclude.G4ExtraProcesses.py' \ - --preExec 'EVNTtoHITS:simFlags.TightMuonStepping=True;import InDetRecExample.TrackingCommon as kludgeTheConfig;kludgeTheConfig.use_tracking_geometry_cond_alg=False' \ + --preInclude 'EVNTtoHITS:Campaigns/MC16Simulation.py,SimulationJobOptions/preInclude.ExtraParticles.py,SimulationJobOptions/preInclude.G4ExtraProcesses.py' \ --DataRunNumber '330000' \ --geometryVersion 'default:ATLAS-R3S-2021-01-00-02_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" \ @@ -54,12 +49,9 @@ then Sim_tf.py \ --conditionsTag 'default:OFLCOND-MC16-SDR-RUN3-01' \ - --physicsList 'FTFP_BERT_ATL' \ - --truthStrategy 'MC15aPlus' \ --simulator 'FullG4MT_QS' \ --postInclude 'default:PyJobTransforms/UseFrontier.py' \ - --preInclude 'EVNTtoHITS:SimulationJobOptions/preInclude.BeamPipeKill.py,SimulationJobOptions/preInclude.ExtraParticles.py,SimulationJobOptions/preInclude.G4ExtraProcesses.py' \ - --preExec 'EVNTtoHITS:simFlags.TightMuonStepping=True' \ + --preInclude 'EVNTtoHITS:Campaigns/MC16Simulation.py,SimulationJobOptions/preInclude.ExtraParticles.py,SimulationJobOptions/preInclude.G4ExtraProcesses.py' \ --DataRunNumber '330000' \ --geometryVersion 'default:ATLAS-R3S-2021-01-00-02_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" \ diff --git a/Simulation/Tests/ISF_ValidationMT/test/test_RUN3Sym_PassBackG4MT_ttbar_CAvsCG.sh b/Simulation/Tests/ISF_ValidationMT/test/test_RUN3Sym_PassBackG4MT_ttbar_CAvsCG.sh index e44f80193cd393dc6f5dbaa6b3dfd9c5a0354f76..2ea619be1c4821883bdb3824233dc7e80cb0a12a 100755 --- a/Simulation/Tests/ISF_ValidationMT/test/test_RUN3Sym_PassBackG4MT_ttbar_CAvsCG.sh +++ b/Simulation/Tests/ISF_ValidationMT/test/test_RUN3Sym_PassBackG4MT_ttbar_CAvsCG.sh @@ -15,11 +15,9 @@ unset ATHENA_CORE_NUMBER Sim_tf.py \ --CA \ --conditionsTag 'default:OFLCOND-MC16-SDR-RUN3-01' \ - --physicsList 'FTFP_BERT_ATL' \ - --truthStrategy 'MC15aPlus' \ --simulator 'PassBackG4MT' \ --postInclude 'PyJobTransforms.UseFrontier' \ - --preInclude 'EVNTtoHITS:SimuJobTransforms.BeamPipeKill,SimuJobTransforms.TightMuonStepping' \ + --preInclude 'EVNTtoHITS:Campaigns.MC16Simulation' \ --DataRunNumber '330000' \ --geometryVersion 'default:ATLAS-R3S-2021-01-00-02' \ --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" \ @@ -38,12 +36,9 @@ if [ $rc -eq 0 ] then Sim_tf.py \ --conditionsTag 'default:OFLCOND-MC16-SDR-RUN3-01' \ - --physicsList 'FTFP_BERT_ATL' \ - --truthStrategy 'MC15aPlus' \ --simulator 'PassBackG4MT' \ --postInclude 'default:PyJobTransforms/UseFrontier.py' \ - --preInclude 'EVNTtoHITS:SimulationJobOptions/preInclude.BeamPipeKill.py' \ - --preExec 'EVNTtoHITS:simFlags.TightMuonStepping=True' \ + --preInclude 'EVNTtoHITS:Campaigns/MC16Simulation.py' \ --DataRunNumber '330000' \ --geometryVersion 'default:ATLAS-R3S-2021-01-00-02_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" \ @@ -54,12 +49,9 @@ then Sim_tf.py \ --conditionsTag 'default:OFLCOND-MC16-SDR-RUN3-01' \ - --physicsList 'FTFP_BERT_ATL' \ - --truthStrategy 'MC15aPlus' \ --simulator 'PassBackG4MT' \ --postInclude 'default:PyJobTransforms/UseFrontier.py' \ - --preInclude 'EVNTtoHITS:SimulationJobOptions/preInclude.BeamPipeKill.py' \ - --preExec 'EVNTtoHITS:simFlags.TightMuonStepping=True' \ + --preInclude 'EVNTtoHITS:Campaigns/MC16Simulation.py' \ --DataRunNumber '330000' \ --geometryVersion 'default:ATLAS-R3S-2021-01-00-02_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" \ diff --git a/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_ATLFAST3_ttbar_MP.sh b/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_ATLFAST3_ttbar_MP.sh index e9b988f67abd1161698783da02b7f30f03f6c9e9..f320ad0651c93b7411dadef770ec1181b34f3d3b 100755 --- a/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_ATLFAST3_ttbar_MP.sh +++ b/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_ATLFAST3_ttbar_MP.sh @@ -9,24 +9,20 @@ # RUN3 setup # ATLAS-R3S-2021-01-00-02 and OFLCOND-MC16-SDR-RUN3-01 -# Increase maxEvents to 250 once ATLASSIM-5576 is fixed. export ATHENA_CORE_NUMBER=4 Sim_tf.py \ --multiprocess \ --conditionsTag 'default:OFLCOND-MC16-SDR-RUN3-01' \ ---physicsList 'FTFP_BERT_ATL' \ ---truthStrategy 'MC15aPlus' \ --simulator 'ATLFAST3MT' \ --postInclude 'default:PyJobTransforms/UseFrontier.py' \ ---preInclude 'EVNTtoHITS:SimulationJobOptions/preInclude.BeamPipeKill.py' \ ---preExec 'EVNTtoHITS:simFlags.TightMuonStepping=True' \ +--preInclude 'EVNTtoHITS:Campaigns/MC16Simulation.py' \ --DataRunNumber '330000' \ --geometryVersion 'default:ATLAS-R3S-2021-01-00-02_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 12 \ +--maxEvents 250 \ --imf False rc=$? diff --git a/Simulation/Tests/ISF_ValidationMT/test/test_Sim_G4FastCalo_ttbar_MP.sh b/Simulation/Tests/ISF_ValidationMT/test/test_Sim_G4FastCalo_ttbar_MP.sh index 72e12d37d65c42f506de940a79c6207a37fddd4a..c464a0d2286edf8c3c6bf6ffda768fd60b839061 100755 --- a/Simulation/Tests/ISF_ValidationMT/test/test_Sim_G4FastCalo_ttbar_MP.sh +++ b/Simulation/Tests/ISF_ValidationMT/test/test_Sim_G4FastCalo_ttbar_MP.sh @@ -18,13 +18,9 @@ export ATHENA_CORE_NUMBER=8 Sim_tf.py \ --multiprocess \ --conditionsTag 'default:OFLCOND-MC16-SDR-14' \ ---physicsList 'FTFP_BERT_ATL' \ ---truthStrategy 'MC15aPlus' \ --simulator 'G4FastCalo' \ --postInclude 'default:PyJobTransforms/UseFrontier.py' \ ---preInclude 'EVNTtoHITS:SimulationJobOptions/preInclude.BeamPipeKill.py' \ ---preExec 'EVNTtoHITS:simFlags.TightMuonStepping=True' \ ---DataRunNumber '284500' \ +--preInclude 'EVNTtoHITS:Campaigns/MC16Simulation.py' \ --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" \ diff --git a/TileCalorimeter/TileConditions/python/TileCondToolConf.py b/TileCalorimeter/TileConditions/python/TileCondToolConf.py index 9fd70a2d764036e0c6a71fcd459fb4912528d67d..7a343644ffff9fb80cc8d79cdf00817a122b0335 100644 --- a/TileCalorimeter/TileConditions/python/TileCondToolConf.py +++ b/TileCalorimeter/TileConditions/python/TileCondToolConf.py @@ -798,9 +798,18 @@ def bookTileSamplingFractionCondAlg(source = 'FILE'): else: raise(Exception("Invalid source: %s" %source )) + G4Version = "" try: from Digitization.DigitizationFlags import jobproperties G4Version = jobproperties.Digitization.SimG4VersionUsed() + if not G4Version or G4Version == 'not_specified': + from PyUtils.MetaReaderPeeker import metadata + G4Version = "" + if "G4Version" in metadata.keys(): + G4Version = metadata["G4Version"] + if not G4Version: + from os import environ + G4Version = str(environ.get("G4VERS", "")) G4VersionMajor, G4VersionMinor = G4Version.split(".")[1:3] G4V = int(G4VersionMajor) * 100 + int(G4VersionMinor) except Exception: diff --git a/TileCalorimeter/TileConditions/python/TileSamplingFractionConfig.py b/TileCalorimeter/TileConditions/python/TileSamplingFractionConfig.py index 044e96294c02952822153764904f3c5997b88535..e99cf41eec006316fa0b2b623dc5623fac37d2aa 100644 --- a/TileCalorimeter/TileConditions/python/TileSamplingFractionConfig.py +++ b/TileCalorimeter/TileConditions/python/TileSamplingFractionConfig.py @@ -32,7 +32,7 @@ def TileSamplingFractionCondAlgCfg(flags, **kwargs): samplingFractionProxy = TileCondProxyCoolFlt('TileCondProxyCool_SamplingFraction', Source = samplingFractionFolder) samplingFractionTag = None # Tag connected to global conditions tag is used by default - if flags.GeoModel.Run >= LHCPeriod.Run4 or flags.Overlay.DataOverlay: + if flags.GeoModel.Run >= LHCPeriod.Run4 or flags.Overlay.DataOverlay or flags.Sim.ISF.Simulator.usesFastCaloSim(): samplingFractionTag = 'TileOfl02CalibSfr-SIM-07' from IOVDbSvc.IOVDbSvcConfig import addFolders diff --git a/TileCalorimeter/TileConditions/share/TileConditions_jobOptions.py b/TileCalorimeter/TileConditions/share/TileConditions_jobOptions.py index 75f40eac52bc050d0c954037cc56826e565d874c..3875aef11e6230f4c4157c8c2cf817272c200f9d 100644 --- a/TileCalorimeter/TileConditions/share/TileConditions_jobOptions.py +++ b/TileCalorimeter/TileConditions/share/TileConditions_jobOptions.py @@ -174,5 +174,4 @@ else: from AthenaCommon.GlobalFlags import globalflags if globalflags.DataSource() != 'data': # Set up Tile samping fraction for MC jobs - from TileConditions.TileCondToolConf import bookTileSamplingFractionCondAlg - bookTileSamplingFractionCondAlg(source='FILE') + tileInfoConfigurator.setupCOOLSFR() diff --git a/Tools/Campaigns/share/MC16Simulation.py b/Tools/Campaigns/share/MC16Simulation.py index 02caf74bf8dea3319d84db563e556e8d13f2555b..5735e62051ac78846f62b194ccda56031d1729c0 100644 --- a/Tools/Campaigns/share/MC16Simulation.py +++ b/Tools/Campaigns/share/MC16Simulation.py @@ -12,5 +12,9 @@ simFlags.TightMuonStepping = True from ISF_Config.ISF_jobProperties import ISF_Flags from AthenaCommon.Resilience import protectedInclude protectedInclude("SimulationJobOptions/preInclude.BeamPipeKill.py") +if "ATLFAST" in ISF_Flags.Simulator() or "G4FastCalo" in ISF_Flags.Simulator(): + # FastCaloSim requires the Sampling Fractions to be present + from IOVDbSvc.CondDB import conddb + conddb.addOverride("/TILE/OFL02/CALIB/SFR","TileOfl02CalibSfr-SIM-07") if "FullG4" in ISF_Flags.Simulator(): protectedInclude("SimulationJobOptions/preInclude.FrozenShowersFCalOnly.py") diff --git a/Tools/Campaigns/share/MC21Simulation.py b/Tools/Campaigns/share/MC21Simulation.py index a757f310f065e73a952e4478884dea588def6748..de04995bbf6a1a41f5d18b632b87b74f49354298 100644 --- a/Tools/Campaigns/share/MC21Simulation.py +++ b/Tools/Campaigns/share/MC21Simulation.py @@ -12,6 +12,10 @@ simFlags.TightMuonStepping = True from ISF_Config.ISF_jobProperties import ISF_Flags from AthenaCommon.Resilience import protectedInclude protectedInclude("SimulationJobOptions/preInclude.BeamPipeKill.py") +if "ATLFAST" in ISF_Flags.Simulator() or "G4FastCalo" in ISF_Flags.Simulator(): + # FastCaloSim requires the Sampling Fractions to be present + from IOVDbSvc.CondDB import conddb + conddb.addOverride("/TILE/OFL02/CALIB/SFR","TileOfl02CalibSfr-SIM-07") if "FullG4" in ISF_Flags.Simulator(): # Not tuned yet for G4 10.6 # protectedInclude("SimulationJobOptions/preInclude.FrozenShowersFCalOnly.py") diff --git a/Tools/Campaigns/share/MC21SimulationMultiBeamSpot.py b/Tools/Campaigns/share/MC21SimulationMultiBeamSpot.py index 9a164e8910eec2aa480004ed040474f5046fac3d..359e8b1309ec785dac42374dc6fff97c14dd9914 100644 --- a/Tools/Campaigns/share/MC21SimulationMultiBeamSpot.py +++ b/Tools/Campaigns/share/MC21SimulationMultiBeamSpot.py @@ -14,6 +14,9 @@ protectedInclude("RunDependentSimData/configLumi_simProfile_run410000_mc21a_Mult from ISF_Config.ISF_jobProperties import ISF_Flags protectedInclude("SimulationJobOptions/preInclude.BeamPipeKill.py") +if "ATLFAST" in ISF_Flags.Simulator() or "G4FastCalo" in ISF_Flags.Simulator(): + from IOVDbSvc.CondDB import conddb + conddb.addOverride("/TILE/OFL02/CALIB/SFR","TileOfl02CalibSfr-SIM-07") if "FullG4" in ISF_Flags.Simulator(): # Not tuned yet for G4 10.6 # protectedInclude("SimulationJobOptions/preInclude.FrozenShowersFCalOnly.py") diff --git a/Tools/WorkflowTestRunner/python/References.py b/Tools/WorkflowTestRunner/python/References.py index 56a03054dc28378eee217cbd53020e5ecbbf0af6..3ced2c351408064121ddcce23a6710c3449914cb 100644 --- a/Tools/WorkflowTestRunner/python/References.py +++ b/Tools/WorkflowTestRunner/python/References.py @@ -13,7 +13,7 @@ references_map = { # Simulation "s3759": "v8", "s3760": "v6", - "s3779": "v3", + "s3779": "v4", # Overlay "d1590": "v8", "d1726": "v4",