From 51a273964146183904dda135f3576727e1e070b2 Mon Sep 17 00:00:00 2001
From: scott snyder <snyder@bnl.gov>
Date: Tue, 20 Oct 2020 23:20:09 +0200
Subject: [PATCH] CaloClusterCorrection: Configuration fixes.
- A generation of -13 was never actually written to the DBs.
Set the default back to -12.
- Fix cool tag names for offline case (start with CaloOfl).
- If we request configuration with a global cool tag, preserve that
for each folder rather than resolving to a folder-specific tag.
See ATR-22193.
---
.../python/CaloSwCorrections.py | 4 +++-
.../CaloClusterCorrection/python/common.py | 5 ++++
.../share/config_test.ref | 8 +++----
.../CaloClusterCorrection/test/config_t.py | 24 +++++++++----------
4 files changed, 24 insertions(+), 17 deletions(-)
diff --git a/Calorimeter/CaloClusterCorrection/python/CaloSwCorrections.py b/Calorimeter/CaloClusterCorrection/python/CaloSwCorrections.py
index d3e798b8c12..7ed1ae421d5 100755
--- a/Calorimeter/CaloClusterCorrection/python/CaloSwCorrections.py
+++ b/Calorimeter/CaloClusterCorrection/python/CaloSwCorrections.py
@@ -273,7 +273,9 @@ class CaloSwCorrectionsSetup (CaloClusterCorrSetup):
name = "EM sliding-window"
version_override_flag_name = 'caloSwWhichCorrection'
correction_generation_flag_name = 'caloSwGeneration'
- correction_generation_default = "00-02-13"
+ # There was a -13, but it apparently didn't get written to DBs.
+ # Next should be -14.
+ correction_generation_default = "00-02-12"
##########################################################################
# This is the list of all known correction versions.
diff --git a/Calorimeter/CaloClusterCorrection/python/common.py b/Calorimeter/CaloClusterCorrection/python/common.py
index 03557911a23..896db34d56d 100755
--- a/Calorimeter/CaloClusterCorrection/python/common.py
+++ b/Calorimeter/CaloClusterCorrection/python/common.py
@@ -277,6 +277,9 @@ class CaloClusterCorrSetup:
this_order = vorder
break
+ elif version[0] == '@' and not corrlist:
+ this_version = version #pragma: NO COVER
+
if this_version == '@':
this_version = version
@@ -714,6 +717,8 @@ def makecorr (flags,
tmp = tmp + "-" + version
sgkey = "%s.%s" % (corrclass, tmp)
fulltag = "%s.%s%s" % (corrclass, generation, tmp)
+ if flags.Input.isMC:
+ fulltag = fulltag[0:4] + 'Ofl' + fulltag[4:]
# The cool folder name.
if not flags.Input.isMC:
diff --git a/Calorimeter/CaloClusterCorrection/share/config_test.ref b/Calorimeter/CaloClusterCorrection/share/config_test.ref
index a1c732ce440..e90c0ea4fe5 100644
--- a/Calorimeter/CaloClusterCorrection/share/config_test.ref
+++ b/Calorimeter/CaloClusterCorrection/share/config_test.ref
@@ -1,8 +1,8 @@
-Py:Athena INFO using release [?-22.0.0] [?] [?/?] -- built on [?]
+Py:Athena INFO using release [WorkDir-22.0.19] [x86_64-centos7-gcc8-opt] [atlas-work3h/b64d5586bf6b] -- built on [2020-10-20T1924]
Py:CaloClusterCorrection INFO EM sliding-window corrections for ele35 () using version v12_calh
-Py:AutoConfigFlags INFO Obtaining metadata of auto-configuration by peeking into /home/sss/nobackup/referencefiles/TrigP1Test/data17_13TeV.00327265.physics_EnhancedBias.merge.RAW._lb0100._SFO-1._0001.1
+Py:AutoConfigFlags INFO Obtaining metadata of auto-configuration by peeking into /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data17_13TeV.00327265.physics_EnhancedBias.merge.RAW._lb0100._SFO-1._0001.1
Py:MetaReader INFO Current mode used: peeker
-Py:MetaReader INFO Current filenames: ['/home/sss/nobackup/referencefiles/TrigP1Test/data17_13TeV.00327265.physics_EnhancedBias.merge.RAW._lb0100._SFO-1._0001.1']
+Py:MetaReader INFO Current filenames: ['/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data17_13TeV.00327265.physics_EnhancedBias.merge.RAW._lb0100._SFO-1._0001.1']
Py:CaloClusterCorrection INFO EM sliding-window corrections for gam35_conv () using version @GLOBAL
Py:CaloClusterCorrection INFO EM sliding-window corrections for gam35 () using version @GLOBAL
Py:CaloClusterCorrection INFO EM sliding-window corrections for gam35 () using version v6_lwc
@@ -23,4 +23,4 @@ PrivateToolHandleArray WARNING CaloDummyCorrection('deadOTXpse-dummy', prefix
PrivateToolHandleArray WARNING CaloDummyCorrection('deadOTXbacke-dummy', prefix='e.') with instance name 'deadOTXbacke-dummy' already in list. Not adding CaloDummyCorrection('deadOTXbacke-dummy', prefix='e.')
Final OutputList:
['CaloRec::ToolConstants#CaloSwClusterCorrections.larupdate#/CALO/CaloSwClusterCorrections/larupdate', 'CaloRec::ToolConstants#CaloSwClusterCorrections.etaoff-g3#/CALO/CaloSwClusterCorrections/etaoff', 'CaloRec::ToolConstants#CaloSwClusterCorrections.phioff-g3#/CALO/CaloSwClusterCorrections/phioff', 'CaloRec::ToolConstants#CaloSwClusterCorrections.phimod-g3#/CALO/CaloSwClusterCorrections/phimod', 'CaloRec::ToolConstants#CaloSwClusterCorrections.etamod-g3#/CALO/CaloSwClusterCorrections/etamod', 'CaloRec::ToolConstants#CaloSwClusterCorrections.larupdate-dont_update_e#/CALO/CaloSwClusterCorrections/larupdate', 'CaloRec::ToolConstants#CaloSwClusterCorrections.clcon-g3#/CALO/CaloSwClusterCorrections/clcon', 'CaloRec::ToolConstants#CaloSwClusterCorrections.gap-g3#/CALO/CaloSwClusterCorrections/gap', 'CaloRec::ToolConstants#CaloSwClusterCorrections.etaoff-v2#/CALO/CaloSwClusterCorrections/etaoff', 'CaloRec::ToolConstants#CaloSwClusterCorrections.phioff-v2#/CALO/CaloSwClusterCorrections/phioff', 'CaloRec::ToolConstants#CaloSwClusterCorrections.phimod-v2#/CALO/CaloSwClusterCorrections/phimod', 'CaloRec::ToolConstants#CaloSwClusterCorrections.etamod-v2#/CALO/CaloSwClusterCorrections/etamod', 'CaloRec::ToolConstants#CaloSwClusterCorrections.gap-v2#/CALO/CaloSwClusterCorrections/gap', 'CaloRec::ToolConstants#CaloSwClusterCorrections.clcon-dc2#/CALO/CaloSwClusterCorrections/clcon', 'CaloRec::ToolConstants#CaloSwClusterCorrections.lwc-old#/CALO/CaloSwClusterCorrections/lwc', 'CaloRec::ToolConstants#CaloSwClusterCorrections.lwc-904#/CALO/CaloSwClusterCorrections/lwc', 'CaloRec::ToolConstants#CaloSwClusterCorrections.clcon-dc2new#/CALO/CaloSwClusterCorrections/clcon', 'CaloRec::ToolConstants#CaloSwClusterCorrections.lwc-904gap#/CALO/CaloSwClusterCorrections/lwc', 'CaloRec::ToolConstants#CaloSwClusterCorrections.gap-v3#/CALO/CaloSwClusterCorrections/gap', 'CaloRec::ToolConstants#CaloSwClusterCorrections.lwc-v3#/CALO/CaloSwClusterCorrections/lwc', 'CaloRec::ToolConstants#CaloSwClusterCorrections.rfac-v3#/CALO/CaloSwClusterCorrections/rfac', 'CaloRec::ToolConstants#CaloSwClusterCorrections.etaoff-v3#/CALO/CaloSwClusterCorrections/etaoff', 'CaloRec::ToolConstants#CaloSwClusterCorrections.phioff-v3#/CALO/CaloSwClusterCorrections/phioff', 'CaloRec::ToolConstants#CaloSwClusterCorrections.gap-v3_1#/CALO/CaloSwClusterCorrections/gap', 'CaloRec::ToolConstants#CaloSwClusterCorrections.lwc-v3_1#/CALO/CaloSwClusterCorrections/lwc', 'CaloRec::ToolConstants#CaloSwClusterCorrections.phimod-v3#/CALO/CaloSwClusterCorrections/phimod', 'CaloRec::ToolConstants#CaloSwClusterCorrections.etamod-v3#/CALO/CaloSwClusterCorrections/etamod', 'CaloRec::ToolConstants#CaloSwClusterCorrections.rfac-v4#/CALO/CaloSwClusterCorrections/rfac', 'CaloRec::ToolConstants#CaloSwClusterCorrections.etaoff-v4#/CALO/CaloSwClusterCorrections/etaoff', 'CaloRec::ToolConstants#CaloSwClusterCorrections.phioff-v4#/CALO/CaloSwClusterCorrections/phioff', 'CaloRec::ToolConstants#CaloSwClusterCorrections.gap-v4#/CALO/CaloSwClusterCorrections/gap', 'CaloRec::ToolConstants#CaloSwClusterCorrections.lwc-v4#/CALO/CaloSwClusterCorrections/lwc', 'CaloRec::ToolConstants#CaloSwClusterCorrections.phimod-v4#/CALO/CaloSwClusterCorrections/phimod', 'CaloRec::ToolConstants#CaloSwClusterCorrections.etamod-v4#/CALO/CaloSwClusterCorrections/etamod', 'CaloRec::ToolConstants#CaloSwClusterCorrections.etaoff-v4_1#/CALO/CaloSwClusterCorrections/etaoff', 'CaloRec::ToolConstants#CaloSwClusterCorrections.calhits-v1#/CALO/CaloSwClusterCorrections/calhits', 'CaloRec::ToolConstants#CaloSwClusterCorrections.calhits-v2#/CALO/CaloSwClusterCorrections/calhits', 'CaloRec::ToolConstants#CaloSwClusterCorrections.trcorr-v1#/CALO/CaloSwClusterCorrections/trcorr', 'CaloRec::ToolConstants#CaloSwClusterCorrections.lwc-v5#/CALO/CaloSwClusterCorrections/lwc', 'CaloRec::ToolConstants#CaloSwClusterCorrections.lwc-v6#/CALO/CaloSwClusterCorrections/lwc', 'CaloRec::ToolConstants#CaloSwClusterCorrections.calhits-v5#/CALO/CaloSwClusterCorrections/calhits', 'CaloRec::ToolConstants#CaloSwClusterCorrections.trcorr-v5#/CALO/CaloSwClusterCorrections/trcorr', 'CaloRec::ToolConstants#CaloSwClusterCorrections.calhits-v5_1#/CALO/CaloSwClusterCorrections/calhits', 'CaloRec::ToolConstants#CaloSwClusterCorrections.trcorr-v5_1#/CALO/CaloSwClusterCorrections/trcorr', 'CaloRec::ToolConstants#CaloSwClusterCorrections.calhits-v6#/CALO/CaloSwClusterCorrections/calhits', 'CaloRec::ToolConstants#CaloSwClusterCorrections.phioff-v4data#/CALO/CaloSwClusterCorrections/phioff', 'CaloRec::ToolConstants#CaloSwClusterCorrections.phimod-v4data#/CALO/CaloSwClusterCorrections/phimod', 'CaloRec::ToolConstants#CaloSwClusterCorrections.calhits-v6leakdata#/CALO/CaloSwClusterCorrections/calhits', 'CaloRec::ToolConstants#CaloSwClusterCorrections.deadOTXps-v1#/CALO/CaloSwClusterCorrections/deadOTXps', 'CaloRec::ToolConstants#CaloSwClusterCorrections.deadOTXback-v1#/CALO/CaloSwClusterCorrections/deadOTXback', 'CaloRec::ToolConstants#CaloSwClusterCorrections.calhits-v8#/CALO/CaloSwClusterCorrections/calhits', 'CaloRec::ToolConstants#CaloSwClusterCorrections.calhits-v8leakdata#/CALO/CaloSwClusterCorrections/calhits', 'CaloRec::ToolConstants#CaloSwClusterCorrections.calhits-v9#/CALO/CaloSwClusterCorrections/calhits', 'CaloRec::ToolConstants#CaloSwClusterCorrections.calhits-v9leakdata#/CALO/CaloSwClusterCorrections/calhits', 'CaloRec::ToolConstants#CaloSwClusterCorrections.gap-v5#/CALO/CaloSwClusterCorrections/gap', 'CaloRec::ToolConstants#CaloSwClusterCorrections.gap-v6#/CALO/CaloSwClusterCorrections/gap', 'CaloRec::ToolConstants#CaloSwClusterCorrections.rfac-v5#/CALO/CaloSwClusterCorrections/rfac', 'CaloRec::ToolConstants#CaloSwClusterCorrections.etaoff-v5#/CALO/CaloSwClusterCorrections/etaoff', 'CaloRec::ToolConstants#CaloSwClusterCorrections.phioff-v5#/CALO/CaloSwClusterCorrections/phioff', 'CaloRec::ToolConstants#CaloSwClusterCorrections.phioff-v5data#/CALO/CaloSwClusterCorrections/phioff', 'CaloRec::ToolConstants#CaloSwClusterCorrections.lwc-atlfast_v1#/CALO/CaloSwClusterCorrections/lwc', 'CaloRec::ToolConstants#CaloSwClusterCorrections.lwc-pi0_v1#/CALO/CaloSwClusterCorrections/lwc', 'CaloRec::ToolConstants#CaloSwClusterCorrections.larupdate-dummy#/CALO/CaloSwClusterCorrections/larupdate', 'CaloRec::ToolConstants#CaloSwClusterCorrections.etaoff-dummy#/CALO/CaloSwClusterCorrections/etaoff', 'CaloRec::ToolConstants#CaloSwClusterCorrections.phioff-dummy#/CALO/CaloSwClusterCorrections/phioff', 'CaloRec::ToolConstants#CaloSwClusterCorrections.phimod-dummy#/CALO/CaloSwClusterCorrections/phimod', 'CaloRec::ToolConstants#CaloSwClusterCorrections.etamod-dummy#/CALO/CaloSwClusterCorrections/etamod', 'CaloRec::ToolConstants#CaloSwClusterCorrections.clcon-dummy#/CALO/CaloSwClusterCorrections/clcon', 'CaloRec::ToolConstants#CaloSwClusterCorrections.gap-dummy#/CALO/CaloSwClusterCorrections/gap', 'CaloRec::ToolConstants#CaloSwClusterCorrections.lwc-dummy#/CALO/CaloSwClusterCorrections/lwc', 'CaloRec::ToolConstants#CaloSwClusterCorrections.rfac-dummy#/CALO/CaloSwClusterCorrections/rfac', 'CaloRec::ToolConstants#CaloSwClusterCorrections.calhits-dummy#/CALO/CaloSwClusterCorrections/calhits', 'CaloRec::ToolConstants#CaloSwClusterCorrections.trcorr-dummy#/CALO/CaloSwClusterCorrections/trcorr', 'CaloRec::ToolConstants#CaloSwClusterCorrections.deadOTXps-dummy#/CALO/CaloSwClusterCorrections/deadOTXps', 'CaloRec::ToolConstants#CaloSwClusterCorrections.deadOTXback-dummy#/CALO/CaloSwClusterCorrections/deadOTXback']
-['CaloSwClusterCorrections.00-02-13-larupdate', 'CaloSwClusterCorrections.00-02-13-etaoff-g3', 'CaloSwClusterCorrections.00-02-13-phioff-g3', 'CaloSwClusterCorrections.00-02-13-phimod-g3', 'CaloSwClusterCorrections.00-02-13-etamod-g3', 'CaloSwClusterCorrections.00-02-13-larupdate-dont_update_e', 'CaloSwClusterCorrections.00-02-13-clcon-g3', 'CaloSwClusterCorrections.00-02-13-gap-g3', 'CaloSwClusterCorrections.00-02-13-etaoff-v2', 'CaloSwClusterCorrections.00-02-13-phioff-v2', 'CaloSwClusterCorrections.00-02-13-phimod-v2', 'CaloSwClusterCorrections.00-02-13-etamod-v2', 'CaloSwClusterCorrections.00-02-13-gap-v2', 'CaloSwClusterCorrections.00-02-13-clcon-dc2', 'CaloSwClusterCorrections.00-02-13-lwc-old', 'CaloSwClusterCorrections.00-02-13-lwc-904', 'CaloSwClusterCorrections.00-02-13-clcon-dc2new', 'CaloSwClusterCorrections.00-02-13-lwc-904gap', 'CaloSwClusterCorrections.00-02-13-gap-v3', 'CaloSwClusterCorrections.00-02-13-lwc-v3', 'CaloSwClusterCorrections.00-02-13-rfac-v3', 'CaloSwClusterCorrections.00-02-13-etaoff-v3', 'CaloSwClusterCorrections.00-02-13-phioff-v3', 'CaloSwClusterCorrections.00-02-13-gap-v3_1', 'CaloSwClusterCorrections.00-02-13-lwc-v3_1', 'CaloSwClusterCorrections.00-02-13-phimod-v3', 'CaloSwClusterCorrections.00-02-13-etamod-v3', 'CaloSwClusterCorrections.00-02-13-rfac-v4', 'CaloSwClusterCorrections.00-02-13-etaoff-v4', 'CaloSwClusterCorrections.00-02-13-phioff-v4', 'CaloSwClusterCorrections.00-02-13-gap-v4', 'CaloSwClusterCorrections.00-02-13-lwc-v4', 'CaloSwClusterCorrections.00-02-13-phimod-v4', 'CaloSwClusterCorrections.00-02-13-etamod-v4', 'CaloSwClusterCorrections.00-02-13-etaoff-v4_1', 'CaloSwClusterCorrections.00-02-13-calhits-v1', 'CaloSwClusterCorrections.00-02-13-calhits-v2', 'CaloSwClusterCorrections.00-02-13-trcorr-v1', 'CaloSwClusterCorrections.00-02-13-lwc-v5', 'CaloSwClusterCorrections.00-02-13-lwc-v6', 'CaloSwClusterCorrections.00-02-13-calhits-v5', 'CaloSwClusterCorrections.00-02-13-trcorr-v5', 'CaloSwClusterCorrections.00-02-13-calhits-v5_1', 'CaloSwClusterCorrections.00-02-13-trcorr-v5_1', 'CaloSwClusterCorrections.00-02-13-calhits-v6', 'CaloSwClusterCorrections.00-02-13-phioff-v4data', 'CaloSwClusterCorrections.00-02-13-phimod-v4data', 'CaloSwClusterCorrections.00-02-13-calhits-v6leakdata', 'CaloSwClusterCorrections.00-02-13-deadOTXps-v1', 'CaloSwClusterCorrections.00-02-13-deadOTXback-v1', 'CaloSwClusterCorrections.00-02-13-calhits-v8', 'CaloSwClusterCorrections.00-02-13-calhits-v8leakdata', 'CaloSwClusterCorrections.00-02-13-calhits-v9', 'CaloSwClusterCorrections.00-02-13-calhits-v9leakdata', 'CaloSwClusterCorrections.00-02-13-gap-v5', 'CaloSwClusterCorrections.00-02-13-gap-v6', 'CaloSwClusterCorrections.00-02-13-rfac-v5', 'CaloSwClusterCorrections.00-02-13-etaoff-v5', 'CaloSwClusterCorrections.00-02-13-phioff-v5', 'CaloSwClusterCorrections.00-02-13-phioff-v5data', 'CaloSwClusterCorrections.00-02-13-lwc-atlfast_v1', 'CaloSwClusterCorrections.00-02-13-lwc-pi0_v1', 'CaloSwClusterCorrections.00-02-13-larupdate-dummy', 'CaloSwClusterCorrections.00-02-13-etaoff-dummy', 'CaloSwClusterCorrections.00-02-13-phioff-dummy', 'CaloSwClusterCorrections.00-02-13-phimod-dummy', 'CaloSwClusterCorrections.00-02-13-etamod-dummy', 'CaloSwClusterCorrections.00-02-13-clcon-dummy', 'CaloSwClusterCorrections.00-02-13-gap-dummy', 'CaloSwClusterCorrections.00-02-13-lwc-dummy', 'CaloSwClusterCorrections.00-02-13-rfac-dummy', 'CaloSwClusterCorrections.00-02-13-calhits-dummy', 'CaloSwClusterCorrections.00-02-13-trcorr-dummy', 'CaloSwClusterCorrections.00-02-13-deadOTXps-dummy', 'CaloSwClusterCorrections.00-02-13-deadOTXback-dummy']
+['CaloSwClusterCorrections.00-02-12-larupdate', 'CaloSwClusterCorrections.00-02-12-etaoff-g3', 'CaloSwClusterCorrections.00-02-12-phioff-g3', 'CaloSwClusterCorrections.00-02-12-phimod-g3', 'CaloSwClusterCorrections.00-02-12-etamod-g3', 'CaloSwClusterCorrections.00-02-12-larupdate-dont_update_e', 'CaloSwClusterCorrections.00-02-12-clcon-g3', 'CaloSwClusterCorrections.00-02-12-gap-g3', 'CaloSwClusterCorrections.00-02-12-etaoff-v2', 'CaloSwClusterCorrections.00-02-12-phioff-v2', 'CaloSwClusterCorrections.00-02-12-phimod-v2', 'CaloSwClusterCorrections.00-02-12-etamod-v2', 'CaloSwClusterCorrections.00-02-12-gap-v2', 'CaloSwClusterCorrections.00-02-12-clcon-dc2', 'CaloSwClusterCorrections.00-02-12-lwc-old', 'CaloSwClusterCorrections.00-02-12-lwc-904', 'CaloSwClusterCorrections.00-02-12-clcon-dc2new', 'CaloSwClusterCorrections.00-02-12-lwc-904gap', 'CaloSwClusterCorrections.00-02-12-gap-v3', 'CaloSwClusterCorrections.00-02-12-lwc-v3', 'CaloSwClusterCorrections.00-02-12-rfac-v3', 'CaloSwClusterCorrections.00-02-12-etaoff-v3', 'CaloSwClusterCorrections.00-02-12-phioff-v3', 'CaloSwClusterCorrections.00-02-12-gap-v3_1', 'CaloSwClusterCorrections.00-02-12-lwc-v3_1', 'CaloSwClusterCorrections.00-02-12-phimod-v3', 'CaloSwClusterCorrections.00-02-12-etamod-v3', 'CaloSwClusterCorrections.00-02-12-rfac-v4', 'CaloSwClusterCorrections.00-02-12-etaoff-v4', 'CaloSwClusterCorrections.00-02-12-phioff-v4', 'CaloSwClusterCorrections.00-02-12-gap-v4', 'CaloSwClusterCorrections.00-02-12-lwc-v4', 'CaloSwClusterCorrections.00-02-12-phimod-v4', 'CaloSwClusterCorrections.00-02-12-etamod-v4', 'CaloSwClusterCorrections.00-02-12-etaoff-v4_1', 'CaloSwClusterCorrections.00-02-12-calhits-v1', 'CaloSwClusterCorrections.00-02-12-calhits-v2', 'CaloSwClusterCorrections.00-02-12-trcorr-v1', 'CaloSwClusterCorrections.00-02-12-lwc-v5', 'CaloSwClusterCorrections.00-02-12-lwc-v6', 'CaloSwClusterCorrections.00-02-12-calhits-v5', 'CaloSwClusterCorrections.00-02-12-trcorr-v5', 'CaloSwClusterCorrections.00-02-12-calhits-v5_1', 'CaloSwClusterCorrections.00-02-12-trcorr-v5_1', 'CaloSwClusterCorrections.00-02-12-calhits-v6', 'CaloSwClusterCorrections.00-02-12-phioff-v4data', 'CaloSwClusterCorrections.00-02-12-phimod-v4data', 'CaloSwClusterCorrections.00-02-12-calhits-v6leakdata', 'CaloSwClusterCorrections.00-02-12-deadOTXps-v1', 'CaloSwClusterCorrections.00-02-12-deadOTXback-v1', 'CaloSwClusterCorrections.00-02-12-calhits-v8', 'CaloSwClusterCorrections.00-02-12-calhits-v8leakdata', 'CaloSwClusterCorrections.00-02-12-calhits-v9', 'CaloSwClusterCorrections.00-02-12-calhits-v9leakdata', 'CaloSwClusterCorrections.00-02-12-gap-v5', 'CaloSwClusterCorrections.00-02-12-gap-v6', 'CaloSwClusterCorrections.00-02-12-rfac-v5', 'CaloSwClusterCorrections.00-02-12-etaoff-v5', 'CaloSwClusterCorrections.00-02-12-phioff-v5', 'CaloSwClusterCorrections.00-02-12-phioff-v5data', 'CaloSwClusterCorrections.00-02-12-lwc-atlfast_v1', 'CaloSwClusterCorrections.00-02-12-lwc-pi0_v1', 'CaloSwClusterCorrections.00-02-12-larupdate-dummy', 'CaloSwClusterCorrections.00-02-12-etaoff-dummy', 'CaloSwClusterCorrections.00-02-12-phioff-dummy', 'CaloSwClusterCorrections.00-02-12-phimod-dummy', 'CaloSwClusterCorrections.00-02-12-etamod-dummy', 'CaloSwClusterCorrections.00-02-12-clcon-dummy', 'CaloSwClusterCorrections.00-02-12-gap-dummy', 'CaloSwClusterCorrections.00-02-12-lwc-dummy', 'CaloSwClusterCorrections.00-02-12-rfac-dummy', 'CaloSwClusterCorrections.00-02-12-calhits-dummy', 'CaloSwClusterCorrections.00-02-12-trcorr-dummy', 'CaloSwClusterCorrections.00-02-12-deadOTXps-dummy', 'CaloSwClusterCorrections.00-02-12-deadOTXback-dummy']
diff --git a/Calorimeter/CaloClusterCorrection/test/config_t.py b/Calorimeter/CaloClusterCorrection/test/config_t.py
index 6492bbff88d..57590047632 100644
--- a/Calorimeter/CaloClusterCorrection/test/config_t.py
+++ b/Calorimeter/CaloClusterCorrection/test/config_t.py
@@ -319,17 +319,17 @@ def test2 (flags_in):
DBInstance='OFLP200',
CacheAlign=3,
GlobalTag='OFLCOND-RUN12-SDR-31',
- Folders = ['/CALO/Ofl/CaloSwClusterCorrections/rfac<tag>CaloSwClusterCorrections.00-02-13-rfac-v5</tag><db>COOLOFL_CALO/OFLP200</db>',
- '/CALO/Ofl/CaloSwClusterCorrections/etaoff<tag>CaloSwClusterCorrections.00-02-13-etaoff-v5</tag><db>COOLOFL_CALO/OFLP200</db>',
- '/CALO/Ofl/CaloSwClusterCorrections/phioff<tag>CaloSwClusterCorrections.00-02-13-phioff-v5data</tag><db>COOLOFL_CALO/OFLP200</db>',
- '/CALO/Ofl/CaloSwClusterCorrections/larupdate<tag>CaloSwClusterCorrections.00-02-13-larupdate</tag><db>COOLOFL_CALO/OFLP200</db>',
- '/CALO/Ofl/CaloSwClusterCorrections/gap<tag>CaloSwClusterCorrections.00-02-13-gap-v6</tag><db>COOLOFL_CALO/OFLP200</db>',
- '/CALO/Ofl/CaloSwClusterCorrections/calhits<tag>CaloSwClusterCorrections.00-02-13-calhits-v9</tag><db>COOLOFL_CALO/OFLP200</db>',
- '/CALO/Ofl/CaloSwClusterCorrections/trcorr<tag>CaloSwClusterCorrections.00-02-13-trcorr-v5_1</tag><db>COOLOFL_CALO/OFLP200</db>',
- '/CALO/Ofl/CaloSwClusterCorrections/deadOTXps<tag>CaloSwClusterCorrections.00-02-13-deadOTXps-v1</tag><db>COOLOFL_CALO/OFLP200</db>',
- '/CALO/Ofl/CaloSwClusterCorrections/deadOTXback<tag>CaloSwClusterCorrections.00-02-13-deadOTXback-v1</tag><db>COOLOFL_CALO/OFLP200</db>',
- '/CALO/Ofl/CaloSwClusterCorrections/phimod<tag>CaloSwClusterCorrections.00-02-13-phimod-v4</tag><db>COOLOFL_CALO/OFLP200</db>',
- '/CALO/Ofl/CaloSwClusterCorrections/etamod<tag>CaloSwClusterCorrections.00-02-13-etamod-v4</tag><db>COOLOFL_CALO/OFLP200</db>'])
+ Folders = ['/CALO/Ofl/CaloSwClusterCorrections/rfac<tag>CaloOflSwClusterCorrections.00-02-12-rfac-v5</tag><db>COOLOFL_CALO/OFLP200</db>',
+ '/CALO/Ofl/CaloSwClusterCorrections/etaoff<tag>CaloOflSwClusterCorrections.00-02-12-etaoff-v5</tag><db>COOLOFL_CALO/OFLP200</db>',
+ '/CALO/Ofl/CaloSwClusterCorrections/phioff<tag>CaloOflSwClusterCorrections.00-02-12-phioff-v5data</tag><db>COOLOFL_CALO/OFLP200</db>',
+ '/CALO/Ofl/CaloSwClusterCorrections/larupdate<tag>CaloOflSwClusterCorrections.00-02-12-larupdate</tag><db>COOLOFL_CALO/OFLP200</db>',
+ '/CALO/Ofl/CaloSwClusterCorrections/gap<tag>CaloOflSwClusterCorrections.00-02-12-gap-v6</tag><db>COOLOFL_CALO/OFLP200</db>',
+ '/CALO/Ofl/CaloSwClusterCorrections/calhits<tag>CaloOflSwClusterCorrections.00-02-12-calhits-v9</tag><db>COOLOFL_CALO/OFLP200</db>',
+ '/CALO/Ofl/CaloSwClusterCorrections/trcorr<tag>CaloOflSwClusterCorrections.00-02-12-trcorr-v5_1</tag><db>COOLOFL_CALO/OFLP200</db>',
+ '/CALO/Ofl/CaloSwClusterCorrections/deadOTXps<tag>CaloOflSwClusterCorrections.00-02-12-deadOTXps-v1</tag><db>COOLOFL_CALO/OFLP200</db>',
+ '/CALO/Ofl/CaloSwClusterCorrections/deadOTXback<tag>CaloOflSwClusterCorrections.00-02-12-deadOTXback-v1</tag><db>COOLOFL_CALO/OFLP200</db>',
+ '/CALO/Ofl/CaloSwClusterCorrections/phimod<tag>CaloOflSwClusterCorrections.00-02-12-phimod-v4</tag><db>COOLOFL_CALO/OFLP200</db>',
+ '/CALO/Ofl/CaloSwClusterCorrections/etamod<tag>CaloOflSwClusterCorrections.00-02-12-etamod-v4</tag><db>COOLOFL_CALO/OFLP200</db>'])
exp.check (ca.getService ('IOVDbSvc'))
ca.wasMerged()
@@ -392,7 +392,7 @@ def test3 (flags_in):
CacheAlign=3,
GlobalTag='CONDBR2-BLKPA-2017-05',
Folders=['/CALO/CaloSwClusterCorrections/larupdate<tag></tag><db>COOLONL_CALO/CONDBR2</db>',
- '/CALO/CaloSwClusterCorrections/calhits<tag>CaloSwClusterCorrections.00-02-13-calhits-v8</tag><db>COOLONL_CALO/CONDBR2</db>'])
+ '/CALO/CaloSwClusterCorrections/calhits<tag>CaloSwClusterCorrections.00-02-12-calhits-v8</tag><db>COOLONL_CALO/CONDBR2</db>'])
exp.check (ca.getService ('IOVDbSvc'))
--
GitLab