Merge branch 'ID_configuration_round_2' into 'master'

More ID configuration

See merge request atlas/athena!16661

Trigger/TrigValidation/TrigUpgradeTest/python/InDetConfig.py

@@ -48,13 +48,138 @@ def TrigInDetConfig( flags ):
     InDetPixelRawDataProvider.isRoI_Seeded = True
     InDetPixelRawDataProvider.RoIs = "EMRoIs"
     InDetPixelRawDataProvider.RDOCacheKey = InDetCacheCreatorTrigViews.PixRDOCacheKey
-
     acc.addEventAlgo(InDetPixelRawDataProvider)
 
-
-    from IOVDbSvc.IOVDbSvcConfig import addFoldersSplitOnline
-    extra_folders = addFoldersSplitOnline(flags, "INDET", "/Indet/Onl/Beampos", "/Indet/Beampos", className="AthenaAttributeList")
-    acc.merge(extra_folders)
+    from IOVDbSvc.IOVDbSvcConfig import addFoldersSplitOnline, addFolders
+    acc.merge(addFoldersSplitOnline(flags, "INDET","/Indet/Onl/AlignL1/ID","/Indet/AlignL1/ID",className="CondAttrListCollection"))
+    acc.merge(addFoldersSplitOnline(flags, "INDET","/Indet/Onl/AlignL2/PIX","/Indet/AlignL2/PIX",className="CondAttrListCollection"))
+    acc.merge(addFoldersSplitOnline(flags, "INDET","/Indet/Onl/AlignL2/SCT","/Indet/AlignL2/SCT",className="CondAttrListCollection"))
+    acc.merge(addFoldersSplitOnline(flags, "INDET","/Indet/Onl/AlignL3","/Indet/AlignL3",className="AlignableTransformContainer"))
+
+    from SCT_ConditionsTools.SCT_DCSConditionsToolSetup import SCT_DCSConditionsToolSetup
+    from SCT_ConditionsTools.SCT_ConditionsToolsConf import SCT_DCSConditionsTool
+    dcsTool = SCT_DCSConditionsTool(ReadAllDBFolders = True, ReturnHVTemp = True)
+
+    from SCT_ConditionsTools.SCT_SiliconConditionsToolSetup import SCT_SiliconConditionsToolSetup
+    sct_SiliconConditionsToolSetup = SCT_SiliconConditionsToolSetup()
+    sct_SiliconConditionsToolSetup.setDcsTool(dcsTool)
+    sct_SiliconConditionsToolSetup.setToolName("InDetSCT_SiliconConditionsTool")
+    sct_SiliconConditionsToolSetup.setup()
+
+    sctSiliconConditionsTool = sct_SiliconConditionsToolSetup.getTool()
+    sctSiliconConditionsTool.CheckGeoModel = False
+    sctSiliconConditionsTool.ForceUseGeoModel = False
+
+
+    from SCT_ConditionsAlgorithms.SCT_ConditionsAlgorithmsConf import SCT_AlignCondAlg
+    acc.addCondAlgo(SCT_AlignCondAlg(UseDynamicAlignFolders =  True))
+
+    from SCT_ConditionsAlgorithms.SCT_ConditionsAlgorithmsConf import SCT_DetectorElementCondAlg
+    acc.addCondAlgo(SCT_DetectorElementCondAlg(name = "SCT_DetectorElementCondAlg"))
+    from SCT_Cabling.SCT_CablingConfig import SCT_CablingCondAlgCfg
+    acc.merge(SCT_CablingCondAlgCfg(flags))
+    from SCT_ConditionsTools.SCT_ConditionsToolsConf import SCT_ConfigurationConditionsTool
+    acc.addPublicTool(SCT_ConfigurationConditionsTool())
+    channelFolder = "/SCT/DAQ/Config/Chip"
+    moduleFolder = "/SCT/DAQ/Config/Module"
+    murFolder = "/SCT/DAQ/Config/MUR"
+    from SCT_ConditionsAlgorithms.SCT_ConditionsAlgorithmsConf import SCT_ConfigurationCondAlg
+    acc.addCondAlgo(SCT_ConfigurationCondAlg(ReadKeyChannel = channelFolder,
+                                             ReadKeyModule = moduleFolder,
+                                             ReadKeyMur = murFolder))
+    acc.merge(addFolders(flags, [channelFolder, moduleFolder, murFolder], "SCT", className="CondAttrListVec"))
+    # Set up SCTSiLorentzAngleCondAlg
+    from SCT_ConditionsTools.SCT_ConditionsToolsConf import SCT_ConfigurationConditionsTool
+    stateFolder = "/SCT/DCS/CHANSTAT"
+    hvFolder = "/SCT/DCS/HV"
+    tempFolder = "/SCT/DCS/MODTEMP"
+    dbInstance = "DCS_OFL"
+    acc.merge(addFolders(flags, [stateFolder, hvFolder, tempFolder], dbInstance, className="CondAttrListCollection"))
+
+    from SCT_ConditionsAlgorithms.SCT_ConditionsAlgorithmsConf import SCT_DCSConditionsTempCondAlg
+    acc.addCondAlgo(SCT_DCSConditionsTempCondAlg( ReadKey = tempFolder ))
+    from SCT_ConditionsAlgorithms.SCT_ConditionsAlgorithmsConf import SCT_DCSConditionsStatCondAlg
+    acc.addCondAlgo(SCT_DCSConditionsStatCondAlg(ReturnHVTemp = True,
+                                                 ReadKeyHV = hvFolder,
+                                                 ReadKeyState = stateFolder))
+    from SCT_ConditionsAlgorithms.SCT_ConditionsAlgorithmsConf import SCT_DCSConditionsHVCondAlg
+    acc.addCondAlgo(SCT_DCSConditionsHVCondAlg(ReadKey = hvFolder))
+
+    from SCT_ConditionsAlgorithms.SCT_ConditionsAlgorithmsConf import SCT_SiliconHVCondAlg
+    acc.addCondAlgo(SCT_SiliconHVCondAlg(UseState = dcsTool.ReadAllDBFolders,
+                         DCSConditionsTool = dcsTool))
+    from SCT_ConditionsAlgorithms.SCT_ConditionsAlgorithmsConf import SCT_SiliconTempCondAlg
+    acc.addCondAlgo(SCT_SiliconTempCondAlg(UseState = dcsTool.ReadAllDBFolders, DCSConditionsTool = dcsTool))
+
+
+    from SiLorentzAngleSvc.SiLorentzAngleSvcConf import SCTSiLorentzAngleCondAlg
+    acc.addCondAlgo(SCTSiLorentzAngleCondAlg(name = "SCTSiLorentzAngleCondAlg",
+                                        SiConditionsTool = sctSiliconConditionsTool,
+                                        UseMagFieldSvc = True,
+                                        UseMagFieldDcs = False))
+    from SiLorentzAngleSvc.SiLorentzAngleSvcConf import SiLorentzAngleTool
+    SCTLorentzAngleTool = SiLorentzAngleTool(name = "SCTLorentzAngleTool", DetectorName="SCT", SiLorentzAngleCondData="SCTSiLorentzAngleCondData")
+    SCTLorentzAngleTool.UseMagFieldSvc = True #may need also MagFieldSvc instance
+    acc.addPublicTool(SCTLorentzAngleTool)
+
+
+    acc.merge(addFoldersSplitOnline(flags, "INDET", "/Indet/Onl/Beampos", "/Indet/Beampos", className="AthenaAttributeList"))
+    acc.merge(addFolders(flags, "/TRT/Onl/ROD/Compress","TRT_ONL", className='CondAttrListCollection'))
+    acc.merge(addFoldersSplitOnline(flags, "TRT","/TRT/Onl/Calib/RT","/TRT/Calib/RT",className="TRTCond::RtRelationMultChanContainer"))
+    acc.merge(addFoldersSplitOnline(flags, "TRT","/TRT/Onl/Calib/T0","/TRT/Calib/T0",className="TRTCond::StrawT0MultChanContainer"))
+    acc.merge(addFoldersSplitOnline (flags, "TRT","/TRT/Onl/Calib/errors","/TRT/Calib/errors",className="TRTCond::RtRelationMultChanContainer"))
+    acc.merge(addFoldersSplitOnline(flags, "TRT","/TRT/Onl/Calib/ToTCalib","/TRT/Calib/ToTCalib",className="CondAttrListCollection"))
+    acc.merge(addFoldersSplitOnline(flags, "TRT","/TRT/Onl/Calib/HTCalib","/TRT/Calib/HTCalib",className="CondAttrListCollection"))
+
+    PixelTDAQFolder   = "/TDAQ/Resources/ATLAS/PIXEL/Modules"
+    PixelTDAQInstance = "TDAQ_ONL"
+    acc.merge(addFolders(flags, PixelTDAQFolder, PixelTDAQInstance, className="CondAttrListCollection"))
+
+    from PixelConditionsTools.PixelConditionsToolsConf import PixelDCSConditionsTool
+    TrigPixelDCSConditionsTool = PixelDCSConditionsTool(name="PixelDCSConditionsTool", UseConditions=True, IsDATA=True)
+    acc.addPublicTool(TrigPixelDCSConditionsTool)
+
+    PixelHVFolder = "/PIXEL/DCS/HV"
+    PixelTempFolder = "/PIXEL/DCS/TEMPERATURE"
+    PixelDBInstance = "DCS_OFL"
+
+    acc.merge(addFolders(flags, PixelHVFolder, PixelDBInstance, className="CondAttrListCollection"))
+    acc.merge(addFolders(flags, PixelTempFolder, PixelDBInstance, className="CondAttrListCollection"))
+
+    from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelDCSCondHVAlg
+    acc.addCondAlgo(PixelDCSCondHVAlg(name="PixelDCSCondHVAlg", ReadKey=PixelHVFolder))
+
+    from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelDCSCondTempAlg
+    acc.addCondAlgo(PixelDCSCondTempAlg(name="PixelDCSCondTempAlg", ReadKey=PixelTempFolder))
+
+
+    from PixelConditionsTools.PixelConditionsToolsConf import PixelDCSConditionsTool
+    TrigPixelDCSConditionsTool = PixelDCSConditionsTool(name="PixelDCSConditionsTool", UseConditions=True, IsDATA=True)
+
+    acc.addPublicTool(TrigPixelDCSConditionsTool)
+
+    from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelTDAQCondAlg
+    acc.addCondAlgo(PixelTDAQCondAlg(name="PixelTDAQCondAlg", ReadKey=PixelTDAQFolder))
+
+    from SiPropertiesSvc.SiPropertiesSvcConf import PixelSiPropertiesCondAlg
+    acc.addCondAlgo(PixelSiPropertiesCondAlg(name="PixelSiPropertiesCondAlg", PixelDCSConditionsTool=TrigPixelDCSConditionsTool))
+
+    from SiPropertiesSvc.SiPropertiesSvcConf import SiPropertiesTool
+    TrigSiPropertiesTool = SiPropertiesTool(name="PixelSiPropertiesTool", DetectorName="Pixel", ReadKey="PixelSiliconPropertiesVector")
+
+    acc.addPublicTool(TrigSiPropertiesTool)
+
+    from SiLorentzAngleSvc.SiLorentzAngleSvcConf import PixelSiLorentzAngleCondAlg
+    acc.addCondAlgo(PixelSiLorentzAngleCondAlg(name="PixelSiLorentzAngleCondAlg",
+                                            PixelDCSConditionsTool=TrigPixelDCSConditionsTool,
+                                            SiPropertiesTool=TrigSiPropertiesTool,
+                                            UseMagFieldSvc = True,
+                                            UseMagFieldDcs = False))
+
+    from SiLorentzAngleSvc.SiLorentzAngleSvcConf import SiLorentzAngleTool
+    TrigPixelLorentzAngleTool = SiLorentzAngleTool(name = "PixelLorentzAngleTool", DetectorName="Pixel", SiLorentzAngleCondData="PixelSiLorentzAngleCondData")
+
+    acc.addPublicTool(TrigPixelLorentzAngleTool)
 
     from BeamSpotConditions.BeamSpotConditionsConf import BeamSpotCondAlg
     acc.addCondAlgo(BeamSpotCondAlg( "BeamSpotCondAlg" ))
