diff --git a/Trigger/TriggerCommon/TriggerJobOpts/python/HLTTriggerResultGetter.py b/Trigger/TriggerCommon/TriggerJobOpts/python/HLTTriggerResultGetter.py
index 403b0f7cbcdca16997a9da6615b02df32c9b88e2..1cfcdb2280461c833aaa7433c6a97174c1c82f54 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/python/HLTTriggerResultGetter.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/python/HLTTriggerResultGetter.py
@@ -105,7 +105,8 @@ class xAODConversionGetter(Configured):
from TrigNavigation.TrigNavigationConfig import HLTNavigationOffline
xaodconverter.Navigation = HLTNavigationOffline()
- from TrigEDMConfig.TriggerEDM import getPreregistrationList,getL2PreregistrationList,getEFPreregistrationList#,getHLTPreregistrationList
+ from TrigEDMConfig.TriggerEDM import getPreregistrationList,getL2PreregistrationList,getEFPreregistrationList
+ from TrigEDMConfig.TriggerEDM import getEFRun1BSList,getEFRun2EquivalentList,getL2Run1BSList,getL2Run2EquivalentList#,getHLTPreregistrationList
xaodconverter.Navigation.ClassesToPreregister = getPreregistrationList(TriggerFlags.EDMDecodingVersion())
## if TriggerFlags.EDMDecodingVersion() == 2:
## # if TriggerFlags.doMergedHLTResult():
@@ -115,7 +116,10 @@ class xAODConversionGetter(Configured):
## xaodconverter.Navigation.ClassesToPreregister = list(set(getL2PreregistrationList()+getEFPreregistrationList()+getHLTPreregistrationList()))
#we attempt to convert the entire old navigation (L2+EF)
- xaodconverter.BStoxAOD.ContainersToConvert = list(set(getL2PreregistrationList()+getEFPreregistrationList()))
+ #xaodconverter.BStoxAOD.ContainersToConvert = list(set(getL2PreregistrationList()+getEFPreregistrationList()))
+ # we want only containers from Run 1 with the BS tag
+ xaodconverter.BStoxAOD.ContainersToConvert = getL2Run1BSList() + getEFRun1BSList()
+ xaodconverter.BStoxAOD.NewContainers = getL2Run2EquivalentList() + getEFRun2EquivalentList()
xaodconverter.HLTResultKey="HLTResult_EF"
topSequence += xaodconverter
@@ -213,6 +217,10 @@ class ByteStreamUnpackGetter(Configured):
# Configure L1Topo validation data algorithm
#
if hasHLT and TriggerFlags.doMergedHLTResult() and TriggerFlags.writeL1TopoValData() :
+ # make sure that CTP_RDO is known (see also ATR-14683)
+ ServiceMgr.ByteStreamAddressProviderSvc.TypeNames += [
+ "CTP_RDO/CTP_RDO"
+ ]
from L1TopoValDataCnv.L1TopoValDataCnvConf import xAODMaker__L1TopoValDataCnvAlg
L1TopoValDataCvnAlg = xAODMaker__L1TopoValDataCnvAlg()
topSequence += L1TopoValDataCvnAlg
@@ -431,18 +439,15 @@ class HLTTriggerResultGetter(Configured):
from AthenaServices.Configurables import ThinningSvc, createThinningSvc
_doSlimming = True
- if _doSlimming and rec.doWriteAOD() and not (rec.readAOD() or rec.readESD()):
+ if _doSlimming and rec.readRDO() and rec.doWriteAOD():
if not hasattr(svcMgr, 'ThinningSvc'): # if the default is there it is configured for AODs
svcMgr += ThinningSvc(name='ThinningSvc', Streams=['StreamAOD'])
- _addSlimming('StreamAOD', svcMgr.ThinningSvc, _TriggerAODList )
+ _addSlimming('StreamAOD', svcMgr.ThinningSvc, _TriggerESDList ) #Use ESD item list also for AOD!
log.info("configured navigation slimming for AOD output")
- if _doSlimming and rec.doWriteESD() and not rec.readESD():
- svcMgr += ThinningSvc(name='ESDThinningSvc', Streams=['StreamESD']) # the default is configured for AODs
- # this was recommended but does not work
- # from OutputStreamAthenaPool.MultipleStreamManager import MSMgr
- # svcMgr += createThinningSvc(svcName="ESDThinningSvc", outStreams=[MSMgr.GetStream('StreamESD').GetEventStream()])
-
+ if _doSlimming and rec.readRDO() and rec.doWriteESD(): #rec.doWriteESD() and not rec.readESD():
+ if not hasattr(svcMgr, 'ESDThinningSvc'):
+ svcMgr += ThinningSvc(name='ESDThinningSvc', Streams=['StreamESD']) # the default is configured for AODs
_addSlimming('StreamESD', svcMgr.ESDThinningSvc, _TriggerESDList )
log.info("configured navigation slimming for ESD output")
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerFlags.py b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerFlags.py
index 1e6ed76998263297f39fd33fece36086f6b6270d..46dd67d3ad26b784265c3e432cda34b768ed569e 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerFlags.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerFlags.py
@@ -1056,6 +1056,8 @@ class triggerMenuSetup(JobProperty):
'DC14', 'DC14_no_prescale', 'DC14_tight_mc_prescale', 'DC14_loose_mc_prescale', # for DC14
'Physics_HI_v3', 'Physics_HI_v3_no_prescale', # for 2015 lead-lead menu
'MC_HI_v3', 'MC_HI_v3_tight_mc_prescale',
+ 'Physics_HI_v4', 'Physics_HI_v4_no_prescale', # for 2016 proton-lead menu
+ 'MC_HI_v4', 'MC_HI_v4_tight_mc_prescale',
'MC_pp_v6','Physics_pp_v6','MC_pp_v6_no_prescale', 'MC_pp_v6_tight_mc_prescale', 'MC_pp_v6_tightperf_mc_prescale', 'MC_pp_v6_loose_mc_prescale','Physics_pp_v6_tight_physics_prescale',
]
@@ -1091,100 +1093,18 @@ _flags.append(triggerMenuSetup)
class L1PrescaleSet(JobProperty):
statusOn = True
allowedTypes = ['str']
- allowedValues = [
- '', 'None',
- # Physics menus
- 'L1Prescales100_Physics_lumi1E31_simpleL1Calib','L1PrescalesNone_Physics_lumi1E31_simpleL1Calib',
- 'L1Prescales100_Physics_lumi1E32_simpleL1Calib','L1PrescalesNone_Physics_lumi1E32_simpleL1Calib',
- 'L1Prescales100_Physics_lumi1E33','L1PrescalesNone_Physics_lumi1E33',
- 'L1Prescales100_Physics_lumi1E34','L1PrescalesNone_Physics_lumi1E34',
- 'L1Prescales100_MC_lumi1E31_simpleL1Calib','L1PrescalesNone_MC_lumi1E31_simpleL1Calib',
- 'L1Prescales100_MC_lumi1E32_simpleL1Calib','L1PrescalesNone_MC_lumi1E32_simpleL1Calib',
- 'L1Prescales100_MC_lumi1E33','L1PrescalesNone_MC_lumi1E33',
- # Enhanced bias
- 'L1Prescales100_enhBias','L1PrescalesNone_enhBias',
- # Cosmic menus
- 'L1Prescales100_Cosmic_v1', 'L1PrescalesNone_Cosmic_v1',
- 'L1Prescales100_Cosmic2009_v1', 'L1PrescalesNone_Cosmic2009_v1',
- 'L1Prescales100_Cosmic2009_v2', 'L1PrescalesNone_Cosmic2009_v2',
- 'L1Prescales100_Cosmic_v2', 'L1PrescalesNone_Cosmic_v2',
- 'L1Prescales100_Cosmic_v3', 'L1PrescalesNone_Cosmic_v3',
- 'L1Prescales100_Cosmic2009_simpleL1Calib', 'L1PrescalesNone_Cosmic2009_simpleL1Calib',
- 'L1Prescales100_Cosmic2009_inclMuons', 'L1PrescalesNone_Cosmic2009_inclMuons',
- # Commissioning menus
- 'L1Prescales100_InitialBeam_v1', 'L1PrescalesNone_InitialBeam_v1',
- 'L1Prescales100_MC_InitialBeam_v1', 'L1PrescalesNone_MC_InitialBeam_v1',
- 'L1Prescales100_InitialBeam_v2', 'L1PrescalesNone_InitialBeam_v2',
- 'L1Prescales100_MC_InitialBeam_v2', 'L1PrescalesNone_MC_InitialBeam_v2',
- 'L1Prescales100_InitialBeam_v3', 'L1PrescalesNone_InitialBeam_v3',
- 'L1Prescales100_MC_InitialBeam_v3', 'L1PrescalesNone_MC_InitialBeam_v3',
- #2010-2011 menus
- 'L1Prescales100_Physics_pp_v1','L1PrescalesNone_Physics_pp_v1',
- 'L1Prescales100_MC_pp_v1','L1PrescalesNone_MC_pp_v1',
- 'L1Prescales100_MC_pp_v1_tight_mc_prescale','L1PrescalesNone_MC_pp_v1_tight_mc_prescale',
- 'L1Prescales100_MC_pp_v1_loose_mc_prescale','L1PrescalesNone_MC_pp_v1_loose_mc_prescale',
- # HeavyIon
- 'L1Prescales100_InitialBeam_HI_v1','L1PrescalesNone_InitialBeam_HI_v1',
- 'L1Prescales100_MC_InitialBeam_HI_v1', 'L1PrescalesNone_MC_InitialBeam_HI_v1',
- 'L1Prescales100_Physics_HI_v1','L1PrescalesNone_Physics_HI_v1',
- 'L1Prescales100_MC_HI_v1','L1PrescalesNone_MC_HI_v1',
- 'L1Prescales100_Physics_HI_v2','L1PrescalesNone_Physics_HI_v2',
- 'L1Prescales100_MC_HI_v2','L1PrescalesNone_MC_HI_v2',
- 'tight_physics_prescale',
- ]
+ allowedValues = ['', 'None']
StoredValue = ''
_flags.append(L1PrescaleSet)
class HLTPrescaleSet(JobProperty):
statusOn = True
allowedTypes = ['str']
- allowedValues = [
- '', 'None',
- # Physics menus
- 'HLTPrescales100_Physics_lumi1E31_simpleL1Calib','HLTPrescalesNone_Physics_lumi1E31_simpleL1Calib',
- 'HLTPrescales100_Physics_lumi1E32_simpleL1Calib','HLTPrescalesNone_Physics_lumi1E32_simpleL1Calib',
- 'HLTPrescales100_Physics_lumi1E33','HLTPrescalesNone_Physics_lumi1E33',
- 'HLTPrescales100_Physics_lumi1E34','HLTPrescalesNone_Physics_lumi1E34',
- 'HLTPrescales100_MC_lumi1E31_simpleL1Calib','HLTPrescalesNone_MC_lumi1E31_simpleL1Calib',
- 'HLTPrescales100_MC_lumi1E32_simpleL1Calib','HLTPrescalesNone_MC_lumi1E32_simpleL1Calib',
- 'HLTPrescales100_MC_lumi1E33','HLTPrescalesNone_MC_lumi1E33',
- # Enhanced bias
- 'HLTPrescales100_enhBias','HLTPrescalesNone_enhBias',
- # Cosmic menus
- 'HLTPrescales100_Cosmic_v1', 'HLTPrescalesNone_Cosmic_v1',
- 'HLTPrescales100_Cosmic2009_v1', 'HLTPrescalesNone_Cosmic2009_v1',
- 'HLTPrescales100_Cosmic2009_v2', 'HLTPrescalesNone_Cosmic2009_v2',
- 'HLTPrescales100_Cosmic2009_simpleL1Calib', 'HLTPrescalesNone_Cosmic2009_simpleL1Calib',
- 'HLTPrescales100_Cosmic2009_inclMuons', 'HLTPrescalesNone_Cosmic2009_inclMuons',
- 'HLTPrescales100_Cosmic_v2', 'HLTPrescalesNone_Cosmic_v2',
- 'HLTPrescales100_Cosmic_v3', 'HLTPrescalesNone_Cosmic_v3',
- # Commissioning menus
- 'HLTPrescales100_InitialBeam_v1', 'HLTPrescalesNone_InitialBeam_v1',
- 'HLTPrescales100_MC_InitialBeam_v1', 'HLTPrescalesNone_MC_InitialBeam_v1',
- 'HLTPrescales100_InitialBeam_v2', 'HLTPrescalesNone_InitialBeam_v2',
- 'HLTPrescales100_MC_InitialBeam_v2', 'HLTPrescalesNone_MC_InitialBeam_v2',
- 'HLTPrescales100_InitialBeam_v3', 'HLTPrescalesNone_InitialBeam_v3',
- 'HLTPrescales100_MC_InitialBeam_v3', 'HLTPrescalesNone_MC_InitialBeam_v3',
- # 2010-2011 menus
- #2010-2011 menus
- 'HLTPrescales100_Physics_pp_v1','HLTPrescalesNone_Physics_pp_v1',
- 'HLTPrescales100_MC_pp_v1','HLTPrescalesNone_MC_pp_v1',
- 'HLTPrescales100_MC_pp_v1_tight_mc_prescale','HLTPrescalesNone_MC_pp_v1_tight_mc_prescale',
- 'HLTPrescales100_MC_pp_v1_loose_mc_prescale','HLTPrescalesNone_MC_pp_v1_loose_mc_prescale',
- # HeavyIon
- 'HLTPrescales100_InitialBeam_HI_v1','HLTPrescalesNone_InitialBeam_HI_v1',
- 'HLTPrescales100_MC_InitialBeam_HI_v1', 'HLTPrescalesNone_MC_InitialBeam_HI_v1',
- 'HLTPrescales100_Physics_HI_v1','HLTPrescalesNone_Physics_HI_v1',
- 'HLTPrescales100_MC_HI_v1','HLTPrescalesNone_MC_HI_v1',
- 'HLTPrescales100_Physics_HI_v2','HLTPrescalesNone_Physics_HI_v2',
- 'HLTPrescales100_MC_HI_v2','HLTPrescalesNone_MC_HI_v2',
- 'tight_physics_prescale',
- ]
+ allowedValues = ['', 'None']
StoredValue = ''
_flags.append(HLTPrescaleSet)
-
# the container of all trigger flags
class Trigger(JobPropertyContainer):