Merge branch 'LArHVCablingSplit' into '24.0'

Split cfg of LAr HV Cabling into separate config-file

See merge request !76873

LArCalorimeter/LArCabling/python/LArHVCablingConfig.py

+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+
+from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
+from AthenaConfiguration.ComponentFactory import CompFactory
+from IOVDbSvc.IOVDbSvcConfig import addFolders
+
+def LArHVCablingCfg(flags):
+    result=ComponentAccumulator()
+    if flags.Input.isMC:
+        result.merge(addFolders(flags,["/LAR/Identifier/HVLineToElectrodeMap<tag>LARHVLineToElectrodeMap-001</tag>"], "LAR_OFL",
+                                className="AthenaAttributeList"))
+        
+        larHVIdMappingAlg=CompFactory.LArHVIdMappingAlg(ReadKey="/LAR/Identifier/HVLineToElectrodeMap",WriteKey="LArHVIdMap")
+        result.addCondAlgo(larHVIdMappingAlg)
+
+    else:
+        #Data case
+        result.merge(addFolders(flags,["/LAR/IdentifierOfl/HVLineToElectrodeMap"], "LAR_OFL", className="AthenaAttributeList"))
+        hvmapalg = CompFactory.LArHVIdMappingAlg(ReadKey="/LAR/IdentifierOfl/HVLineToElectrodeMap",WriteKey="LArHVIdMap")
+        result.addCondAlgo(hvmapalg)
+
+    return result

LArCalorimeter/LArCalibUtils/python/LArHVScaleConfig.py

@@ -13,35 +13,26 @@ def LArHVScaleCfg(configFlags):
     from LArGeoAlgsNV.LArGMConfig import LArGMCfg
     result.merge(LArGMCfg(configFlags))
 
+    from LArCabling.LArHVCablingConfig import LArHVCablingCfg
+    result.merge(LArHVCablingCfg(configFlags))
+
+    result.merge(LArBadFebCfg(configFlags))
+    
     from IOVDbSvc.IOVDbSvcConfig import addFolders
     LArHVCondAlg=CompFactory.LArHVCondAlg
 
     if configFlags.Input.isMC:
-        result.merge(addFolders(configFlags,["/LAR/Identifier/HVLineToElectrodeMap<tag>LARHVLineToElectrodeMap-001</tag>"], "LAR_OFL", className="AthenaAttributeList"))
-
-        LArHVIdMappingAlg=CompFactory.LArHVIdMappingAlg
-        hvmapalg = LArHVIdMappingAlg(ReadKey="/LAR/Identifier/HVLineToElectrodeMap",WriteKey="LArHVIdMap")
-        result.addCondAlgo(hvmapalg)
-
-        result.merge(LArBadFebCfg(configFlags))
-
         result.addCondAlgo(LArHVCondAlg(doHV=False, doAffectedHV=False))
 
     elif not configFlags.Common.isOnline:
         result.merge(addFolders(configFlags,["/LAR/DCS/HV/BARREl/I16"], "DCS_OFL", className="CondAttrListCollection"))
         result.merge(addFolders(configFlags,["/LAR/DCS/HV/BARREL/I8"],  "DCS_OFL", className="CondAttrListCollection"))
 
-        result.merge(addFolders(configFlags,["/LAR/IdentifierOfl/HVLineToElectrodeMap"], "LAR_OFL", className="AthenaAttributeList"))
         result.merge(addFolders(configFlags,["/LAR/HVPathologiesOfl/Pathologies"], "LAR_OFL", className="AthenaAttributeList"))
         if configFlags.GeoModel.Run is not LHCPeriod.Run1:
             result.merge(addFolders(configFlags,["/LAR/HVPathologiesOfl/Rvalues"], "LAR_OFL", className="AthenaAttributeList"))
 
         result.merge(LArBadChannelCfg(configFlags))
-        result.merge(LArBadFebCfg(configFlags))
-
-        LArHVIdMappingAlg=CompFactory.LArHVIdMappingAlg
-        hvmapalg = LArHVIdMappingAlg(ReadKey="/LAR/IdentifierOfl/HVLineToElectrodeMap",WriteKey="LArHVIdMap")
-        result.addCondAlgo(hvmapalg)
 
         LArHVPathologyDbCondAlg=CompFactory.LArHVPathologyDbCondAlg
         hvpath = LArHVPathologyDbCondAlg(PathologyFolder="/LAR/HVPathologiesOfl/Pathologies",

LArCalorimeter/LArCellRec/python/LArNoisyROSummaryConfig.py

@@ -3,6 +3,7 @@
 from AthenaConfiguration.ComponentFactory import CompFactory
 from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
 from LArBadChannelTool.LArBadFebsConfig import LArKnownBadFebCfg, LArKnownMNBFebCfg
+from LArCabling.LArHVCablingConfig import LArHVCablingCfg
 from AthenaConfiguration.Enums import ProductionStep
 
 def LArNoisyROSummaryCfg(configFlags, **kwargs):
@@ -14,6 +15,7 @@ def LArNoisyROSummaryCfg(configFlags, **kwargs):
    if not isMC:
       result.merge(LArKnownBadFebCfg(configFlags))
       result.merge(LArKnownMNBFebCfg(configFlags))
+      result.merge(LArHVCablingCfg(configFlags))
       result.addEventAlgo(CompFactory.LArHVlineMapAlg(keyOutput="LArHVNcells"))
 
    # now configure the algorithm