diff --git a/Simulation/G4Atlas/G4AtlasApps/python/SimEnums.py b/Simulation/G4Atlas/G4AtlasApps/python/SimEnums.py index fd4f21a47030c8dd89680387eb7f8c24d5813b63..a8944735ad518f32f9395f9710e38fdee600c0ef 100644 --- a/Simulation/G4Atlas/G4AtlasApps/python/SimEnums.py +++ b/Simulation/G4Atlas/G4AtlasApps/python/SimEnums.py @@ -45,9 +45,6 @@ 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 77a493a8254451c0d5685cc3636334966739f3ef..eb8305d13058dc4aa498d179b6bfe2e596717390 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 and ("ATLFAST" in ISF_Flags.Simulator() or ISF_Flags.Simulator() in ["G4FastCalo", 'FatrasGammaCones_FastCalo', 'G4BHadronsOnly_FastCalo', 'G4GammaCones', 'G4GammaCones_FastCalo']): + if "AthSimulation_DIR" not in os.environ: if DetFlags.detdescr.LAr_on(): protectedInclude( "LArDetDescr/LArDetDescr_joboptions.py" ) 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 13166f7b4054b49a8ef807e54aff4a33e151eeec..2e19c68eba95e5c1cff50ea3187cc77a4c0b009d 100755 --- a/Simulation/Tests/ISF_Validation/test/test_FatrasGammaCones_FastCalo_2evts.sh +++ b/Simulation/Tests/ISF_Validation/test/test_FatrasGammaCones_FastCalo_2evts.sh @@ -17,7 +17,6 @@ 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 d9f82778fa8659a6539f55ed23d6f3707d873975..365b343092da47396f561baf680815f7ecf2e5b3 100755 --- a/Simulation/Tests/ISF_Validation/test/test_G4BHadronsOnly_FastCalo_2evts.sh +++ b/Simulation/Tests/ISF_Validation/test/test_G4BHadronsOnly_FastCalo_2evts.sh @@ -17,7 +17,6 @@ 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 b35b5abd27c3f90b7a8fa2f5714f70b5bbfb7197..605353561c7b3a381b8206bcf01e9ea55b7dc3e2 100755 --- a/Simulation/Tests/ISF_Validation/test/test_G4GammaCones_2evts.sh +++ b/Simulation/Tests/ISF_Validation/test/test_G4GammaCones_2evts.sh @@ -17,7 +17,6 @@ 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 8d2dc79378e78c2972623d8ecab0bfa7a69eaf0b..291eb53093af3bf9e09235668983bc7ca6a1b865 100755 --- a/Simulation/Tests/ISF_Validation/test/test_G4GammaCones_FastCalo_2evts.sh +++ b/Simulation/Tests/ISF_Validation/test/test_G4GammaCones_FastCalo_2evts.sh @@ -17,7 +17,6 @@ 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/TileCalorimeter/TileConditions/python/TileCondToolConf.py b/TileCalorimeter/TileConditions/python/TileCondToolConf.py index 7a343644ffff9fb80cc8d79cdf00817a122b0335..9fd70a2d764036e0c6a71fcd459fb4912528d67d 100644 --- a/TileCalorimeter/TileConditions/python/TileCondToolConf.py +++ b/TileCalorimeter/TileConditions/python/TileCondToolConf.py @@ -798,18 +798,9 @@ 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 e99cf41eec006316fa0b2b623dc5623fac37d2aa..044e96294c02952822153764904f3c5997b88535 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 or flags.Sim.ISF.Simulator.usesFastCaloSim(): + if flags.GeoModel.Run >= LHCPeriod.Run4 or flags.Overlay.DataOverlay: 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 3875aef11e6230f4c4157c8c2cf817272c200f9d..75f40eac52bc050d0c954037cc56826e565d874c 100644 --- a/TileCalorimeter/TileConditions/share/TileConditions_jobOptions.py +++ b/TileCalorimeter/TileConditions/share/TileConditions_jobOptions.py @@ -174,4 +174,5 @@ else: from AthenaCommon.GlobalFlags import globalflags if globalflags.DataSource() != 'data': # Set up Tile samping fraction for MC jobs - tileInfoConfigurator.setupCOOLSFR() + from TileConditions.TileCondToolConf import bookTileSamplingFractionCondAlg + bookTileSamplingFractionCondAlg(source='FILE') diff --git a/Tools/Campaigns/share/MC16Simulation.py b/Tools/Campaigns/share/MC16Simulation.py index 5735e62051ac78846f62b194ccda56031d1729c0..02caf74bf8dea3319d84db563e556e8d13f2555b 100644 --- a/Tools/Campaigns/share/MC16Simulation.py +++ b/Tools/Campaigns/share/MC16Simulation.py @@ -12,9 +12,5 @@ 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 de04995bbf6a1a41f5d18b632b87b74f49354298..a757f310f065e73a952e4478884dea588def6748 100644 --- a/Tools/Campaigns/share/MC21Simulation.py +++ b/Tools/Campaigns/share/MC21Simulation.py @@ -12,10 +12,6 @@ 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 359e8b1309ec785dac42374dc6fff97c14dd9914..9a164e8910eec2aa480004ed040474f5046fac3d 100644 --- a/Tools/Campaigns/share/MC21SimulationMultiBeamSpot.py +++ b/Tools/Campaigns/share/MC21SimulationMultiBeamSpot.py @@ -14,9 +14,6 @@ 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 0336b7a31297cb2a61593fec0e6a918f53f131f9..5f103af43cd8169eeb25becaacc833f11204d0a4 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": "v4", + "s3779": "v3", # Overlay "d1590": "v9", "d1726": "v4",