diff --git a/LArCalorimeter/LArG4/LArG4FastSimulation/python/LArG4FastSimulationConfig.py b/LArCalorimeter/LArG4/LArG4FastSimulation/python/LArG4FastSimulationConfig.py index a4c224f2a4c50341b1f666d77971fdfd3fd672df..99d601de6eb7f215b6f88150be5d46718d862e7d 100644 --- a/LArCalorimeter/LArG4/LArG4FastSimulation/python/LArG4FastSimulationConfig.py +++ b/LArCalorimeter/LArG4/LArG4FastSimulation/python/LArG4FastSimulationConfig.py @@ -11,15 +11,13 @@ def LArG4ShowerLibSvcCfg(ConfigFlags, **kwargs): fileNameList = [] #TODO make this configurable based on ConfigFlags? # FCAL1 frozen shower libraries - fileNameList += [ "LArG4ShowerLibData/MC21_v2/LArG4ShowerLib.FCAL1.11.root", - "LArG4ShowerLibData/MC21_v2/LArG4ShowerLib.FCAL1.22.root", - "LArG4ShowerLibData/MC21_v2/LArG4ShowerLib.FCAL1.2112.root", - "LArG4ShowerLibData/MC21_v2/LArG4ShowerLib.FCAL1.211.root" ] + fileNameList += [ "LArG4ShowerLibData/MC23_v1/LArG4ShowerLib.FCAL1.11.root", + "LArG4ShowerLibData/MC23_v1/LArG4ShowerLib.FCAL1.22.root", + "LArG4ShowerLibData/MC23_v1/LArG4ShowerLib.FCAL1.2112.root"] # FCAL2 frozen shower libraries - fileNameList += [ "LArG4ShowerLibData/MC21_v2/LArG4ShowerLib.FCAL2.11.root", - "LArG4ShowerLibData/MC21_v2/LArG4ShowerLib.FCAL2.22.root", - "LArG4ShowerLibData/MC21_v2/LArG4ShowerLib.FCAL2.2112.root", - "LArG4ShowerLibData/MC21_v2/LArG4ShowerLib.FCAL2.211.root" ] + fileNameList += [ "LArG4ShowerLibData/MC23_v1/LArG4ShowerLib.FCAL2.11.root", + "LArG4ShowerLibData/MC23_v1/LArG4ShowerLib.FCAL2.22.root", + "LArG4ShowerLibData/MC23_v1/LArG4ShowerLib.FCAL2.2112.root"] kwargs.setdefault("FileNameList", fileNameList) result.addService(LArG4ShowerLibSvc(name="LArG4ShowerLibSvc", **kwargs)) return result diff --git a/LArCalorimeter/LArG4/LArG4ShowerLibSvc/python/LArG4ShowerLibSvcConfigLegacy.py b/LArCalorimeter/LArG4/LArG4ShowerLibSvc/python/LArG4ShowerLibSvcConfigLegacy.py index 7910c61623be6d54403e6301df1f44b901f53d37..bbe145550b7e4719fc0ad5d4b33f6e39b50eb230 100644 --- a/LArCalorimeter/LArG4/LArG4ShowerLibSvc/python/LArG4ShowerLibSvcConfigLegacy.py +++ b/LArCalorimeter/LArG4/LArG4ShowerLibSvc/python/LArG4ShowerLibSvcConfigLegacy.py @@ -6,14 +6,12 @@ def getLArG4ShowerLibSvc(name="LArG4ShowerLibSvc", **kwargs): fileNameList = [] #TODO make this configurable based on simFlags? # FCAL1 frozen shower libraries - fileNameList += [ "LArG4ShowerLibData/MC21_v2/LArG4ShowerLib.FCAL1.11.root", - "LArG4ShowerLibData/MC21_v2/LArG4ShowerLib.FCAL1.22.root", - "LArG4ShowerLibData/MC21_v2/LArG4ShowerLib.FCAL1.2112.root", - "LArG4ShowerLibData/MC21_v2/LArG4ShowerLib.FCAL1.211.root" ] + fileNameList += [ "LArG4ShowerLibData/MC23_v1/LArG4ShowerLib.FCAL1.11.root", + "LArG4ShowerLibData/MC23_v1/LArG4ShowerLib.FCAL1.22.root", + "LArG4ShowerLibData/MC23_v1/LArG4ShowerLib.FCAL1.2112.root"] # FCAL2 frozen shower libraries - fileNameList += [ "LArG4ShowerLibData/MC21_v2/LArG4ShowerLib.FCAL2.11.root", - "LArG4ShowerLibData/MC21_v2/LArG4ShowerLib.FCAL2.22.root", - "LArG4ShowerLibData/MC21_v2/LArG4ShowerLib.FCAL2.2112.root", - "LArG4ShowerLibData/MC21_v2/LArG4ShowerLib.FCAL2.211.root" ] + fileNameList += [ "LArG4ShowerLibData/MC23_v1/LArG4ShowerLib.FCAL2.11.root", + "LArG4ShowerLibData/MC23_v1/LArG4ShowerLib.FCAL2.22.root", + "LArG4ShowerLibData/MC23_v1/LArG4ShowerLib.FCAL2.2112.root"] kwargs.setdefault("FileNameList", fileNameList) return CfgMgr.LArG4ShowerLibSvc(name, **kwargs) diff --git a/Tools/PROCTools/data/q447_AOD_digest.ref b/Tools/PROCTools/data/q447_AOD_digest.ref index 05d8d02e2018d4a0d106d9129c9ff9ea40bfc67a..26017293f6511d32090033559fb94a722586e4db 100644 --- a/Tools/PROCTools/data/q447_AOD_digest.ref +++ b/Tools/PROCTools/data/q447_AOD_digest.ref @@ -1,6 +1,6 @@ run event nTopo nIdTracks nTauTracks nTaus nMuons nElec nTrueElec nFakeElec nPhot nTruePhot nFakePhot - 242000 60001 633 74 7 4 2 1 0 1 3 1 2 - 242000 60002 410 51 16 3 2 5 2 3 3 2 1 - 242000 60003 136 5 0 0 0 0 0 0 0 0 0 - 242000 60004 321 21 8 3 2 2 0 2 4 1 3 - 242000 60005 348 30 6 1 0 0 0 0 0 0 0 + 242000 60001 605 73 2 1 2 1 0 1 3 2 1 + 242000 60002 421 43 17 3 2 6 2 4 8 4 4 + 242000 60003 134 4 0 0 0 0 0 0 0 0 0 + 242000 60004 300 24 7 1 2 2 0 2 4 1 3 + 242000 60005 384 22 0 0 0 0 0 0 1 1 0 diff --git a/Tools/WorkflowTestRunner/python/References.py b/Tools/WorkflowTestRunner/python/References.py index 1678d473ce9bfcf527dbaf15343892688a36b030..bba7d9f2d3cdc0f8bc383549ff717b30f22e4901 100644 --- a/Tools/WorkflowTestRunner/python/References.py +++ b/Tools/WorkflowTestRunner/python/References.py @@ -13,11 +13,11 @@ references_map = { # Simulation "s3759": "v11", "s3760": "v10", - "s3761": "v1", + "s3761": "v2", "s3779": "v4", - "s4005": "v1", - "s4006": "v1", - "s4007": "v1", + "s4005": "v2", + "s4006": "v2", + "s4007": "v2", "s4008": "v1", # Overlay "d1590": "v11",