@@ -304,9 +429,23 @@ if __name__ == "__main__":
     from AthenaConfiguration.AllConfigFlags import ConfigFlags
     ConfigFlags.Input.Files = ["/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data17_13TeV.00327265.physics_EnhancedBias.merge.RAW._lb0100._SFO-1._0001.1"]
     ConfigFlags.Trigger.LVL1ConfigFile = "LVL1config_Physics_pp_v7.xml"
+    #ConfigFlags.IOVDb.GlobalTag = "CONDBR2-BLKPA-2018-13"
     ConfigFlags.lock()
 
+    from AthenaCommon.Constants import INFO,DEBUG
+
+
     acc = ComponentAccumulator()
+
+    nThreads=1
+
+    from StoreGate.StoreGateConf import SG__HiveMgrSvc
+    eventDataSvc = SG__HiveMgrSvc("EventDataSvc")
+    eventDataSvc.NSlots = nThreads
+    eventDataSvc.OutputLevel = DEBUG
+    acc.addService( eventDataSvc )
+    #from AthenaConfiguration.MainServicesConfig import MainServicesThreadedCfg
+    #acc.merge( MainServicesThreadedCfg( ConfigFlags ) )
     from L1Decoder.L1DecoderConfig import L1DecoderCfg
     l1DecoderAcc, l1DecoderAlg = L1DecoderCfg( ConfigFlags )
     acc.addEventAlgo(l1DecoderAlg)
@@ -321,8 +460,6 @@ if __name__ == "__main__":
     acc.merge( rsc )
     acc.addService(regSel)
 
-    #from AthenaConfiguration.MainServicesConfig import MainServicesSerialCfg
-    #acc.merge( MainServicesSerialCfg( ) )
 
     acc.printConfig()
     acc.store( open("test.pkl", "w") )