Update default bunch crossing info source

Update default bunch crossing info source

Control/AthenaCommon/python/BeamFlags.py

@@ -63,6 +63,15 @@ class energy (JobProperty):
     statusOn=True
     allowedTypes=['float']
     StoredValue=7*TeV
+#
+# 
+class bunchStructureSource (JobProperty):
+    """ Specify beam energy (MeV)
+    """ 
+    statusOn=True
+    allowedTypes=['int']
+    allowedValues=[0,1,2,3]
+    StoredValue=2
 
 
 
@@ -86,7 +95,7 @@ class Beam(JobPropertyContainer):
 jobproperties.add_Container(Beam)
 
 # I want always the following flags in the Beam container  
-_list_Beam=[override,bunchSpacing,numberOfCollisions,beamType,energy]
+_list_Beam=[override,bunchSpacing,numberOfCollisions,beamType,energy,bunchStructureSource]
 for j in _list_Beam: 
     jobproperties.Beam.add_JobProperty(j)
 del _list_Beam

Control/AthenaConfiguration/python/AllConfigFlags.py

@@ -3,7 +3,7 @@
 from AthenaCommon.SystemOfUnits import TeV
 from AthenaConfiguration.AthConfigFlags import AthConfigFlags
 from AthenaConfiguration.AutoConfigFlags import GetFileMD, getInitialTimeStampsFromRunNumbers, getRunToTimestampDict, getSpecialConfigurationMetadata
-from AthenaConfiguration.Enums import BeamType, Format, ProductionStep
+from AthenaConfiguration.Enums import BeamType, Format, ProductionStep, BunchStructureSource
 from PyUtils.moduleExists import moduleExists
 
 
@@ -130,6 +130,7 @@ def _createCfgFlags():
     acf.addFlag('Beam.Energy', lambda prevFlags : GetFileMD(prevFlags.Input.Files).get('beam_energy',7*TeV)) # former global.BeamEnergy
     acf.addFlag('Beam.estimatedLuminosity', lambda prevFlags : ( 1E33*(prevFlags.Beam.NumberOfCollisions)/2.3 ) *\
         (25./prevFlags.Beam.BunchSpacing)) # former flobal.estimatedLuminosity
+    acf.addFlag('Beam.BunchStructureSource', lambda prevFlags: BunchStructureSource.MC if prevFlags.Input.isMC else BunchStructureSource.TrigConf)
 
 
 

Control/AthenaConfiguration/python/Enums.py

@@ -59,3 +59,10 @@ class BeamType(FlagEnum):
     Collisions = 'collisions'
     SingleBeam = 'singlebeam'
     Cosmics = 'cosmics'
+
+
+class BunchStructureSource(FlagEnum):
+    FILLPARAMS = 0
+    MC = 1
+    TrigConf = 2
+    Lumi = 3

LumiBlock/LumiBlockComps/python/BunchCrossingCondAlgConfig.py

@@ -2,6 +2,7 @@
 
 from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
 from AthenaConfiguration.ComponentFactory import CompFactory
+from AthenaConfiguration.Enums import BunchStructureSource
 
 
 def BunchCrossingCondAlgCfg(configFlags):
@@ -11,10 +12,11 @@ def BunchCrossingCondAlgCfg(configFlags):
     result=ComponentAccumulator()
 
     run1=(configFlags.IOVDb.DatabaseInstance=='COMP200')
+    cfgsvc = None
+    folder = ''
 
-    if (configFlags.Input.isMC):
+    if configFlags.Beam.BunchStructureSource == BunchStructureSource.MC:
         folder = "/Digitization/Parameters"
-        Mode = 1
         from AthenaConfiguration.Enums import ProductionStep
         if configFlags.Common.ProductionStep not in [ProductionStep.Digitization, ProductionStep.PileUpPresampling, ProductionStep.Overlay, ProductionStep.FastChain]:
             result.merge(addFolders(configFlags,folder,None,className="AthenaAttributeList",tag='HEAD'))
@@ -23,16 +25,22 @@ def BunchCrossingCondAlgCfg(configFlags):
             # /Digitization/Parameters metadata is not present in the
             # input file and will be created during the job
             pass
-    else: #data case
+    elif configFlags.Beam.BunchStructureSource == BunchStructureSource.FILLPARAMS:
         folder = '/TDAQ/OLC/LHC/FILLPARAMS'
-        Mode = 0
         result.merge(addFolders(configFlags,folder,'TDAQ',className = 'AthenaAttributeList',tag='HEAD'))
-
+    elif configFlags.Beam.BunchStructureSource == BunchStructureSource.TrigConf:
+        from TrigConfxAOD.TrigConfxAODConfig import getxAODConfigSvc
+        cfgsvc = result.getPrimaryAndMerge(getxAODConfigSvc(configFlags))
+    elif configFlags.Beam.BunchStructureSource == BunchStructureSource.Lumi:
+        from .LuminosityCondAlgConfig import LuminosityCondAlgCfg
+        result.merge(LuminosityCondAlgCfg(configFlags))
 
     alg = BunchCrossingCondAlg('BunchCrossingCondAlgDefault',
                                Run1=run1,
-                               FillParamsFolderKey =folder,
-                               Mode=Mode )
+                               FillParamsFolderKey=folder,
+                               Mode=configFlags.Beam.BunchStructureSource.value,
+                               TrigConfigSvc=cfgsvc 
+                               )
 
     result.addCondAlgo(alg)
 

