diff --git a/Calorimeter/CaloClusterCorrection/test/config_t.py b/Calorimeter/CaloClusterCorrection/test/config_t.py
index 9ffcbccad690ec557e6e1b051cd816786f974f2a..259a5c310e16e70ed61eaa4da1f029681b93b1ae 100644
--- a/Calorimeter/CaloClusterCorrection/test/config_t.py
+++ b/Calorimeter/CaloClusterCorrection/test/config_t.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
#
# File: CaloClusterCorrection/test/config_t.py
@@ -347,8 +347,6 @@ def test3 (flags_in):
flags.lock()
from CaloClusterCorrection.CaloSwCorrections import layers, update, gap, calhits
- from CaloClusterCorrection.constants import CALOCORR_JO, CALOCORR_POOL
- from CaloClusterCorrection.poolfiles import poolfiles
ca = make_CaloSwCorrectionsCfg (flags, key = 'gam35',
corrlist = [[layers],
[update],
@@ -413,7 +411,6 @@ def test4 (flags_in):
from CaloClusterCorrection.constants import CALOCORR_SW
from CaloClusterCorrection.common import makecorr
from CaloClusterCorrection.CaloSwGap import CaloSwGap_versions
- from CaloClusterCorrection.CaloSwCorrections import CaloSwCorrections
ca = makecorr (flags,
CaloSwGap_versions,
@@ -458,7 +455,6 @@ def test5 (flags_in):
from CaloClusterCorrection.constants import CALOCORR_SW
from CaloClusterCorrection.common import makecorr, CaloCorrectionConfigError
from CaloClusterCorrection.CaloSwGap import CaloSwGap_versions
- from CaloClusterCorrection.CaloSwCorrections import CaloSwCorrections
try:
makecorr (flags,
@@ -491,7 +487,6 @@ def test6 (flags_in):
from CaloClusterCorrection.constants import CALOCORR_SW
from CaloClusterCorrection.common import makecorr, CaloCorrectionConfigError
from CaloClusterCorrection.CaloSwGap import CaloSwGap_versions
- from CaloClusterCorrection.CaloSwCorrections import CaloSwCorrections
try:
makecorr (flags,
@@ -524,7 +519,6 @@ def test7 (flags_in):
from CaloClusterCorrection.constants import CALOCORR_SW
from CaloClusterCorrection.common import makecorr
from CaloClusterCorrection.CaloSwGap import CaloSwGap_versions
- from CaloClusterCorrection.CaloSwCorrections import CaloSwCorrections
ca = makecorr (flags,
CaloSwGap_versions,
@@ -567,8 +561,6 @@ def test8 (flags_in):
from CaloClusterCorrection.constants import CALOCORR_SW, CALOCORR_COOL
from CaloClusterCorrection.common import makecorr
- from CaloClusterCorrection.CaloSwGap import CaloSwGap_versions
- from CaloClusterCorrection.CaloSwCorrections import CaloSwCorrections
cls_v2 = CompFactory.CaloSwGap_v2 # CaloClusterCorrection
ca = makecorr (flags,
@@ -610,10 +602,9 @@ def test9 (flags_in):
flags = flags_in.clone()
flags.lock()
- from CaloClusterCorrection.constants import CALOCORR_SW, CALOCORR_COOL
+ from CaloClusterCorrection.constants import CALOCORR_SW
from CaloClusterCorrection.common import makecorr
from CaloClusterCorrection.CaloSwGap import CaloSwGap_versions
- from CaloClusterCorrection.CaloSwCorrections import CaloSwCorrections
ca = makecorr (flags,
CaloSwGap_versions,
@@ -642,8 +633,6 @@ def test10 (flags_in):
from CaloClusterCorrection.constants import CALOCORR_SW, CALOCORR_NOPOOL, CALOCORR_TOPOOL
from CaloClusterCorrection.common import makecorr
- from CaloClusterCorrection.CaloSwGap import CaloSwGap_versions
- from CaloClusterCorrection.CaloSwCorrections import CaloSwCorrections
cls_v2 = CompFactory.CaloSwGap_v2 # CaloClusterCorrection
ca = makecorr (flags,
@@ -674,7 +663,6 @@ def test11 (flags_in):
from CaloClusterCorrection.constants import CALOCORR_SW, EMB1, EMB2, CALOCORR_COOL
from CaloClusterCorrection.common import makecorr
from CaloClusterCorrection.CaloSwGap import CaloSwGap_versions
- from CaloClusterCorrection.CaloSwCorrections import CaloSwCorrections
cls_v2 = CompFactory.CaloSwGap_v2 # CaloClusterCorrection
cls_v3 = CompFactory.CaloSwGap_v3 # CaloClusterCorrection
@@ -726,10 +714,9 @@ def test12 (flags_in):
flags = flags_in.clone()
flags.lock()
- from CaloClusterCorrection.constants import CALOCORR_SW, EMB1, EMB2, CALOCORR_JO
+ from CaloClusterCorrection.constants import CALOCORR_SW, EMB2, CALOCORR_JO
from CaloClusterCorrection.common import makecorr
from CaloClusterCorrection.CaloSwPhioff import CaloSwPhioff_versions
- from CaloClusterCorrection.CaloSwCorrections import CaloSwCorrections
ca = makecorr (flags,
CaloSwPhioff_versions,
@@ -770,10 +757,9 @@ def test13 (flags_in):
flags = flags_in.clone()
flags.lock()
- from CaloClusterCorrection.constants import CALOCORR_SW, CALOCORR_EMTOPO, EMB1, EMB2, CALOCORR_JO
+ from CaloClusterCorrection.constants import CALOCORR_SW, CALOCORR_EMTOPO, EMB2, CALOCORR_JO
from CaloClusterCorrection.common import makecorr
from CaloClusterCorrection.CaloSwGap import CaloSwGap_versions
- from CaloClusterCorrection.CaloSwCorrections import CaloSwCorrections
ca = makecorr (flags,
CaloSwGap_versions,
@@ -914,9 +900,7 @@ def test17 (flags_in):
flags.Calo.ClusterCorrection.caloSwWhichCorrection = 'v6_lwc'
flags.lock()
- from CaloClusterCorrection.CaloSwCorrections import layers, update, gap, calhits
- from CaloClusterCorrection.constants import CALOCORR_JO, CALOCORR_POOL
- from CaloClusterCorrection.poolfiles import poolfiles
+ from CaloClusterCorrection.CaloSwCorrections import gap
ca = make_CaloSwCorrectionsCfg (flags, key = 'gam35',
corrlist = [[gap]])
tools = ca.popPrivateTools()
@@ -943,9 +927,8 @@ def test18 (flags_in):
flags.Input.ProjectName = 'data18'
flags.lock()
- from CaloClusterCorrection.CaloSwCorrections import layers, update, gap, calhits
- from CaloClusterCorrection.constants import CALOCORR_JO, CALOCORR_POOL, CALOCORR_COOL
- from CaloClusterCorrection.poolfiles import poolfiles
+ from CaloClusterCorrection.CaloSwCorrections import gap
+ from CaloClusterCorrection.constants import CALOCORR_POOL
ca = make_CaloSwCorrectionsCfg (flags, key = 'gam35',
corrlist = [[gap]],
version = 'v6_lwc',
@@ -977,9 +960,8 @@ def test19 (flags_in):
flags.Calo.ClusterCorrection.caloSwGeneration = '00-02-01'
flags.lock()
- from CaloClusterCorrection.CaloSwCorrections import layers, update, gap, calhits
- from CaloClusterCorrection.constants import CALOCORR_JO, CALOCORR_POOL, CALOCORR_COOL
- from CaloClusterCorrection.poolfiles import poolfiles
+ from CaloClusterCorrection.CaloSwCorrections import gap
+ from CaloClusterCorrection.constants import CALOCORR_POOL, CALOCORR_COOL
ca = make_CaloSwCorrectionsCfg (flags, key = 'gam35',
corrlist = [[gap]],
source = [CALOCORR_POOL, CALOCORR_COOL])
@@ -1000,7 +982,7 @@ def test20 (flags_in):
flags = flags_in.clone()
flags.lock()
- from CaloClusterCorrection.CaloSwCorrections import CaloSwCorrections, layers, update, removebad
+ from CaloClusterCorrection.CaloSwCorrections import CaloSwCorrections
from CaloClusterCorrection.constants import CALOCORR_SW
vlist = CaloSwCorrections.lookup_version (flags, 'none', CALOCORR_SW)
@@ -1099,6 +1081,7 @@ Configurable.configurableRun3Behavior = 1
from AthenaConfiguration.AllConfigFlags import ConfigFlags
ConfigFlags.loadAllDynamicFlags()
ConfigFlags.Input.Files = defaultTestFiles.RAW
+ConfigFlags.IOVDb.GlobalTag = "CONDBR2-BLKPA-2017-05"
test1 (ConfigFlags)
test2 (ConfigFlags)
diff --git a/Control/AthenaCommon/python/GlobalFlags.py b/Control/AthenaCommon/python/GlobalFlags.py
index 92438e15d018ba45890d844510cfd93a277f409f..3da8936c23d43829ba1a3536757074310823af6c 100755
--- a/Control/AthenaCommon/python/GlobalFlags.py
+++ b/Control/AthenaCommon/python/GlobalFlags.py
@@ -67,7 +67,7 @@ class ConditionsTag(JobProperty):
"""
statusOn=True
allowedTypes=['str']
- StoredValue='OFLCOND-RUN12-SDR-31'
+ StoredValue='OFLCOND-MC16-SDR-RUN2-09'
#
class DatabaseInstance(JobProperty):
diff --git a/Control/AthenaConfiguration/python/AllConfigFlags.py b/Control/AthenaConfiguration/python/AllConfigFlags.py
index 6316b144f705e82d6344a923669271b76e2c39d7..8d94353fd0bce41e47deb5ec368ffaf23750c7a5 100644
--- a/Control/AthenaConfiguration/python/AllConfigFlags.py
+++ b/Control/AthenaConfiguration/python/AllConfigFlags.py
@@ -179,7 +179,7 @@ def _createCfgFlags():
_addFlagsCategory(acf, "Reco", __reco, 'RecJobTransforms')
#IOVDbSvc Flags:
- acf.addFlag("IOVDb.GlobalTag",lambda prevFlags : GetFileMD(prevFlags.Input.Files).get("IOVDbGlobalTag",None) or "CONDBR2-BLKPA-2017-05")
+ acf.addFlag("IOVDb.GlobalTag",lambda prevFlags : GetFileMD(prevFlags.Input.Files).get("IOVDbGlobalTag",None) or "CONDBR2-BLKPA-RUN2-09")
from IOVDbSvc.IOVDbAutoCfgFlags import getDatabaseInstanceDefault
acf.addFlag("IOVDb.DatabaseInstance",getDatabaseInstanceDefault)
# Run dependent simulation
diff --git a/Reconstruction/RecJobTransforms/share/new_jo_raw_reco_aod_digest.ref b/Reconstruction/RecJobTransforms/share/new_jo_raw_reco_aod_digest.ref
index d3b8d966980e9906a93afa5f6b8c92e11701f4d3..a454771ce68c9265ce913082df4558587d2e517d 100644
--- a/Reconstruction/RecJobTransforms/share/new_jo_raw_reco_aod_digest.ref
+++ b/Reconstruction/RecJobTransforms/share/new_jo_raw_reco_aod_digest.ref
@@ -1,6 +1,6 @@
run event nTopo nIdTracks nTauTracks nTaus nMuons nElec nTrueElec nFakeElec nPhot nTruePhot nFakePhot
- 327265 186524665 430 399 0 0 1 1 0 1 12 0 12
- 327265 186525031 451 418 0 0 2 2 0 2 6 0 6
- 327265 186542447 338 286 0 0 0 2 0 2 8 0 8
- 327265 186543405 425 307 0 0 0 1 0 1 9 0 9
- 327265 186548387 536 501 0 0 0 3 0 3 22 0 22
+ 327265 186524665 510 420 0 0 2 2 0 2 16 0 16
+ 327265 186525031 522 439 0 0 1 2 0 2 8 0 8
+ 327265 186542447 419 296 0 0 0 2 0 2 7 0 7
+ 327265 186543405 511 319 0 0 0 2 0 2 11 0 11
+ 327265 186548387 653 515 0 0 0 4 0 4 20 0 20