diff --git a/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py b/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py
index d63ac387e50fc1621c59cfc21611c71e675ba81b..feb016b3507b8e5871b3e8be7e69720d082c40e1 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py
@@ -45,7 +45,6 @@ class opt:
enableL1CaloLegacy = True # Enable Run-2 L1Calo simulation and/or decoding (possible even if enablePhase1 is True)
#Individual slice flags
doCalibSlice = True
- # doCalibrationSlice = True
doTestSlice = True
doHeavyIonSlice = True
doEnhancedBiasSlice = True
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/CalibrationChainConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/CalibChainConfiguration.py
similarity index 89%
rename from Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/CalibrationChainConfiguration.py
rename to Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/CalibChainConfiguration.py
index 5cc0d787e9fac2a4e94951c5499728326d76ca7f..3a9ea2d4fb545cd950674244e6e012b3383d7268 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/CalibrationChainConfiguration.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/CalibChainConfiguration.py
@@ -2,12 +2,12 @@
from AthenaCommon.Logging import logging
logging.getLogger().info("Importing %s",__name__)
-log = logging.getLogger("TriggerMenuMT.HLTMenuConfig.CalibCosmicMon.CalibrationChainConfiguration")
+log = logging.getLogger("TriggerMenuMT.HLTMenuConfig.CalibCosmicMon.CalibChainConfiguration")
from TriggerMenuMT.HLTMenuConfig.Menu.ChainConfigurationBase import ChainConfigurationBase
#----------------------------------------------------------------
-class CalibrationChainConfiguration(ChainConfigurationBase):
+class CalibChainConfiguration(ChainConfigurationBase):
def __init__(self, chainDict):
ChainConfigurationBase.__init__(self,chainDict)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/GenerateCalibrationChainDefs.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/GenerateCalibChainDefs.py
similarity index 84%
rename from Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/GenerateCalibrationChainDefs.py
rename to Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/GenerateCalibChainDefs.py
index 3a1d29498c3ad811e79b3c2cacdfc68b1858f04c..7db53d3b1c51b38e6180e4a61140eddaafe96e22 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/GenerateCalibrationChainDefs.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/GenerateCalibChainDefs.py
@@ -1,7 +1,7 @@
# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
from TriggerMenuMT.HLTMenuConfig.Menu.ChainDictTools import splitChainDict
-from TriggerMenuMT.HLTMenuConfig.CalibCosmicMon.CalibrationChainConfiguration import CalibrationChainConfiguration as CalibrationChainConfiguration
+from TriggerMenuMT.HLTMenuConfig.CalibCosmicMon.CalibChainConfiguration import CalibChainConfiguration as CalibChainConfiguration
from TriggerMenuMT.HLTMenuConfig.Menu.ChainMerging import mergeChainDefs
@@ -22,7 +22,7 @@ def generateChainConfigs( chainDict ):
#needed to move to the correct format [{}]->{}
for subChainDict in listOfChainDicts:
- Calib = CalibrationChainConfiguration(subChainDict).assembleChain()
+ Calib = CalibChainConfiguration(subChainDict).assembleChain()
listOfChainDefs += [Calib]
log.debug('length of chaindefs %s', len(listOfChainDefs) )
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/DictFromChainName.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/DictFromChainName.py
index ba67d57d90669fb183d037cf33d8cf3796b5266f..7db4cebf523f0814dc221c7d9808ceef408ca592 100755
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/DictFromChainName.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/DictFromChainName.py
@@ -268,7 +268,7 @@ def analyseChainName(chainName, L1thresholds, L1item):
for chainCategory in [(['mb'], 'MinBias', 'mb'),
(['hi'], 'HeavyIon', 'mb'),
(AllowedCosmicChainIdentifiers, 'Cosmic', 'cosmic'),
- (AllowedCalibChainIdentifiers, 'Calibration', 'calib'),
+ (AllowedCalibChainIdentifiers, 'Calib', 'calib'),
(AllowedMonitorChainIdentifiers, 'Monitor', 'calib'),
(AllowedBeamspotChainIdentifiers, 'Beamspot', 'beamspot'),
(['eb'], 'EnhancedBias', 'eb') ]:
@@ -351,7 +351,7 @@ def analyseChainName(chainName, L1thresholds, L1item):
log.debug('Chainparts: %s', chainparts)
if (chainProperties['signature'] != 'Cosmic') \
- & (chainProperties['signature'] != 'Calibration')\
+ & (chainProperties['signature'] != 'Calib')\
& (chainProperties['signature'] != 'Streaming') \
& (chainProperties['signature'] != 'Beamspot') \
& (chainProperties['signature'] != 'Monitor') :
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/GenerateMenuMT.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/GenerateMenuMT.py
index 99f1f73f30ad188f4f9c83b87156c1df0d629cb0..3786c62900dc8c2315d0636ef0e1cb2b0fd5d9c3 100755
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/GenerateMenuMT.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/GenerateMenuMT.py
@@ -65,8 +65,8 @@ class GenerateMenuMT(object):
self.signaturesToGenerate = []
self.allSignatures = ['Egamma', 'Muon', 'Jet', 'Bjet', 'Bphysics', 'MET', 'Tau',
'HeavyIon', 'Beamspot', 'Cosmic', 'EnhancedBias',
- 'Monitor', 'Calibration', 'Streaming', 'Combined', 'MinBias', 'Test'] #, AFP
- self.calibCosmicMonSigs = ['Streaming','Monitor','Beamspot','Cosmic', 'Calibration'] #others not implemented yet ['Beamspot', 'Cosmic', 'EnhancedBias', 'Monitor', 'Calib', 'Streaming']
+ 'Monitor', 'Calib', 'Streaming', 'Combined', 'MinBias', 'Test'] #, AFP
+ self.calibCosmicMonSigs = ['Streaming','Monitor','Beamspot','Cosmic', 'Calib'] #others not implemented yet ['Beamspot', 'Cosmic', 'EnhancedBias', 'Monitor', 'Calib', 'Streaming']
# flags
self.doEgammaChains = True
@@ -80,8 +80,7 @@ class GenerateMenuMT(object):
self.doMinBiasChains = True
self.doHeavyIonChains = True
self.doCosmicChains = True
- self.doCalibrationChains = True
- # self.doCalibChains = True
+ self.doCalibChains = True
self.doStreamingChains = True
self.doMonitorChains = True
self.doBeamspotChains = True
@@ -367,17 +366,14 @@ class GenerateMenuMT(object):
#ConfigFlags.lock()
for sig in self.allSignatures:
- sig2 = sig
- if sig2 == 'Calibration':
- sig2 = 'Calib'
- if eval('TriggerFlags.' + sig2 + 'Slice.signatures()') and eval('self.do' + sig + 'Chains'):
- log.debug("Adding %s chains to the list of chains to be configured", sig2)
- chains+= eval('TriggerFlags.' + sig2 + 'Slice.signatures()')
+ if eval('TriggerFlags.' + sig + 'Slice.signatures()') and eval('self.do' + sig + 'Chains'):
+ log.debug("Adding %s chains to the list of chains to be configured", sig)
+ chains+= eval('TriggerFlags.' + sig + 'Slice.signatures()')
self.signaturesToGenerate.append(sig)
- elif not eval('TriggerFlags.' + sig2 + 'Slice.signatures()'):
- log.debug('Signature %s is not switched on (no chains in menu)', sig2)
+ elif not eval('TriggerFlags.' + sig + 'Slice.signatures()'):
+ log.debug('Signature %s is not switched on (no chains in menu)', sig)
elif not eval('self.do' + sig + 'Chains'):
- log.debug('Signature %s is not switched on (disabled by flag)', sig2)
+ log.debug('Signature %s is not switched on (disabled by flag)', sig)
log.info("The following signature(s) is (are) enabled: %s", self.signaturesToGenerate)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py
index 5eca9479c525423d8ec1030710f3d40c55c039c8..c228e498a8eaacb323b629df88aadb23dae245fe 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py
@@ -22,7 +22,7 @@ SliceIDDict = {
'MinBias' : 'mb',
'HeavyIon' : 'hi',
'Cosmic' : 'cosmic',
- 'Calibration' : 'calib',
+ 'Calib' : 'calib',
#'Calib' : 'calib',
'Streaming' : 'streamer',
'Monitor' : 'mon',
@@ -609,7 +609,7 @@ AllowedCalibChainIdentifiers = ['csccalib', 'larcalib',
##stramingInfo not use in ChainConfiguration, only to distinguish streaming
CalibChainParts = {
- 'signature' : ['Calibration'],
+ 'signature' : ['Calib'],
'chainPartName' : '',
'L1threshold' : '',
'purpose' : AllowedCalibChainIdentifiers,
@@ -625,7 +625,7 @@ CalibChainParts = {
# ---- Calib Chain Default Dictinary of all allowed Values ----
CalibChainParts_Default = {
- 'signature' : ['Calibration'],
+ 'signature' : ['Calib'],
'chainPartName' : '',
'L1threshold' : '',
'purpose' : [],
@@ -818,7 +818,7 @@ def getSignatureInformation(signature):
return [HeavyIonChainParts_Default, HeavyIonChainParts]
if signature == "Cosmic":
return [CosmicChainParts_Default, CosmicChainParts]
- if signature == "Calibration":
+ if signature == "Calib":
return [CalibChainParts_Default, CalibChainParts]
if signature == "Streaming":
return [StreamingChainParts_Default, StreamingChainParts]