LumiBlock/LumiBlockComps/python/BunchCrossingCondAlgDefault.py

@@ -16,13 +16,17 @@ def BunchCrossingCondAlgDefault():
     
     from LumiBlockComps.LumiBlockCompsConf import BunchCrossingCondAlg
     from IOVDbSvc.CondDB import conddb
+    from AthenaCommon.BeamFlags import beamFlags
 
-    isMC=conddb.isMC
     run1=(conddb.dbdata == 'COMP200')
+    folder = None
 
-    if (isMC):
+    if conddb.isMC and beamFlags.bunchStructureSource() != 1:
+        mlog.info('This is MC, trying to reset beamFlags.bunchStructureSource to 1')
+        beamFlags.bunchStructureSource = 1
+
+    if beamFlags.bunchStructureSource() == 1:
         folder = "/Digitization/Parameters"
-        Mode = 1
         from AthenaCommon.DetFlags import DetFlags
         if not DetFlags.digitize.any_on():
             if not conddb.folderRequested(folder):
@@ -36,17 +40,18 @@ def BunchCrossingCondAlgDefault():
             # /Digitization/Parameters metadata is not present in the
             # input file and will be created during the job
             mlog.info("Folder %s will be created during the job.", folder)
-    else:
+    elif beamFlags.bunchStructureSource() == 0:
         folder = '/TDAQ/OLC/LHC/FILLPARAMS'
-        Mode = 0
         # Mistakenly created as multi-version folder, must specify HEAD 
         conddb.addFolderWithTag('TDAQ', folder, 'HEAD',
                                 className = 'AthenaAttributeList')
+    # other possibilities for BunchStructureSource: assume we are running in a context
+    # where dependencies are set up
         
     alg = BunchCrossingCondAlg(name,
                                Run1=run1,
                                FillParamsFolderKey =folder,
-                               Mode=Mode )
+                               Mode=beamFlags.bunchStructureSource() )
 
     condSeq += alg
 

LumiBlock/LumiBlockComps/python/BunchCrossingCondAlgTest.py

@@ -2,6 +2,8 @@
 
 from AthenaConfiguration.ComponentFactory import CompFactory
 from LumiBlockComps.BunchCrossingCondAlgConfig import BunchCrossingCondAlgCfg
+from AthenaConfiguration.Enums import BunchStructureSource
+from IOVDbSvc.IOVDbSvcConfig import IOVDbSvcCfg
 from LumiBlockComps.dummyLHCFillDB import createSqlite,fillFolder
 
 import os
@@ -77,6 +79,7 @@ from AthenaConfiguration.AllConfigFlags import ConfigFlags
 from AthenaConfiguration.MainServicesConfig import MainServicesCfg
 ConfigFlags.Input.Files=[]
 ConfigFlags.Input.isMC=False
+ConfigFlags.Beam.BunchStructureSource=BunchStructureSource.FILLPARAMS
 ConfigFlags.IOVDb.DatabaseInstance="CONDBR2"
 ConfigFlags.IOVDb.GlobalTag="CONDBR2-BLKPA-2017-05"
 ConfigFlags.GeoModel.AtlasVersion="ATLAS-R2-2016-01-00-01"
@@ -105,6 +108,8 @@ result.addService(CompFactory.EvtPersistencySvc("EventPersistencySvc",CnvService
 
 result.merge(BunchCrossingCondAlgCfg(ConfigFlags))
 
+print(ConfigFlags.Beam.BunchStructureSource)
+result.merge(IOVDbSvcCfg(ConfigFlags))
 result.getService("IOVDbSvc").Folders=["<db>sqlite://;schema=test.db;dbname=CONDBR2</db><tag>HEAD</tag>/TDAQ/OLC/LHC/FILLPARAMS"]
 result.getCondAlgo("BunchCrossingCondAlgDefault").OutputLevel=1
 

LumiBlock/LumiBlockComps/src/BunchCrossingCondAlg.h

@@ -51,7 +51,7 @@ private:
   SG::WriteCondHandleKey<BunchCrossingCondData> m_outputKey{this, "OutputKey", "BunchCrossingData", "Key of output CDO" };
 
   // Service handle
-  const ServiceHandle<TrigConf::ILVL1ConfigSvc> m_trigConfigSvc{this, "TrigConfigSvc", "", "Trig Config Svc"};
+  const ServiceHandle<TrigConf::ILVL1ConfigSvc> m_trigConfigSvc{this, "TrigConfigSvc", "TrigConf::xAODConfigSvc/xAODConfigSvc", "Trig Config Svc"};
 
   ///internal methods:
   std::vector<bunchTrain_t> findTrains(const std::bitset< BunchCrossingCondData::m_MAX_BCID>& pairsToConsume, const int maxSpacingInTrain, const unsigned minBunchesPerTrain) const;