diff --git a/LArCalorimeter/LArCalibTools/python/LArCalib_HVScale2NtupleConfig.py b/LArCalorimeter/LArCalibTools/python/LArCalib_HVScale2NtupleConfig.py
index c7f027404d9bd0acea3c070e598865d2367926d7..668caefddb998f0da507bc02e57d45538cde4a28 100644
--- a/LArCalorimeter/LArCalibTools/python/LArCalib_HVScale2NtupleConfig.py
+++ b/LArCalorimeter/LArCalibTools/python/LArCalib_HVScale2NtupleConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
from AthenaConfiguration.ComponentFactory import CompFactory
from AthenaConfiguration.MainServicesConfig import MainEvgenServicesCfg
@@ -59,25 +59,26 @@ if __name__=="__main__":
print("WARNING: Failed to convert time",TimeStamp_ns,"into a run/lumi number. Using 'infinite' run-number",rlb[0])
- from AthenaConfiguration.AllConfigFlags import ConfigFlags
+ from AthenaConfiguration.AllConfigFlags import initConfigFlags
+ flags = initConfigFlags()
from LArCalibProcessing.LArCalibConfigFlags import addLArCalibFlags
- addLArCalibFlags(ConfigFlags)
+ addLArCalibFlags(flags)
- ConfigFlags.Input.RunNumbers=[rlb[0]]
- ConfigFlags.Input.TimeStamps=[TimeStamp]
- ConfigFlags.Input.Files=[]
- ConfigFlags.IOVDb.DatabaseInstance="CONDBR2"
+ flags.Input.RunNumbers=[rlb[0]]
+ flags.Input.TimeStamps=[TimeStamp]
+ flags.Input.Files=[]
+ flags.IOVDb.DatabaseInstance="CONDBR2"
rootfile="hvcorr_read.root"
if len(sys.argv)>2:
rootFile=sys.argv[2]
if len(sys.argv)>3:
- ConfigFlags.IOVDb.GlobalTag=sys.argv[3]
+ flags.IOVDb.GlobalTag=sys.argv[3]
- ConfigFlags.lock()
- cfg=MainEvgenServicesCfg(ConfigFlags)
- cfg.merge(LArHVScaleCorr2NtupleCfg(ConfigFlags))
+ flags.lock()
+ cfg=MainEvgenServicesCfg(flags)
+ cfg.merge(LArHVScaleCorr2NtupleCfg(flags))
print("Start running...")
diff --git a/LArCalorimeter/LArExample/LArCalibProcessing/python/exampleDriverScript.py b/LArCalorimeter/LArExample/LArCalibProcessing/python/exampleDriverScript.py
index 5d3eb4b7d05b49f5e0b13f9861b0113a1f66c2e6..e1ee0e6bdd7d78a30088191121be4d084f739e1c 100644
--- a/LArCalorimeter/LArExample/LArCalibProcessing/python/exampleDriverScript.py
+++ b/LArCalorimeter/LArExample/LArCalibProcessing/python/exampleDriverScript.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
#Import the configution-method we want to use (here: Delay and Cali-OFCs)
from LArCalibProcessing.LArCalib_Delay_OFCCaliConfig import LArDelay_OFCCaliCfg
@@ -7,72 +7,73 @@ from LArCalibProcessing.LArCalib_Delay_OFCCaliConfig import LArDelay_OFCCaliCfg
from AthenaConfiguration.MainServicesConfig import MainServicesCfg
#Import the flag-container that is the arguemnt to the configuration methods
-from AthenaConfiguration.AllConfigFlags import ConfigFlags
+from AthenaConfiguration.AllConfigFlags import initConfigFlags
+flags = initConfigFlags()
from LArCalibProcessing.LArCalibConfigFlags import addLArCalibFlags
-addLArCalibFlags(ConfigFlags)
+addLArCalibFlags(flags)
#This allows set flags from the command-line (not strictly required for the AP)
-ConfigFlags.fillFromArgs()
+flags.fillFromArgs()
#Now we set the flags as required for this particular job:
#The following flags help finding the input bytestream files:
-ConfigFlags.LArCalib.Input.Dir = "/scratch/wlampl/calib21/HECFCAL_Oct20"
-ConfigFlags.LArCalib.Input.Type="calibration_LArElec-Delay"
-ConfigFlags.LArCalib.Input.RunNumbers=[404512,]
-ConfigFlags.Input.Files=ConfigFlags.LArCalib.Input.Files
+flags.LArCalib.Input.Dir = "/scratch/wlampl/calib21/HECFCAL_Oct20"
+flags.LArCalib.Input.Type="calibration_LArElec-Delay"
+flags.LArCalib.Input.RunNumbers=[404512,]
+flags.Input.Files=flags.LArCalib.Input.Files
#Set the database (sqlite-file) containing the input conditions that
#come typcially from the same calibration campaign
#(in this case, Pedestal and AutoCorr)
-ConfigFlags.LArCalib.Input.Database="db.sqlite"
+flags.LArCalib.Input.Database="db.sqlite"
#Some configs depend on the sub-calo in question, here HEC
#(sets also the preselection of LArRawCalibDataReadingAlg)
-ConfigFlags.LArCalib.Input.SubDet="HEC"
+flags.LArCalib.Input.SubDet="HEC"
#Configure the Bad-Channel database we are reading
#(the AP typically uses a snapshot in an sqlite file
-ConfigFlags.LArCalib.BadChannelDB="BadChannelSnapshot.db"
-ConfigFlags.LArCalib.BadChannelTag="-RUN2-UPD3-00"
+flags.LArCalib.BadChannelDB="BadChannelSnapshot.db"
+flags.LArCalib.BadChannelTag="-RUN2-UPD3-00"
#Output of this job:
#ROOT file:
-ConfigFlags.LArCalib.Output.ROOTFile="ofccali.root"
+flags.LArCalib.Output.ROOTFile="ofccali.root"
#POOL file:
-ConfigFlags.LArCalib.Output.POOLFile="ofccali.pool.root"
+flags.LArCalib.Output.POOLFile="ofccali.pool.root"
#sqlite file (can be the same as the input-sqlite, but slightly different syntax
-ConfigFlags.IOVDb.DBConnection="sqlite://;schema=db.sqlite;dbname=CONDBR2"
+flags.IOVDb.DBConnection="sqlite://;schema=db.sqlite;dbname=CONDBR2"
#The global tag we are working with
-ConfigFlags.IOVDb.GlobalTag="LARCALIB-RUN2-00"
+flags.IOVDb.GlobalTag="LARCALIB-RUN2-00"
#Other potentially useful flags-settings:
#Define the global output Level:
#from AthenaCommon.Constants import *
-#ConfigFlags.Exec.OutputLevel=VERBOSE
+#flags.Exec.OutputLevel=VERBOSE
#Feed-though preselection for bytestream input:
-#ConfigFlags.LArCalib.Preselection.BEC=[1]
-#ConfigFlags.LArCalib.Preselection.Side=[0]
+#flags.LArCalib.Preselection.BEC=[1]
+#flags.LArCalib.Preselection.Side=[0]
#Print the input files we found
print ("Input files to be processed:")
-for f in ConfigFlags.Input.Files:
+for f in flags.Input.Files:
print (f)
#Lock the flag-container (required)
-ConfigFlags.lock()
+flags.lock()
#Get the Main services (EventLoopMgr, StoreGate, ... )
-cfg=MainServicesCfg(ConfigFlags)
+cfg=MainServicesCfg(flags)
#Merge our own config into it
-cfg.merge(LArDelay_OFCCaliCfg(ConfigFlags))
+cfg.merge(LArDelay_OFCCaliCfg(flags))
#At this point we can alter the configuration
diff --git a/LArCalorimeter/LArExample/LArCalibProcessing/share/LArDigits2NtupleDumper.py b/LArCalorimeter/LArExample/LArCalibProcessing/share/LArDigits2NtupleDumper.py
index d7bbfeef38a4c4f224f8f39a6fe44570d82ea312..beac2a809547b24dd9ef1578e7d377a5b80c3353 100755
--- a/LArCalorimeter/LArExample/LArCalibProcessing/share/LArDigits2NtupleDumper.py
+++ b/LArCalorimeter/LArExample/LArCalibProcessing/share/LArDigits2NtupleDumper.py
@@ -1,15 +1,13 @@
#!/usr/bin/env python
#
-# Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
from AthenaConfiguration.ComponentFactory import CompFactory
-from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
if __name__=='__main__':
import os,sys
import argparse
- import subprocess
from AthenaCommon import Logging
log = Logging.logging.getLogger( 'LArDigits2Ntuple' )
@@ -41,82 +39,83 @@ if __name__=='__main__':
log.debug(value)
#Import the flag-container that is the arguemnt to the configuration methods
- from AthenaConfiguration.AllConfigFlags import ConfigFlags
+ from AthenaConfiguration.AllConfigFlags import initConfigFlags
+ flags = initConfigFlags()
# add SCDump flags, here re-used for digitsdump
from LArCafJobs.LArSCDumperFlags import addSCDumpFlags
- addSCDumpFlags(ConfigFlags)
+ addSCDumpFlags(flags)
if len(args.infile) > 0:
- ConfigFlags.Input.Files = [args.infile]
+ flags.Input.Files = [args.infile]
elif len(args.inppatt) > 0:
from LArCalibProcessing.GetInputFiles import GetInputFilesFromPattern
- ConfigFlags.Input.Files = GetInputFilesFromPattern(args.indir,args.inppatt)
+ flags.Input.Files = GetInputFilesFromPattern(args.indir,args.inppatt)
else:
from LArCalibProcessing.GetInputFiles import GetInputFilesFromPrefix
- ConfigFlags.Input.Files = GetInputFilesFromPrefix(args.indir,args.inpref)
+ flags.Input.Files = GetInputFilesFromPrefix(args.indir,args.inpref)
if args.run != 0:
- ConfigFlags.Input.RunNumbers = [args.run]
+ flags.Input.RunNumbers = [args.run]
# first autoconfig
from LArConditionsCommon.LArRunFormat import getLArFormatForRun
try:
- runinfo=getLArFormatForRun(ConfigFlags.Input.RunNumbers[0], connstring="COOLONL_LAR/CONDBR2")
+ runinfo=getLArFormatForRun(flags.Input.RunNumbers[0], connstring="COOLONL_LAR/CONDBR2")
except Exception:
log.warning("Could not get run info, using defaults !")
if args.nsamp > 0:
- ConfigFlags.LArSCDump.nSamples=args.nsamp
+ flags.LArSCDump.nSamples=args.nsamp
else:
- ConfigFlags.LArSCDump.nSamples=4
+ flags.LArSCDump.nSamples=4
else:
- ConfigFlags.LArSCDump.nSamples=runinfo.nSamples()
+ flags.LArSCDump.nSamples=runinfo.nSamples()
- ConfigFlags.LArSCDump.digitsKey="FREE"
- if args.nsamp > 0 and args.nsamp < ConfigFlags.LArSCDump.nSamples:
- ConfigFlags.LArSCDump.nSamples=args.nsamp
+ flags.LArSCDump.digitsKey="FREE"
+ if args.nsamp > 0 and args.nsamp < flags.LArSCDump.nSamples:
+ flags.LArSCDump.nSamples=args.nsamp
log.info("Autoconfigured: ")
- log.info("nSamples: %d digitsKey %s",ConfigFlags.LArSCDump.nSamples, ConfigFlags.LArSCDump.digitsKey)
+ log.info("nSamples: %d digitsKey %s",flags.LArSCDump.nSamples, flags.LArSCDump.digitsKey)
# now construct the job
- ConfigFlags.LAr.doAlign=False
+ flags.LAr.doAlign=False
if args.evtree: # should include trigger info
- ConfigFlags.Trigger.triggerConfig = 'DB'
- ConfigFlags.Trigger.L1.doCTP = True
- ConfigFlags.Trigger.L1.doMuon = False
- ConfigFlags.Trigger.L1.doCalo = False
- ConfigFlags.Trigger.L1.doTopo = False
+ flags.Trigger.triggerConfig = 'DB'
+ flags.Trigger.L1.doCTP = True
+ flags.Trigger.L1.doMuon = False
+ flags.Trigger.L1.doCalo = False
+ flags.Trigger.L1.doTopo = False
- ConfigFlags.Trigger.enableL1CaloLegacy = True
- ConfigFlags.Trigger.enableL1CaloPhase1 = True
+ flags.Trigger.enableL1CaloLegacy = True
+ flags.Trigger.enableL1CaloPhase1 = True
- ConfigFlags.lock()
+ flags.lock()
#Import the MainServices (boilerplate)
from AthenaConfiguration.MainServicesConfig import MainServicesCfg
from LArGeoAlgsNV.LArGMConfig import LArGMCfg
- acc = MainServicesCfg(ConfigFlags)
- acc.merge(LArGMCfg(ConfigFlags))
+ acc = MainServicesCfg(flags)
+ acc.merge(LArGMCfg(flags))
from LArCabling.LArCablingConfig import LArOnOffIdMappingCfg
- acc.merge(LArOnOffIdMappingCfg(ConfigFlags))
+ acc.merge(LArOnOffIdMappingCfg(flags))
if args.evtree: # should include trigger info
from LArCafJobs.LArSCDumperSkeleton import L1CaloMenuCfg
- acc.merge(L1CaloMenuCfg(ConfigFlags))
+ acc.merge(L1CaloMenuCfg(flags))
from TrigDecisionTool.TrigDecisionToolConfig import TrigDecisionToolCfg
- tdt = acc.getPrimaryAndMerge(TrigDecisionToolCfg(ConfigFlags))
+ tdt = acc.getPrimaryAndMerge(TrigDecisionToolCfg(flags))
else:
tdt = None
if args.bc:
from LArBadChannelTool.LArBadChannelConfig import LArBadFebCfg, LArBadChannelCfg
- acc.merge(LArBadChannelCfg(ConfigFlags))
- acc.merge(LArBadFebCfg(ConfigFlags))
+ acc.merge(LArBadChannelCfg(flags))
+ acc.merge(LArBadFebCfg(flags))
if args.geom:
log.warning("Adding real geometry is not working yet")
@@ -127,9 +126,9 @@ if __name__=='__main__':
#AthReadAlg_ExtraInputs.append(('CaloSuperCellDetDescrManager', 'ConditionStore+CaloSuperCellDetDescrManager'))
from LArCalibTools.LArDigits2NtupleConfig import LArDigits2NtupleCfg
- acc.merge(LArDigits2NtupleCfg(ConfigFlags, AddBadChannelInfo=args.bc, AddFEBTempInfo=False, isSC=False, isFlat=True,
+ acc.merge(LArDigits2NtupleCfg(flags, AddBadChannelInfo=args.bc, AddFEBTempInfo=False, isSC=False, isFlat=True,
OffId=args.offline, AddHash=args.ahash, AddCalib=args.calib, RealGeometry=args.geom, # from LArCond2NtupleBase
- NSamples=ConfigFlags.LArSCDump.nSamples, FTlist={}, ContainerKey=ConfigFlags.LArSCDump.digitsKey, # from LArDigits2Ntuple
+ NSamples=flags.LArSCDump.nSamples, FTlist={}, ContainerKey=flags.LArSCDump.digitsKey, # from LArDigits2Ntuple
FillLB=args.evtree,
OutputLevel=args.olevel
))
@@ -141,7 +140,7 @@ if __name__=='__main__':
# some logging
log.info("Input files to be processed:")
- for f in ConfigFlags.Input.Files:
+ for f in flags.Input.Files:
log.info(f)
log.info("Output file: ")
log.info(args.outfile)
diff --git a/LArCalorimeter/LArMonitoring/python/LArAffectedRegionsAlg.py b/LArCalorimeter/LArMonitoring/python/LArAffectedRegionsAlg.py
index 67d834893312e9e5d237ae6276edef1cdadcfe44..920b8bcaefdc5168056452823dfa525c0d4f9e00 100644
--- a/LArCalorimeter/LArMonitoring/python/LArAffectedRegionsAlg.py
+++ b/LArCalorimeter/LArMonitoring/python/LArAffectedRegionsAlg.py
@@ -1,30 +1,30 @@
#
-# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
#
-def LArAffectedRegionsConfigOld(inputFlags):
+def LArAffectedRegionsConfigOld(flags):
from AthenaMonitoring.AthMonitorCfgHelper import AthMonitorCfgHelperOld
from LArMonitoring.LArMonitoringConf import LArAffectedRegionsAlg
- helper = AthMonitorCfgHelperOld(inputFlags,'LArAffectedRegionsAlgOldCfg')
- LArAffectedRegionsConfigCore(helper, LArAffectedRegionsAlg, inputFlags)
+ helper = AthMonitorCfgHelperOld(flags,'LArAffectedRegionsAlgOldCfg')
+ LArAffectedRegionsConfigCore(helper, LArAffectedRegionsAlg, flags)
return helper.result()
-def LArAffectedRegionsConfig(inputFlags):
+def LArAffectedRegionsConfig(flags):
'''Function to configures some algorithms in the monitoring system.'''
from AthenaMonitoring import AthMonitorCfgHelper
- helper = AthMonitorCfgHelper(inputFlags,'LArAffectedRegionsAlgCfg')
+ helper = AthMonitorCfgHelper(flags,'LArAffectedRegionsAlgCfg')
from AthenaConfiguration.ComponentFactory import CompFactory
- LArAffectedRegionsConfigCore(helper, CompFactory.LArAffectedRegionsAlg, inputFlags)
+ LArAffectedRegionsConfigCore(helper, CompFactory.LArAffectedRegionsAlg, flags)
return helper.result()
-def LArAffectedRegionsConfigCore(helper, algoinstance, inputFlags):
+def LArAffectedRegionsConfigCore(helper, algoinstance, flags):
larAffectedRegAlg = helper.addAlgorithm(algoinstance,'larAffectedRegAlg')
@@ -37,7 +37,7 @@ def LArAffectedRegionsConfigCore(helper, algoinstance, inputFlags):
isOnline=False
from AthenaConfiguration.ComponentFactory import isComponentAccumulatorCfg
if isComponentAccumulatorCfg():
- if inputFlags.DQ.Environment == 'online':
+ if flags.DQ.Environment == 'online':
isOnline=True
else:
from AthenaCommon.AthenaCommonFlags import athenaCommonFlags
@@ -379,27 +379,26 @@ def LArAffectedRegionsConfigCore(helper, algoinstance, inputFlags):
if __name__=='__main__':
# Set the Athena configuration flags
- from AthenaConfiguration.AllConfigFlags import ConfigFlags
- from LArMonitoring.LArMonConfigFlags import createLArMonConfigFlags
- createLArMonConfigFlags()
+ from AthenaConfiguration.AllConfigFlags import initConfigFlags
+ flags = initConfigFlags()
from AthenaConfiguration.TestDefaults import defaultTestFiles
- ConfigFlags.Input.Files = defaultTestFiles.RAW_RUN2
+ flags.Input.Files = defaultTestFiles.RAW_RUN2
- ConfigFlags.Output.HISTFileName = 'LArAffectedRegionsOutput.root'
- ConfigFlags.DQ.enableLumiAccess = False
- ConfigFlags.DQ.useTrigger = False
- ConfigFlags.lock()
+ flags.Output.HISTFileName = 'LArAffectedRegionsOutput.root'
+ flags.DQ.enableLumiAccess = False
+ flags.DQ.useTrigger = False
+ flags.lock()
from CaloRec.CaloRecoConfig import CaloRecoCfg
- cfg=CaloRecoCfg(ConfigFlags)
+ cfg=CaloRecoCfg(flags)
#add affected regions
- affregmon = LArAffectedRegionsConfig(ConfigFlags)
+ affregmon = LArAffectedRegionsConfig(flags)
cfg.merge(affregmon)
- ConfigFlags.dump()
+ flags.dump()
f=open("AffectedRegionsMonMaker.pkl","wb")
cfg.store(f)
f.close()
diff --git a/LArCalorimeter/LArMonitoring/python/LArCalibDelayMonAlg.py b/LArCalorimeter/LArMonitoring/python/LArCalibDelayMonAlg.py
index aafee2872192f8dfd7a55f9d46da620c6694d63c..521aed90ab910e7933d2ee73dfca9bfe6110bf77 100644
--- a/LArCalorimeter/LArMonitoring/python/LArCalibDelayMonAlg.py
+++ b/LArCalorimeter/LArMonitoring/python/LArCalibDelayMonAlg.py
@@ -1,28 +1,28 @@
#
-# Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
#
-def LArCalibDelayMonConfig(inputFlags,gain="",doAccDigit=False,doCalibDigit=False,doAccCalibDigit=False):
+def LArCalibDelayMonConfig(flags,gain="",doAccDigit=False,doCalibDigit=False,doAccCalibDigit=False):
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from AthenaMonitoring import AthMonitorCfgHelper
- helper = AthMonitorCfgHelper(inputFlags,'LArCalibDelayMonCfg')
+ helper = AthMonitorCfgHelper(flags,'LArCalibDelayMonCfg')
from AthenaConfiguration.ComponentFactory import CompFactory
- LArCalibDelayMonConfigCore(helper,CompFactory.LArCalibDelayMonAlg,inputFlags,gain,doAccDigit,doCalibDigit,doAccCalibDigit)
+ LArCalibDelayMonConfigCore(helper,CompFactory.LArCalibDelayMonAlg,flags,gain,doAccDigit,doCalibDigit,doAccCalibDigit)
rv = ComponentAccumulator()
# adding LAr*Mapping algos
from LArCabling.LArCablingConfig import LArFebRodMappingCfg, LArCalibIdMappingCfg
- rv.merge(LArFebRodMappingCfg(inputFlags))
- rv.merge(LArCalibIdMappingCfg(inputFlags))
+ rv.merge(LArFebRodMappingCfg(flags))
+ rv.merge(LArCalibIdMappingCfg(flags))
rv.merge(helper.result())
return rv
-def LArCalibDelayMonConfigCore(helper,algoinstance,inputFlags,gain="",doAccDigit=False,doCalibDigit=False,doAccCalibDigit=False):
+def LArCalibDelayMonConfigCore(helper,algoinstance,flags,gain="",doAccDigit=False,doCalibDigit=False,doAccCalibDigit=False):
from LArMonitoring.GlobalVariables import lArDQGlobals
@@ -135,19 +135,18 @@ def LArCalibDelayMonConfigCore(helper,algoinstance,inputFlags,gain="",doAccDigit
if __name__=='__main__':
- from AthenaConfiguration.AllConfigFlags import ConfigFlags
+ from AthenaConfiguration.AllConfigFlags import initConfigFlags
from AthenaCommon.Logging import log
from AthenaCommon.Constants import DEBUG
log.setLevel(DEBUG)
from AthenaMonitoring.DQConfigFlags import DQDataType
- from LArMonitoring.LArMonConfigFlags import createLArMonConfigFlags
- createLArMonConfigFlags()
type_run="Delay"
run="00404654"
part="HecFcal"
- ConfigFlags.Input.Files = [
+ flags = initConfigFlags()
+ flags.Input.Files = [
"/eos/atlas/atlastier0/rucio/data21_calib/calibration_LArElec-Delay-32s-High-HecFcal/00404654/data21_calib.00404654.calibration_LArElec-Delay-32s-High-HecFcal.daq.RAW/data21_calib.00404654.calibration_LArElec-Delay-32s-High-HecFcal.daq.RAW._lb0000._SFO-1._0001.data",
"/eos/atlas/atlastier0/rucio/data21_calib/calibration_LArElec-Delay-32s-High-HecFcal/00404654/data21_calib.00404654.calibration_LArElec-Delay-32s-High-HecFcal.daq.RAW/data21_calib.00404654.calibration_LArElec-Delay-32s-High-HecFcal.daq.RAW._lb0000._SFO-2._0001.data",
@@ -155,34 +154,34 @@ if __name__=='__main__':
"/eos/atlas/atlastier0/rucio/data21_calib/calibration_LArElec-Delay-32s-High-HecFcal/00404654/data21_calib.00404654.calibration_LArElec-Delay-32s-High-HecFcal.daq.RAW/data21_calib.00404654.calibration_LArElec-Delay-32s-High-HecFcal.daq.RAW._lb0000._SFO-3._0001.data",
"/eos/atlas/atlastier0/rucio/data21_calib/calibration_LArElec-Delay-32s-High-HecFcal/00404654/data21_calib.00404654.calibration_LArElec-Delay-32s-High-HecFcal.daq.RAW/data21_calib.00404654.calibration_LArElec-Delay-32s-High-HecFcal.daq.RAW._lb0000._SFO-4._0001.data"]
- ConfigFlags.Output.HISTFileName = 'LArCalib'+type_run+'MonOutput_'+run+'-'+part+'.root'
- ConfigFlags.DQ.enableLumiAccess = False
- ConfigFlags.Input.isMC = False
- ConfigFlags.DQ.useTrigger = False
- ConfigFlags.LAr.doAlign=False
+ flags.Output.HISTFileName = 'LArCalib'+type_run+'MonOutput_'+run+'-'+part+'.root'
+ flags.DQ.enableLumiAccess = False
+ flags.Input.isMC = False
+ flags.DQ.useTrigger = False
+ flags.LAr.doAlign=False
from AthenaConfiguration.Enums import BeamType
- ConfigFlags.Beam.Type = BeamType.Collisions
- ConfigFlags.DQ.DataType = DQDataType.Collisions
+ flags.Beam.Type = BeamType.Collisions
+ flags.DQ.DataType = DQDataType.Collisions
from AthenaConfiguration.TestDefaults import defaultGeometryTags
- ConfigFlags.GeoModel.AtlasVersion=defaultGeometryTags.RUN2
- ConfigFlags.Detector.GeometryCSC=False
- ConfigFlags.Detector.GeometrysTGC=False
- ConfigFlags.Detector.GeometryMM=False
- ConfigFlags.Exec.OutputLevel=DEBUG
- ConfigFlags.lock()
+ flags.GeoModel.AtlasVersion=defaultGeometryTags.RUN2
+ flags.Detector.GeometryCSC=False
+ flags.Detector.GeometrysTGC=False
+ flags.Detector.GeometryMM=False
+ flags.Exec.OutputLevel=DEBUG
+ flags.lock()
# Initialize configuration object, add accumulator, merge, and run.
from AthenaConfiguration.MainServicesConfig import MainServicesCfg
- cfg = MainServicesCfg(ConfigFlags)
+ cfg = MainServicesCfg(flags)
from LArByteStream.LArRawCalibDataReadingConfig import LArRawCalibDataReadingCfg
- cfg.merge(LArRawCalibDataReadingCfg(ConfigFlags,gain="HIGH",doAccCalibDigit=True))
+ cfg.merge(LArRawCalibDataReadingCfg(flags,gain="HIGH",doAccCalibDigit=True))
- cfg.merge(LArCalibDelayMonConfig(ConfigFlags, gain="HIGH",doAccCalibDigit=True))
+ cfg.merge(LArCalibDelayMonConfig(flags, gain="HIGH",doAccCalibDigit=True))
cfg.printConfig(withDetails=False) #set True for exhaustive info
- ConfigFlags.dump()
+ flags.dump()
f=open("LArCalibDelayMon_"+run+".pkl","wb")
cfg.store(f)
f.close()
diff --git a/LArCalorimeter/LArMonitoring/python/LArCalibPedMonAlg.py b/LArCalorimeter/LArMonitoring/python/LArCalibPedMonAlg.py
index 26113e1526357b58ca91e5e86a35646834a0434c..f98e7f425884dfbb3a00db632f10756b942de9e5 100644
--- a/LArCalorimeter/LArMonitoring/python/LArCalibPedMonAlg.py
+++ b/LArCalorimeter/LArMonitoring/python/LArCalibPedMonAlg.py
@@ -1,32 +1,32 @@
#
-# Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
#
-def LArCalibPedMonConfig(inputFlags,gain="",doAccDigit=False,doCalibDigit=False,doAccCalibDigit=False):
+def LArCalibPedMonConfig(flags,gain="",doAccDigit=False,doCalibDigit=False,doAccCalibDigit=False):
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from AthenaMonitoring import AthMonitorCfgHelper
- helper = AthMonitorCfgHelper(inputFlags,'LArCalibPedMonCfg')
+ helper = AthMonitorCfgHelper(flags,'LArCalibPedMonCfg')
from AthenaConfiguration.ComponentFactory import CompFactory
- LArCalibPedMonConfigCore(helper,CompFactory.LArCalibPedMonAlg,inputFlags,gain,doAccDigit,doCalibDigit,doAccCalibDigit)
+ LArCalibPedMonConfigCore(helper,CompFactory.LArCalibPedMonAlg,flags,gain,doAccDigit,doCalibDigit,doAccCalibDigit)
rv = ComponentAccumulator()
# adding LAr*Mapping algos
from LArCabling.LArCablingConfig import LArFebRodMappingCfg, LArCalibIdMappingCfg
- rv.merge(LArFebRodMappingCfg(inputFlags))
- rv.merge(LArCalibIdMappingCfg(inputFlags))
+ rv.merge(LArFebRodMappingCfg(flags))
+ rv.merge(LArCalibIdMappingCfg(flags))
# adding LArFebErrorSummary algo
from LArROD.LArFebErrorSummaryMakerConfig import LArFebErrorSummaryMakerCfg
- rv.merge(LArFebErrorSummaryMakerCfg(inputFlags))
+ rv.merge(LArFebErrorSummaryMakerCfg(flags))
rv.merge(helper.result())
return rv
-def LArCalibPedMonConfigCore(helper,algoinstance,inputFlags,gain="",doAccDigit=False,doCalibDigit=False,doAccCalibDigit=False):
+def LArCalibPedMonConfigCore(helper,algoinstance,flags,gain="",doAccDigit=False,doCalibDigit=False,doAccCalibDigit=False):
from LArMonitoring.GlobalVariables import lArDQGlobals
@@ -129,50 +129,49 @@ def LArCalibPedMonConfigCore(helper,algoinstance,inputFlags,gain="",doAccDigit=F
if __name__=='__main__':
- from AthenaConfiguration.AllConfigFlags import ConfigFlags
+ from AthenaConfiguration.AllConfigFlags import initConfigFlags
from AthenaCommon.Logging import log
from AthenaCommon.Constants import DEBUG
log.setLevel(DEBUG)
from AthenaMonitoring.DQConfigFlags import DQDataType
- from LArMonitoring.LArMonConfigFlags import createLArMonConfigFlags
- createLArMonConfigFlags()
run="00404637"
- ConfigFlags.Input.Files = [
+ flags = initConfigFlags()
+ flags.Input.Files = [
"/eos/atlas/atlastier0/rucio/data21_calib/calibration_LArElec-Pedestal-32s-High-All/00404637/data21_calib.00404637.calibration_LArElec-Pedestal-32s-High-All.daq.RAW/data21_calib.00404637.calibration_LArElec-Pedestal-32s-High-All.daq.RAW._lb0000._SFO-1._0001.data",
"/eos/atlas/atlastier0/rucio/data21_calib/calibration_LArElec-Pedestal-32s-High-All/00404637/data21_calib.00404637.calibration_LArElec-Pedestal-32s-High-All.daq.RAW/data21_calib.00404637.calibration_LArElec-Pedestal-32s-High-All.daq.RAW._lb0000._SFO-2._0001.data",
"/eos/atlas/atlastier0/rucio/data21_calib/calibration_LArElec-Pedestal-32s-High-All/00404637/data21_calib.00404637.calibration_LArElec-Pedestal-32s-High-All.daq.RAW/data21_calib.00404637.calibration_LArElec-Pedestal-32s-High-All.daq.RAW._lb0000._SFO-3._0001.data",
"/eos/atlas/atlastier0/rucio/data21_calib/calibration_LArElec-Pedestal-32s-High-All/00404637/data21_calib.00404637.calibration_LArElec-Pedestal-32s-High-All.daq.RAW/data21_calib.00404637.calibration_LArElec-Pedestal-32s-High-All.daq.RAW._lb0000._SFO-4._0001.data"]
- ConfigFlags.Output.HISTFileName = 'LArCalibPedMonOutput_'+run+'.root'
+ flags.Output.HISTFileName = 'LArCalibPedMonOutput_'+run+'.root'
- ConfigFlags.DQ.enableLumiAccess = False
- ConfigFlags.Input.isMC = False
- ConfigFlags.DQ.useTrigger = False
- ConfigFlags.LAr.doAlign=False
+ flags.DQ.enableLumiAccess = False
+ flags.Input.isMC = False
+ flags.DQ.useTrigger = False
+ flags.LAr.doAlign=False
from AthenaConfiguration.Enums import BeamType
- ConfigFlags.Beam.Type = BeamType.Collisions
- ConfigFlags.DQ.DataType = DQDataType.Collisions
+ flags.Beam.Type = BeamType.Collisions
+ flags.DQ.DataType = DQDataType.Collisions
from AthenaConfiguration.TestDefaults import defaultGeometryTags
- ConfigFlags.GeoModel.AtlasVersion=defaultGeometryTags.RUN2
- ConfigFlags.Detector.GeometryCSC=False
- ConfigFlags.Detector.GeometrysTGC=False
- ConfigFlags.Detector.GeometryMM=False
- ConfigFlags.Exec.OutputLevel=DEBUG
- ConfigFlags.lock()
+ flags.GeoModel.AtlasVersion=defaultGeometryTags.RUN2
+ flags.Detector.GeometryCSC=False
+ flags.Detector.GeometrysTGC=False
+ flags.Detector.GeometryMM=False
+ flags.Exec.OutputLevel=DEBUG
+ flags.lock()
# Initialize configuration object, add accumulator, merge, and run.
from AthenaConfiguration.MainServicesConfig import MainServicesCfg
- cfg = MainServicesCfg(ConfigFlags)
+ cfg = MainServicesCfg(flags)
from LArByteStream.LArRawCalibDataReadingConfig import LArRawCalibDataReadingCfg
- cfg.merge(LArRawCalibDataReadingCfg(ConfigFlags,gain="HIGH",doAccDigit=True))
+ cfg.merge(LArRawCalibDataReadingCfg(flags,gain="HIGH",doAccDigit=True))
- cfg.merge(LArCalibPedMonConfig(ConfigFlags, gain="HIGH",doAccDigit=True))
+ cfg.merge(LArCalibPedMonConfig(flags, gain="HIGH",doAccDigit=True))
cfg.printConfig(withDetails=False) #set True for exhaustive info
- ConfigFlags.dump()
+ flags.dump()
f=open("LArCalibPedMon_"+run+".pkl","wb")
cfg.store(f)
f.close()
diff --git a/LArCalorimeter/LArMonitoring/python/LArCoherentNoisefractionAlg.py b/LArCalorimeter/LArMonitoring/python/LArCoherentNoisefractionAlg.py
index 69e7f6b130e556240ed46dabb11dc6e7cab1d295..79a7cac27981f2a7c064d017d890fc4d02746777 100644
--- a/LArCalorimeter/LArMonitoring/python/LArCoherentNoisefractionAlg.py
+++ b/LArCalorimeter/LArMonitoring/python/LArCoherentNoisefractionAlg.py
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
#
'''@file LArCoherentNoisefractionAlg
@author P. Strizenec
@@ -8,24 +8,24 @@
'''
-def LArCoherentNoisefractionConfigOld(inputFlags, febsToMonitor=[], groupsToMonitor=[], isCalib=True):
+def LArCoherentNoisefractionConfigOld(flags, febsToMonitor=[], groupsToMonitor=[], isCalib=True):
from AthenaMonitoring.AthMonitorCfgHelper import AthMonitorCfgHelperOld
from LArMonitoring.LArMonitoringConf import LArCoherentNoisefractionMonAlg
- helper = AthMonitorCfgHelperOld(inputFlags, 'LArCoherentNoisefractionMonAlgCfg')
- LArCoherentNoisefractionConfigCore(helper, LArCoherentNoisefractionMonAlg,inputFlags,febsToMonitor,groupsToMonitor,isCalib)
+ helper = AthMonitorCfgHelperOld(flags, 'LArCoherentNoisefractionMonAlgCfg')
+ LArCoherentNoisefractionConfigCore(helper, LArCoherentNoisefractionMonAlg,flags,febsToMonitor,groupsToMonitor,isCalib)
return helper.result()
-def LArCoherentNoisefractionConfig(inputFlags,febsToMonitor=[], groupsToMonitor=[], isCalib=True):
+def LArCoherentNoisefractionConfig(flags,febsToMonitor=[], groupsToMonitor=[], isCalib=True):
from AthenaMonitoring.AthMonitorCfgHelper import AthMonitorCfgHelper
- helper = AthMonitorCfgHelper(inputFlags,'LArCoherentNoisefractionMonAlgCfg')
+ helper = AthMonitorCfgHelper(flags,'LArCoherentNoisefractionMonAlgCfg')
from AthenaConfiguration.ComponentFactory import CompFactory
- return LArCoherentNoisefractionConfigCore(helper, CompFactory.LArCoherentNoisefractionMonAlg,inputFlags,febsToMonitor,groupsToMonitor,isCalib)
+ return LArCoherentNoisefractionConfigCore(helper, CompFactory.LArCoherentNoisefractionMonAlg,flags,febsToMonitor,groupsToMonitor,isCalib)
-def LArCoherentNoisefractionConfigCore(helper, algoinstance, inputFlags, febsToMonitor, groupsToMonitor, isCalib):
+def LArCoherentNoisefractionConfigCore(helper, algoinstance, flags, febsToMonitor, groupsToMonitor, isCalib):
from LArMonitoring.GlobalVariables import lArDQGlobals
@@ -179,36 +179,33 @@ def LArCoherentNoisefractionConfigCore(helper, algoinstance, inputFlags, febsToM
if __name__=='__main__':
- from AthenaConfiguration.AllConfigFlags import ConfigFlags
+ from AthenaConfiguration.AllConfigFlags import initConfigFlags
from AthenaCommon.Logging import log
from AthenaCommon.Constants import DEBUG
log.setLevel(DEBUG)
-
- from LArMonitoring.LArMonConfigFlags import createLArMonConfigFlags
- createLArMonConfigFlags()
-
#from AthenaConfiguration.TestDefaults import defaultTestFiles
- ConfigFlags.Input.Files = ['/eos/atlas/atlastier0/rucio/data21_calib/calibration_LArElec-Pedestal-5s-High-Emec-A-RawData/00393063/data21_calib.00393063.calibration_LArElec-Pedestal-5s-High-Emec-A-RawData.daq.RAW/data21_calib.00393063.calibration_LArElec-Pedestal-5s-High-Emec-A-RawData.daq.RAW._lb0000._SFO-1._0001.data','/eos/atlas/atlastier0/rucio/data21_calib/calibration_LArElec-Pedestal-5s-High-Emec-A-RawData/00393063/data21_calib.00393063.calibration_LArElec-Pedestal-5s-High-Emec-A-RawData.daq.RAW/data21_calib.00393063.calibration_LArElec-Pedestal-5s-High-Emec-A-RawData.daq.RAW._lb0000._SFO-2._0001.data','/eos/atlas/atlastier0/rucio/data21_calib/calibration_LArElec-Pedestal-5s-High-Emec-A-RawData/00393063/data21_calib.00393063.calibration_LArElec-Pedestal-5s-High-Emec-A-RawData.daq.RAW/data21_calib.00393063.calibration_LArElec-Pedestal-5s-High-Emec-A-RawData.daq.RAW._lb0000._SFO-3._0001.data','/eos/atlas/atlastier0/rucio/data21_calib/calibration_LArElec-Pedestal-5s-High-Emec-A-RawData/00393063/data21_calib.00393063.calibration_LArElec-Pedestal-5s-High-Emec-A-RawData.daq.RAW/data21_calib.00393063.calibration_LArElec-Pedestal-5s-High-Emec-A-RawData.daq.RAW._lb0000._SFO-4._0001.data']
+ flags = initConfigFlags()
+ flags.Input.Files = ['/eos/atlas/atlastier0/rucio/data21_calib/calibration_LArElec-Pedestal-5s-High-Emec-A-RawData/00393063/data21_calib.00393063.calibration_LArElec-Pedestal-5s-High-Emec-A-RawData.daq.RAW/data21_calib.00393063.calibration_LArElec-Pedestal-5s-High-Emec-A-RawData.daq.RAW._lb0000._SFO-1._0001.data','/eos/atlas/atlastier0/rucio/data21_calib/calibration_LArElec-Pedestal-5s-High-Emec-A-RawData/00393063/data21_calib.00393063.calibration_LArElec-Pedestal-5s-High-Emec-A-RawData.daq.RAW/data21_calib.00393063.calibration_LArElec-Pedestal-5s-High-Emec-A-RawData.daq.RAW._lb0000._SFO-2._0001.data','/eos/atlas/atlastier0/rucio/data21_calib/calibration_LArElec-Pedestal-5s-High-Emec-A-RawData/00393063/data21_calib.00393063.calibration_LArElec-Pedestal-5s-High-Emec-A-RawData.daq.RAW/data21_calib.00393063.calibration_LArElec-Pedestal-5s-High-Emec-A-RawData.daq.RAW._lb0000._SFO-3._0001.data','/eos/atlas/atlastier0/rucio/data21_calib/calibration_LArElec-Pedestal-5s-High-Emec-A-RawData/00393063/data21_calib.00393063.calibration_LArElec-Pedestal-5s-High-Emec-A-RawData.daq.RAW/data21_calib.00393063.calibration_LArElec-Pedestal-5s-High-Emec-A-RawData.daq.RAW._lb0000._SFO-4._0001.data']
- ConfigFlags.Output.HISTFileName = 'LArCNFMonOutput.root'
- ConfigFlags.DQ.enableLumiAccess = False
- ConfigFlags.DQ.useTrigger = False
+ flags.Output.HISTFileName = 'LArCNFMonOutput.root'
+ flags.DQ.enableLumiAccess = False
+ flags.DQ.useTrigger = False
from AthenaConfiguration.Enums import BeamType
- ConfigFlags.Beam.Type = BeamType.Collisions
- ConfigFlags.lock()
+ flags.Beam.Type = BeamType.Collisions
+ flags.lock()
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
cfg=ComponentAccumulator()
from LArByteStream.LArRawDataReadingConfig import LArRawDataReadingCfg
- cfg.merge(LArRawDataReadingCfg(ConfigFlags,LArDigitKey="HIGH",LArRawChannelKey=""))
+ cfg.merge(LArRawDataReadingCfg(flags,LArDigitKey="HIGH",LArRawChannelKey=""))
# for calib digits:
#from LArByteStream.LArRawCalibDataReadingConfig import LArRawCalibDataReadingCfg
- #cfg.merge(LArRawCalibDataReadingCfg(ConfigFlags,gain="HIGH",doCalibDigit=True))
+ #cfg.merge(LArRawCalibDataReadingCfg(flags,gain="HIGH",doCalibDigit=True))
from LArCabling.LArCablingConfig import LArOnOffIdMappingCfg
- cfg.merge(LArOnOffIdMappingCfg(ConfigFlags))
+ cfg.merge(LArOnOffIdMappingCfg(flags))
from LArConfiguration.LArElecCalibDBConfig import LArElecCalibDBCfg
- cfg.merge(LArElecCalibDBCfg(ConfigFlags,["Pedestal"]))
+ cfg.merge(LArElecCalibDBCfg(flags,["Pedestal"]))
feblist=[]
for ft in [11,12,23,24]:
@@ -217,13 +214,13 @@ if __name__=='__main__':
feblist += ['EndcapAft'+str(ft)+'slot0'+str(slot)]
else:
feblist += ['EndcapAft'+str(ft)+'slot'+str(slot)]
- aff_acc = LArCoherentNoisefractionConfig(ConfigFlags,feblist)
+ aff_acc = LArCoherentNoisefractionConfig(flags,feblist)
cfg.merge(aff_acc)
cfg.printConfig()
log.setLevel(DEBUG)
- ConfigFlags.dump()
+ flags.dump()
f=open("LArCNFMon.pkl","wb")
cfg.store(f)
f.close()
diff --git a/LArCalorimeter/LArMonitoring/python/LArCosmicsMonAlg.py b/LArCalorimeter/LArMonitoring/python/LArCosmicsMonAlg.py
index 24779aac18aa6cded58381a3b4d39123e9a24313..0dd7511cfe344201a207e533e3f1aba3270390b9 100644
--- a/LArCalorimeter/LArMonitoring/python/LArCosmicsMonAlg.py
+++ b/LArCalorimeter/LArMonitoring/python/LArCosmicsMonAlg.py
@@ -1,33 +1,33 @@
#
-# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
#
-def LArCosmicsMonConfigOld(inputFlags):
+def LArCosmicsMonConfigOld(flags):
from AthenaMonitoring.AthMonitorCfgHelper import AthMonitorCfgHelperOld
from LArMonitoring.LArMonitoringConf import LArCosmicsMonAlg
- helper = AthMonitorCfgHelperOld(inputFlags, 'LArCosmicsMonAlgOldCfg')
- LArCosmicsMonConfigCore(helper, LArCosmicsMonAlg,inputFlags)
+ helper = AthMonitorCfgHelperOld(flags, 'LArCosmicsMonAlgOldCfg')
+ LArCosmicsMonConfigCore(helper, LArCosmicsMonAlg,flags)
return helper.result()
-def LArCosmicsMonConfig(inputFlags):
+def LArCosmicsMonConfig(flags):
'''Function to configures some algorithms in the monitoring system.'''
# The following class will make a sequence, configure algorithms, and link
# them to GenericMonitoringTools
from AthenaMonitoring.AthMonitorCfgHelper import AthMonitorCfgHelper
- helper = AthMonitorCfgHelper(inputFlags,'LArCosmicsMonAlgCfg')
+ helper = AthMonitorCfgHelper(flags,'LArCosmicsMonAlgCfg')
from AthenaConfiguration.ComponentFactory import CompFactory
- LArCosmicsMonConfigCore(helper, CompFactory.LArCosmicsMonAlg,inputFlags)
+ LArCosmicsMonConfigCore(helper, CompFactory.LArCosmicsMonAlg,flags)
return helper.result()
-def LArCosmicsMonConfigCore(helper, algoinstance,inputFlags):
+def LArCosmicsMonConfigCore(helper, algoinstance,flags):
from LArMonitoring.GlobalVariables import lArDQGlobals
@@ -81,33 +81,30 @@ def LArCosmicsMonConfigCore(helper, algoinstance,inputFlags):
if __name__=='__main__':
- from AthenaConfiguration.AllConfigFlags import ConfigFlags
+ from AthenaConfiguration.AllConfigFlags import initConfigFlags
from AthenaCommon.Logging import log
from AthenaCommon.Constants import WARNING
log.setLevel(WARNING)
-
- from LArMonitoring.LArMonConfigFlags import createLArMonConfigFlags
- createLArMonConfigFlags()
-
from AthenaConfiguration.TestDefaults import defaultTestFiles
- ConfigFlags.Input.Files = defaultTestFiles.RAW_RUN2
+ flags = initConfigFlags()
+ flags.Input.Files = defaultTestFiles.RAW_RUN2
- ConfigFlags.Output.HISTFileName = 'LArCosmicsMonOutput.root'
- ConfigFlags.DQ.enableLumiAccess = False
- ConfigFlags.DQ.useTrigger = False
- ConfigFlags.lock()
+ flags.Output.HISTFileName = 'LArCosmicsMonOutput.root'
+ flags.DQ.enableLumiAccess = False
+ flags.DQ.useTrigger = False
+ flags.lock()
from CaloRec.CaloRecoConfig import CaloRecoCfg
- cfg=CaloRecoCfg(ConfigFlags)
+ cfg=CaloRecoCfg(flags)
from LArCellRec.LArNoisyROSummaryConfig import LArNoisyROSummaryCfg
- cfg.merge(LArNoisyROSummaryCfg(ConfigFlags))
+ cfg.merge(LArNoisyROSummaryCfg(flags))
- cosm_acc = LArCosmicsMonConfig(ConfigFlags)
+ cosm_acc = LArCosmicsMonConfig(flags)
cfg.merge(cosm_acc)
- ConfigFlags.dump()
+ flags.dump()
f=open("LArCosmicsMon.pkl","wb")
cfg.store(f)
f.close()
diff --git a/LArCalorimeter/LArMonitoring/python/LArCoverageAlg.py b/LArCalorimeter/LArMonitoring/python/LArCoverageAlg.py
index 6b8fff0eea3dbb1c0219e5f42cea57e09128069d..86fddf36b78b4c24da61fe930c5adfca53040bdf 100644
--- a/LArCalorimeter/LArMonitoring/python/LArCoverageAlg.py
+++ b/LArCalorimeter/LArMonitoring/python/LArCoverageAlg.py
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
#
'''@file LArCoverageAlg
@@ -513,25 +513,24 @@ def LArCoverageConfigCore(helper, algoinstance,flags):
if __name__=='__main__':
# Set the Athena configuration flags
- from AthenaConfiguration.AllConfigFlags import ConfigFlags
- from LArMonitoring.LArMonConfigFlags import createLArMonConfigFlags
- createLArMonConfigFlags()
+ from AthenaConfiguration.AllConfigFlags import initConfigFlags
from AthenaConfiguration.TestDefaults import defaultTestFiles
- ConfigFlags.Input.Files = defaultTestFiles.RAW_RUN2
- ConfigFlags.DQ.useTrigger = False
+ flags = initConfigFlags()
+ flags.Input.Files = defaultTestFiles.RAW_RUN2
+ flags.DQ.useTrigger = False
- ConfigFlags.Output.HISTFileName = 'LArCoverageOutput.root'
- ConfigFlags.lock()
+ flags.Output.HISTFileName = 'LArCoverageOutput.root'
+ flags.lock()
# Cell building
from CaloRec.CaloRecoConfig import CaloRecoCfg
- cfg=CaloRecoCfg(ConfigFlags)
+ cfg=CaloRecoCfg(flags)
- larCoverageAcc = LArCoverageConfig(ConfigFlags)
+ larCoverageAcc = LArCoverageConfig(flags)
cfg.merge(larCoverageAcc)
- ConfigFlags.dump()
+ flags.dump()
f=open("CoverageMaker.pkl","wb")
cfg.store(f)
f.close()
diff --git a/LArCalorimeter/LArMonitoring/python/LArDigitMonAlg.py b/LArCalorimeter/LArMonitoring/python/LArDigitMonAlg.py
index 3208ae9b4734353cf109bc1a76a94cf899d0a2aa..2da5ae0b6aaa71f58344c66bd949aaa0d67f4745 100644
--- a/LArCalorimeter/LArMonitoring/python/LArDigitMonAlg.py
+++ b/LArCalorimeter/LArMonitoring/python/LArDigitMonAlg.py
@@ -1,28 +1,28 @@
#
-# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
#
-def LArDigitMonConfigOld(inputFlags):
+def LArDigitMonConfigOld(flags):
from AthenaMonitoring.AthMonitorCfgHelper import AthMonitorCfgHelperOld
from LArMonitoring.LArMonitoringConf import LArDigitMonAlg
- helper = AthMonitorCfgHelperOld(inputFlags, 'LArDigitMonAlgCfg')
- LArDigitMonConfigCore(helper, LArDigitMonAlg,inputFlags)
+ helper = AthMonitorCfgHelperOld(flags, 'LArDigitMonAlgCfg')
+ LArDigitMonConfigCore(helper, LArDigitMonAlg,flags)
return helper.result()
-def LArDigitMonConfig(inputFlags):
+def LArDigitMonConfig(flags):
'''Function to configures some algorithms in the monitoring system.'''
# The following class will make a sequence, configure algorithms, and link
# them to GenericMonitoringTools
from AthenaMonitoring.AthMonitorCfgHelper import AthMonitorCfgHelper
- helper = AthMonitorCfgHelper(inputFlags,'LArDigitMonAlgCfg')
+ helper = AthMonitorCfgHelper(flags,'LArDigitMonAlgCfg')
from AthenaConfiguration.ComponentFactory import CompFactory
- return LArDigitMonConfigCore(helper, CompFactory.LArDigitMonAlg,inputFlags)
+ return LArDigitMonConfigCore(helper, CompFactory.LArDigitMonAlg,flags)
-def LArDigitMonConfigCore(helper, algoinstance,inputFlags):
+def LArDigitMonConfigCore(helper, algoinstance,flags):
from LArMonitoring.GlobalVariables import lArDQGlobals
@@ -192,34 +192,31 @@ def LArDigitMonConfigCore(helper, algoinstance,inputFlags):
if __name__=='__main__':
- from AthenaConfiguration.AllConfigFlags import ConfigFlags
+ from AthenaConfiguration.AllConfigFlags import initConfigFlags
from AthenaCommon.Logging import log
from AthenaCommon.Constants import DEBUG
log.setLevel(DEBUG)
-
- from LArMonitoring.LArMonConfigFlags import createLArMonConfigFlags
- createLArMonConfigFlags()
-
from AthenaConfiguration.TestDefaults import defaultTestFiles
- ConfigFlags.Input.Files = defaultTestFiles.RAW_RUN2
+ flags = initConfigFlags()
+ flags.Input.Files = defaultTestFiles.RAW_RUN2
- ConfigFlags.Output.HISTFileName = 'LArDigitsMonOutput.root'
- ConfigFlags.DQ.enableLumiAccess = False
- ConfigFlags.DQ.useTrigger = False
- ConfigFlags.lock()
+ flags.Output.HISTFileName = 'LArDigitsMonOutput.root'
+ flags.DQ.enableLumiAccess = False
+ flags.DQ.useTrigger = False
+ flags.lock()
from CaloRec.CaloRecoConfig import CaloRecoCfg
- cfg=CaloRecoCfg(ConfigFlags)
+ cfg=CaloRecoCfg(flags)
from LArCellRec.LArNoisyROSummaryConfig import LArNoisyROSummaryCfg
- cfg.merge(LArNoisyROSummaryCfg(ConfigFlags))
+ cfg.merge(LArNoisyROSummaryCfg(flags))
# from LArMonitoring.LArDigitMonAlg import LArDigitMonConfig
- aff_acc = LArDigitMonConfig(ConfigFlags)
+ aff_acc = LArDigitMonConfig(flags)
cfg.merge(aff_acc)
- ConfigFlags.dump()
+ flags.dump()
f=open("LArDigitMon.pkl","wb")
cfg.store(f)
f.close()
diff --git a/LArCalorimeter/LArMonitoring/python/LArDigitalTriggMonAlg.py b/LArCalorimeter/LArMonitoring/python/LArDigitalTriggMonAlg.py
index e848c24991b02ad57a2e4c17358d7a294b83d640..8c66c0d880db90bc4d540fa264ad48c2e995a245 100644
--- a/LArCalorimeter/LArMonitoring/python/LArDigitalTriggMonAlg.py
+++ b/LArCalorimeter/LArMonitoring/python/LArDigitalTriggMonAlg.py
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
#
# Define some handy strings for plot labels
@@ -25,30 +25,30 @@ selStr["onlofflEmismatch"] = "for unmasked SCs which pass #tau selection where o
-def LArDigitalTriggMonConfig(inputFlags,larLATOMEBuilderAlg, nsamples=32, streamTypes=[]):
+def LArDigitalTriggMonConfig(flags,larLATOMEBuilderAlg, nsamples=32, streamTypes=[]):
'''Function to configures some algorithms in the monitoring system.'''
# The following class will make a sequence, configure algorithms, and link
# them to GenericMonitoringTools
from AthenaMonitoring.AthMonitorCfgHelper import AthMonitorCfgHelper
- helper = AthMonitorCfgHelper(inputFlags,'LArDigitalTriggMonAlgCfg')
+ helper = AthMonitorCfgHelper(flags,'LArDigitalTriggMonAlgCfg')
from LArMonitoring.GlobalVariables import lArDQGlobals
from AthenaCommon.Logging import logging
mlog = logging.getLogger( 'LArDigitalTriggMon' )
- if not inputFlags.DQ.enableLumiAccess:
+ if not flags.DQ.enableLumiAccess:
from LumiBlockComps.LuminosityCondAlgConfig import LuminosityCondAlgCfg
- helper.resobj.merge(LuminosityCondAlgCfg(inputFlags))
+ helper.resobj.merge(LuminosityCondAlgCfg(flags))
#get SC onl-offl mapping from DB
from LArCabling.LArCablingConfig import LArOnOffIdMappingSCCfg
- helper.resobj.merge(LArOnOffIdMappingSCCfg(inputFlags))
+ helper.resobj.merge(LArOnOffIdMappingSCCfg(flags))
# and elec. calib. coeffs
from LArConfiguration.LArElecCalibDBConfig import LArElecCalibDBSCCfg
- helper.resobj.merge(LArElecCalibDBSCCfg(inputFlags, condObjs=["Ramp","DAC2uA", "Pedestal", "uA2MeV", "MphysOverMcal", "OFC", "Shape", "HVScaleCorr"]))
+ helper.resobj.merge(LArElecCalibDBSCCfg(flags, condObjs=["Ramp","DAC2uA", "Pedestal", "uA2MeV", "MphysOverMcal", "OFC", "Shape", "HVScaleCorr"]))
diff --git a/LArCalorimeter/LArMonitoring/python/LArFEBMonAlg.py b/LArCalorimeter/LArMonitoring/python/LArFEBMonAlg.py
index a37d83887d9f860d88291f5efd69958655fed814..c2e8c6bd0f35e83f6ac193950fbdfbf398612d34 100644
--- a/LArCalorimeter/LArMonitoring/python/LArFEBMonAlg.py
+++ b/LArCalorimeter/LArMonitoring/python/LArFEBMonAlg.py
@@ -1,35 +1,35 @@
#
-# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
#
-def LArFEBMonConfigOld(inputFlags, cellDebug=False, dspDebug=False):
+def LArFEBMonConfigOld(flags, cellDebug=False, dspDebug=False):
from AthenaMonitoring import AthMonitorCfgHelperOld
from LArMonitoring.LArMonitoringConf import LArFEBMonAlg
- helper = AthMonitorCfgHelperOld(inputFlags, 'LArFEBMonAlgOldCfg')
- LArFEBMonConfigCore(helper, LArFEBMonAlg,inputFlags,cellDebug, dspDebug)
+ helper = AthMonitorCfgHelperOld(flags, 'LArFEBMonAlgOldCfg')
+ LArFEBMonConfigCore(helper, LArFEBMonAlg,flags,cellDebug, dspDebug)
return helper.result()
-def LArFEBMonConfig(inputFlags, cellDebug=False, dspDebug=False):
+def LArFEBMonConfig(flags, cellDebug=False, dspDebug=False):
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from AthenaMonitoring import AthMonitorCfgHelper
- helper = AthMonitorCfgHelper(inputFlags,'LArFEBMonAlgCfg')
+ helper = AthMonitorCfgHelper(flags,'LArFEBMonAlgCfg')
from AthenaConfiguration.ComponentFactory import CompFactory
- LArFEBMonConfigCore(helper, CompFactory.LArFEBMonAlg,inputFlags,cellDebug, dspDebug)
+ LArFEBMonConfigCore(helper, CompFactory.LArFEBMonAlg,flags,cellDebug, dspDebug)
rv = ComponentAccumulator()
# adding LArFebErrorSummary algo
from LArROD.LArFebErrorSummaryMakerConfig import LArFebErrorSummaryMakerCfg
- rv.merge(LArFebErrorSummaryMakerCfg(inputFlags))
+ rv.merge(LArFebErrorSummaryMakerCfg(flags))
rv.merge(helper.result())
return rv
-def LArFEBMonConfigCore(helper,algoinstance,inputFlags, cellDebug=False, dspDebug=False):
+def LArFEBMonConfigCore(helper,algoinstance,flags, cellDebug=False, dspDebug=False):
from LArMonitoring.GlobalVariables import lArDQGlobals
@@ -48,7 +48,7 @@ def LArFEBMonConfigCore(helper,algoinstance,inputFlags, cellDebug=False, dspDebu
isCOMP200=False
from AthenaConfiguration.ComponentFactory import isComponentAccumulatorCfg
if isComponentAccumulatorCfg():
- if "COMP200" in inputFlags.IOVDb.DatabaseInstance:
+ if "COMP200" in flags.IOVDb.DatabaseInstance:
isCOMP200=True
else:
from IOVDbSvc.CondDB import conddb
@@ -70,7 +70,7 @@ def LArFEBMonConfigCore(helper,algoinstance,inputFlags, cellDebug=False, dspDebu
pass
if not havethem:
from IOVDbSvc.IOVDbSvcConfig import IOVDbSvcCfg
- helper.resobj.merge(IOVDbSvcCfg(inputFlags))
+ helper.resobj.merge(IOVDbSvcCfg(flags))
condLoader=helper.resobj.getCondAlgo("CondInputLoader")
iovDbSvc=helper.resobj.getService("IOVDbSvc")
else:
@@ -89,7 +89,7 @@ def LArFEBMonConfigCore(helper,algoinstance,inputFlags, cellDebug=False, dspDebu
obj='LArDSPThresholdsComplete'
if isComponentAccumulatorCfg():
from IOVDbSvc.IOVDbSvcConfig import addFolders
- helper.resobj.merge(addFolders(inputFlags,fld,db,obj))
+ helper.resobj.merge(addFolders(flags,fld,db,obj))
else:
conddb.addFolder (db, fld, className=obj)
larFEBMonAlg.Run1DSPThresholdsKey = 'LArDSPThresholds'
@@ -211,7 +211,7 @@ def LArFEBMonConfigCore(helper,algoinstance,inputFlags, cellDebug=False, dspDebu
isOnline=False
if isComponentAccumulatorCfg() :
- if inputFlags.DQ.Environment == 'online':
+ if flags.DQ.Environment == 'online':
isOnline=True
else:
from AthenaCommon.AthenaCommonFlags import athenaCommonFlags
@@ -420,36 +420,33 @@ def LArFEBMonConfigCore(helper,algoinstance,inputFlags, cellDebug=False, dspDebu
if __name__=='__main__':
- from AthenaConfiguration.AllConfigFlags import ConfigFlags
+ from AthenaConfiguration.AllConfigFlags import initConfigFlags
from AthenaCommon.Logging import log
from AthenaCommon.Constants import DEBUG
log.setLevel(DEBUG)
-
- from LArMonitoring.LArMonConfigFlags import createLArMonConfigFlags
- createLArMonConfigFlags()
-
from AthenaConfiguration.TestDefaults import defaultTestFiles
- ConfigFlags.Input.Files = defaultTestFiles.RAW_RUN2
+ flags = initConfigFlags()
+ flags.Input.Files = defaultTestFiles.RAW_RUN2
- ConfigFlags.Output.HISTFileName = 'LArFEBMonOutput.root'
- ConfigFlags.DQ.enableLumiAccess = True
- ConfigFlags.DQ.useTrigger = False
- ConfigFlags.lock()
+ flags.Output.HISTFileName = 'LArFEBMonOutput.root'
+ flags.DQ.enableLumiAccess = True
+ flags.DQ.useTrigger = False
+ flags.lock()
from CaloRec.CaloRecoConfig import CaloRecoCfg
- cfg=CaloRecoCfg(ConfigFlags)
+ cfg=CaloRecoCfg(flags)
#from CaloD3PDMaker.CaloD3PDConfig import CaloD3PDCfg,CaloD3PDAlg
- #cfg.merge(CaloD3PDCfg(ConfigFlags, filename=ConfigFlags.Output.HISTFileName, streamname='CombinedMonitoring'))
+ #cfg.merge(CaloD3PDCfg(flags, filename=flags.Output.HISTFileName, streamname='CombinedMonitoring'))
- aff_acc = LArFEBMonConfig(ConfigFlags)
+ aff_acc = LArFEBMonConfig(flags)
cfg.merge(aff_acc)
cfg.printConfig()
- ConfigFlags.dump()
+ flags.dump()
f=open("LArFEBMon.pkl","wb")
cfg.store(f)
f.close()
diff --git a/LArCalorimeter/LArMonitoring/python/LArHVCorrMonAlg.py b/LArCalorimeter/LArMonitoring/python/LArHVCorrMonAlg.py
index 44136873c34dd04b010024bcad7f5d9dbc73e098..6775ab968d958605096195c865dfeacd9bdf4250 100644
--- a/LArCalorimeter/LArMonitoring/python/LArHVCorrMonAlg.py
+++ b/LArCalorimeter/LArMonitoring/python/LArHVCorrMonAlg.py
@@ -1,38 +1,38 @@
#
-# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
#
-def LArHVCorrMonConfigOld(inputFlags):
+def LArHVCorrMonConfigOld(flags):
from AthenaMonitoring.AthMonitorCfgHelper import AthMonitorCfgHelperOld
from LArMonitoring.LArMonitoringConf import LArHVCorrectionMonAlg
- helper = AthMonitorCfgHelperOld(inputFlags, 'LArHVCorrMonAlgOldCfg')
- LArHVCorrMonConfigCore(helper, LArHVCorrectionMonAlg, inputFlags)
+ helper = AthMonitorCfgHelperOld(flags, 'LArHVCorrMonAlgOldCfg')
+ LArHVCorrMonConfigCore(helper, LArHVCorrectionMonAlg, flags)
from LArConditionsCommon import LArHVDB # noqa: F401
return helper.result()
-def LArHVCorrMonConfig(inputFlags):
+def LArHVCorrMonConfig(flags):
from AthenaMonitoring import AthMonitorCfgHelper
- helper = AthMonitorCfgHelper(inputFlags,'LArHVCorrMonAlgCfg')
+ helper = AthMonitorCfgHelper(flags,'LArHVCorrMonAlgCfg')
from LArGeoAlgsNV.LArGMConfig import LArGMCfg
- acc = LArGMCfg(inputFlags)
+ acc = LArGMCfg(flags)
from TileGeoModel.TileGMConfig import TileGMCfg
- acc.merge(TileGMCfg(inputFlags))
+ acc.merge(TileGMCfg(flags))
from LArCalibUtils.LArHVScaleConfig import LArHVScaleCfg
- acc.merge(LArHVScaleCfg(inputFlags))
+ acc.merge(LArHVScaleCfg(flags))
from AthenaConfiguration.ComponentFactory import CompFactory
- LArHVCorrMonConfigCore(helper, CompFactory.LArHVCorrectionMonAlg, inputFlags)
+ LArHVCorrMonConfigCore(helper, CompFactory.LArHVCorrectionMonAlg, flags)
acc.merge(helper.result())
return acc
-def LArHVCorrMonConfigCore(helper, algoinstance,inputFlags):
+def LArHVCorrMonConfigCore(helper, algoinstance,flags):
larHVCorrAlg = helper.addAlgorithm(algoinstance,'larHVCorrMonAlg')
@@ -204,21 +204,22 @@ def LArHVCorrMonConfigCore(helper, algoinstance,inputFlags):
if __name__=='__main__':
# Set the Athena configuration flags
- from AthenaConfiguration.AllConfigFlags import ConfigFlags
+ from AthenaConfiguration.AllConfigFlags import initConfigFlags
nightly = '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/CommonInputs/'
file = 'data16_13TeV.00311321.physics_Main.recon.AOD.r9264/AOD.11038520._000001.pool.root.1'
- ConfigFlags.Input.Files = [nightly+file]
- ConfigFlags.Input.isMC = False
- ConfigFlags.Output.HISTFileName = 'LArHVCorrMonOutput.root'
- ConfigFlags.lock()
+ flags = initConfigFlags()
+ flags.Input.Files = [nightly+file]
+ flags.Input.isMC = False
+ flags.Output.HISTFileName = 'LArHVCorrMonOutput.root'
+ flags.lock()
# Initialize configuration object, add accumulator, merge, and run.
from AthenaConfiguration.MainServicesConfig import MainServicesCfg
from AthenaPoolCnvSvc.PoolReadConfig import PoolReadCfg
- cfg = MainServicesCfg(ConfigFlags)
- cfg.merge(PoolReadCfg(ConfigFlags))
+ cfg = MainServicesCfg(flags)
+ cfg.merge(PoolReadCfg(flags))
- cfg.merge(LArHVCorrMonConfig(ConfigFlags))
+ cfg.merge(LArHVCorrMonConfig(flags))
Nevents=10
cfg.run(Nevents) #use cfg.run() to run on all events
diff --git a/LArCalorimeter/LArMonitoring/python/LArNoiseCorrelationMonAlg.py b/LArCalorimeter/LArMonitoring/python/LArNoiseCorrelationMonAlg.py
index dc163ab042c961f0a469a3c5f9cf0e8f18bbdce9..1ef48bd3ae851f6f3852212437cf880ab57987ad 100644
--- a/LArCalorimeter/LArMonitoring/python/LArNoiseCorrelationMonAlg.py
+++ b/LArCalorimeter/LArMonitoring/python/LArNoiseCorrelationMonAlg.py
@@ -1,30 +1,30 @@
#
-# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
#
-def LArNoiseCorrelationMonConfigOld(inputFlags):
+def LArNoiseCorrelationMonConfigOld(flags):
from AthenaMonitoring.AthMonitorCfgHelper import AthMonitorCfgHelperOld
from LArMonitoring.LArMonitoringConf import LArNoiseCorrelationMonAlg
- helper = AthMonitorCfgHelperOld(inputFlags, 'LArNoiseCorrelationMonAlgCfg')
- LArNoiseCorrelationMonConfigCore(helper, LArNoiseCorrelationMonAlg,inputFlags)
+ helper = AthMonitorCfgHelperOld(flags, 'LArNoiseCorrelationMonAlgCfg')
+ LArNoiseCorrelationMonConfigCore(helper, LArNoiseCorrelationMonAlg,flags)
return helper.result()
-def LArNoiseCorrelationMonConfig(inputFlags):
+def LArNoiseCorrelationMonConfig(flags):
'''Function to configures some algorithms in the monitoring system.'''
# The following class will make a sequence, configure algorithms, and link
# them to GenericMonitoringTools
from AthenaMonitoring.AthMonitorCfgHelper import AthMonitorCfgHelper
- helper = AthMonitorCfgHelper(inputFlags,'LArNoiseCorrelationMonAlgCfg')
+ helper = AthMonitorCfgHelper(flags,'LArNoiseCorrelationMonAlgCfg')
from AthenaConfiguration.ComponentFactory import CompFactory
- return LArNoiseCorrelationMonConfigCore(helper, CompFactory.LArNoiseCorrelationMonAlg,inputFlags)
+ return LArNoiseCorrelationMonConfigCore(helper, CompFactory.LArNoiseCorrelationMonAlg,flags)
-def LArNoiseCorrelationMonConfigCore(helper, algoinstance,inputFlags):
+def LArNoiseCorrelationMonConfigCore(helper, algoinstance,flags):
from LArMonitoring.GlobalVariables import lArDQGlobals
@@ -48,7 +48,7 @@ def LArNoiseCorrelationMonConfigCore(helper, algoinstance,inputFlags):
if isComponentAccumulatorCfg():
- if inputFlags.DQ.Environment == 'online':
+ if flags.DQ.Environment == 'online':
isOnline=True
else:
from AthenaCommon.AthenaCommonFlags import athenaCommonFlags
@@ -57,7 +57,7 @@ def LArNoiseCorrelationMonConfigCore(helper, algoinstance,inputFlags):
isOnline=False #needed later
if isComponentAccumulatorCfg() :
- if inputFlags.DQ.Environment == 'online':
+ if flags.DQ.Environment == 'online':
isOnline=True
else :
from AthenaCommon.AthenaCommonFlags import athenaCommonFlags
@@ -194,36 +194,33 @@ def LArNoiseCorrelationMonConfigCore(helper, algoinstance,inputFlags):
if __name__=='__main__':
- from AthenaConfiguration.AllConfigFlags import ConfigFlags
+ from AthenaConfiguration.AllConfigFlags import initConfigFlags
from AthenaCommon.Logging import log
from AthenaCommon.Constants import DEBUG
log.setLevel(DEBUG)
-
- from LArMonitoring.LArMonConfigFlags import createLArMonConfigFlags
- createLArMonConfigFlags()
-
from AthenaConfiguration.TestDefaults import defaultTestFiles
- ConfigFlags.Input.Files = defaultTestFiles.RAW_RUN2
+ flags = initConfigFlags()
+ flags.Input.Files = defaultTestFiles.RAW_RUN2
- ConfigFlags.Output.HISTFileName = 'LArNoiseCorrMonOutput.root'
- ConfigFlags.DQ.enableLumiAccess = False
- ConfigFlags.DQ.useTrigger = False
- ConfigFlags.lock()
+ flags.Output.HISTFileName = 'LArNoiseCorrMonOutput.root'
+ flags.DQ.enableLumiAccess = False
+ flags.DQ.useTrigger = False
+ flags.lock()
from CaloRec.CaloRecoConfig import CaloRecoCfg
- cfg=CaloRecoCfg(ConfigFlags)
+ cfg=CaloRecoCfg(flags)
from LArCellRec.LArNoisyROSummaryConfig import LArNoisyROSummaryCfg
- cfg.merge(LArNoisyROSummaryCfg(ConfigFlags))
+ cfg.merge(LArNoisyROSummaryCfg(flags))
# from LArMonitoring.LArNoiseCorrelationMonAlg import LArNoiseCorrelationMonConfig
- aff_acc = LArNoiseCorrelationMonConfig(ConfigFlags)
+ aff_acc = LArNoiseCorrelationMonConfig(flags)
cfg.merge(aff_acc)
log.setLevel(DEBUG)
- ConfigFlags.dump()
+ flags.dump()
f=open("LArNoiseCorrelationMon.pkl","wb")
cfg.store(f)
f.close()
diff --git a/LArCalorimeter/LArMonitoring/python/LArNoisyROMonAlg.py b/LArCalorimeter/LArMonitoring/python/LArNoisyROMonAlg.py
index 7269edd6c84976e64a6a6d0bfa6f6fea08c717ab..b4070716d0be9cac26a6cf90a2139a6bc1ba0bab 100644
--- a/LArCalorimeter/LArMonitoring/python/LArNoisyROMonAlg.py
+++ b/LArCalorimeter/LArMonitoring/python/LArNoisyROMonAlg.py
@@ -1,26 +1,26 @@
#
-# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
#
-def LArNoisyROMonConfig(inputFlags, inKey="",
+def LArNoisyROMonConfig(flags, inKey="",
NoisyFEBDefStr="(>30 chan with Q>4000)",
MNBTightFEBDefStr="",
MNBTight_PsVetoFEBDefStr="",
MNBLooseFEBDefStr=""):
from AthenaMonitoring import AthMonitorCfgHelper
- helper = AthMonitorCfgHelper(inputFlags,'LArNoisyROMonAlgCfg')
+ helper = AthMonitorCfgHelper(flags,'LArNoisyROMonAlgCfg')
from AthenaConfiguration.ComponentFactory import CompFactory
- NoisyFEBDefStr="(>"+str(inputFlags.LAr.NoisyRO.BadChanPerFEB)+" chan with Q>"+str(inputFlags.LAr.NoisyRO.CellQuality)+")"
- MNBTightFEBDefStr="(>"+str(inputFlags.LAr.NoisyRO.MNBTightCut)+" chan with Q>"+str(inputFlags.LAr.NoisyRO.CellQuality)+")"
- MNBTight_PsVetoFEBDefStr="(>"+str(inputFlags.LAr.NoisyRO.MNBTight_PsVetoCut[0])+" chan with Q>"+str(inputFlags.LAr.NoisyRO.CellQuality)+") + PS veto (<"+str(inputFlags.LAr.NoisyRO.MNBTight_PsVetoCut[1])+" channels)"
- MNBLooseFEBDefStr="(>"+str(inputFlags.LAr.NoisyRO.MNBLooseCut)+" chan with Q>"+str(inputFlags.LAr.NoisyRO.CellQuality)+")"
+ NoisyFEBDefStr="(>"+str(flags.LAr.NoisyRO.BadChanPerFEB)+" chan with Q>"+str(flags.LAr.NoisyRO.CellQuality)+")"
+ MNBTightFEBDefStr="(>"+str(flags.LAr.NoisyRO.MNBTightCut)+" chan with Q>"+str(flags.LAr.NoisyRO.CellQuality)+")"
+ MNBTight_PsVetoFEBDefStr="(>"+str(flags.LAr.NoisyRO.MNBTight_PsVetoCut[0])+" chan with Q>"+str(flags.LAr.NoisyRO.CellQuality)+") + PS veto (<"+str(flags.LAr.NoisyRO.MNBTight_PsVetoCut[1])+" channels)"
+ MNBLooseFEBDefStr="(>"+str(flags.LAr.NoisyRO.MNBLooseCut)+" chan with Q>"+str(flags.LAr.NoisyRO.CellQuality)+")"
- return LArNoisyROMonConfigCore(helper,CompFactory.LArNoisyROMonAlg, inputFlags, inKey, NoisyFEBDefStr, MNBTightFEBDefStr, MNBTight_PsVetoFEBDefStr, MNBLooseFEBDefStr)
+ return LArNoisyROMonConfigCore(helper,CompFactory.LArNoisyROMonAlg, flags, inKey, NoisyFEBDefStr, MNBTightFEBDefStr, MNBTight_PsVetoFEBDefStr, MNBLooseFEBDefStr)
-def LArNoisyROMonConfigOld(inputFlags, inKey="",
+def LArNoisyROMonConfigOld(flags, inKey="",
NoisyFEBDefStr="",
MNBTightFEBDefStr="",
MNBTight_PsVetoFEBDefStr="",
@@ -33,15 +33,15 @@ def LArNoisyROMonConfigOld(inputFlags, inKey="",
MNBLooseFEBDefStr = '(>'+str(larNoisyROFlags.MNBLooseCut())+' chan with Q>'+str(larNoisyROFlags.CellQualityCut())+')'
from AthenaMonitoring import AthMonitorCfgHelperOld
from LArMonitoring.LArMonitoringConf import LArNoisyROMonAlg
- helper = AthMonitorCfgHelperOld(inputFlags,'LArNoisyROMonAlgOldCfg')
+ helper = AthMonitorCfgHelperOld(flags,'LArNoisyROMonAlgOldCfg')
- LArNoisyROMonConfigCore(helper,LArNoisyROMonAlg, inputFlags, inKey, NoisyFEBDefStr, MNBTightFEBDefStr, MNBTight_PsVetoFEBDefStr, MNBLooseFEBDefStr)
+ LArNoisyROMonConfigCore(helper,LArNoisyROMonAlg, flags, inKey, NoisyFEBDefStr, MNBTightFEBDefStr, MNBTight_PsVetoFEBDefStr, MNBLooseFEBDefStr)
return helper.result()
-def LArNoisyROMonConfigCore(helper,algoinstance,inputFlags,
+def LArNoisyROMonConfigCore(helper,algoinstance,flags,
inKey="",
NoisyFEBDefStr="(>30 chan with Q>4000)",
MNBTightFEBDefStr="",
@@ -54,8 +54,8 @@ def LArNoisyROMonConfigCore(helper,algoinstance,inputFlags,
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
cfg=ComponentAccumulator()
from LArBadChannelTool.LArBadFebsConfig import LArKnownBadFebCfg, LArKnownMNBFebCfg
- cfg.merge(LArKnownBadFebCfg(inputFlags))
- cfg.merge(LArKnownMNBFebCfg(inputFlags))
+ cfg.merge(LArKnownBadFebCfg(flags))
+ cfg.merge(LArKnownMNBFebCfg(flags))
larNoisyROMonAlg = helper.addAlgorithm(algoinstance,'larNoisyROMonAlg')
@@ -105,10 +105,10 @@ def LArNoisyROMonConfigCore(helper,algoinstance,inputFlags,
]
doTrigger=False
if isComponentAccumulatorCfg():
- if inputFlags.DQ.useTrigger or LArNoisyROMonForceTrigger:
+ if flags.DQ.useTrigger or LArNoisyROMonForceTrigger:
doTrigger=True
else:
- if inputFlags.doHLTMon or LArNoisyROMonForceTrigger:
+ if flags.doHLTMon or LArNoisyROMonForceTrigger:
doTrigger=True
if doTrigger:
@@ -277,47 +277,47 @@ if __name__=='__main__':
from AthenaCommon.Logging import log
log.setLevel(DEBUG)
-
# Set the Athena configuration flags
- from AthenaConfiguration.AllConfigFlags import ConfigFlags
+ from AthenaConfiguration.AllConfigFlags import initConfigFlags
from LArMonitoring.LArMonConfigFlags import createLArMonConfigFlags
createLArMonConfigFlags()
nightly = '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/q431/21.0/v1/'
file = 'myESD.pool.root'
- ConfigFlags.Input.Files = [nightly+file]
- ConfigFlags.Input.isMC = False
- ConfigFlags.DQ.useTrigger = True
+ flags = initConfigFlags()
+ flags.Input.Files = [nightly+file]
+ flags.Input.isMC = False
+ flags.DQ.useTrigger = True
- ConfigFlags.Output.HISTFileName = 'LArNoisyROMonitoringOutput.root'
+ flags.Output.HISTFileName = 'LArNoisyROMonitoringOutput.root'
- ConfigFlags.Exec.OutputLevel=DEBUG
- ConfigFlags.lock()
+ flags.Exec.OutputLevel=DEBUG
+ flags.lock()
# Initialize configuration object, add accumulator, merge, and run.
from AthenaConfiguration.MainServicesConfig import MainServicesCfg
from AthenaPoolCnvSvc.PoolReadConfig import PoolReadCfg
- cfg = MainServicesCfg(ConfigFlags)
- cfg.merge(PoolReadCfg(ConfigFlags))
+ cfg = MainServicesCfg(flags)
+ cfg.merge(PoolReadCfg(flags))
# try NoisyRO algo
#first geometry
from LArGeoAlgsNV.LArGMConfig import LArGMCfg
from TileGeoModel.TileGMConfig import TileGMCfg
- cfg.merge(LArGMCfg(ConfigFlags))
- cfg.merge(TileGMCfg(ConfigFlags))
+ cfg.merge(LArGMCfg(flags))
+ cfg.merge(TileGMCfg(flags))
from LArCabling.LArCablingConfig import LArOnOffIdMappingCfg
- cfg.merge(LArOnOffIdMappingCfg(ConfigFlags))
+ cfg.merge(LArOnOffIdMappingCfg(flags))
# then NoisyROSummary creator
from LArCellRec.LArNoisyROSummaryConfig import LArNoisyROSummaryCfg
- noisyROSumm = LArNoisyROSummaryCfg(ConfigFlags)
+ noisyROSumm = LArNoisyROSummaryCfg(flags)
noisyROSumm.getEventAlgo("LArNoisyROAlg").OutputKey="LArNoisyROSummary_recomputed"
cfg.merge(noisyROSumm)
# then monitoring algo
- noisemon=LArNoisyROMonConfig(ConfigFlags, inKey="LArNoisyROSummary_recomputed")
+ noisemon=LArNoisyROMonConfig(flags, inKey="LArNoisyROSummary_recomputed")
cfg.merge(noisemon)
- ConfigFlags.dump()
+ flags.dump()
f=open("NoisyROMonMaker.pkl","wb")
cfg.store(f)
f.close()
diff --git a/LArCalorimeter/LArMonitoring/python/LArRODMonAlg.py b/LArCalorimeter/LArMonitoring/python/LArRODMonAlg.py
index ce9a2d2f67c95e321bff8aa9a32015dac7232d7c..d56355cc4ff82fea393b33d70c5b79090d78e624 100644
--- a/LArCalorimeter/LArMonitoring/python/LArRODMonAlg.py
+++ b/LArCalorimeter/LArMonitoring/python/LArRODMonAlg.py
@@ -1,30 +1,30 @@
#
-# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
#
-def LArRODMonConfigOld(inputFlags,cellDebug=False, dspDebug=False):
+def LArRODMonConfigOld(flags,cellDebug=False, dspDebug=False):
from AthenaMonitoring.AthMonitorCfgHelper import AthMonitorCfgHelperOld
from LArMonitoring.LArMonitoringConf import LArRODMonAlg
- helper = AthMonitorCfgHelperOld(inputFlags, 'LArRODMonALgOldCfg')
- LArRODMonConfigCore(helper, LArRODMonAlg,inputFlags,cellDebug, dspDebug)
+ helper = AthMonitorCfgHelperOld(flags, 'LArRODMonALgOldCfg')
+ LArRODMonConfigCore(helper, LArRODMonAlg,flags,cellDebug, dspDebug)
return helper.result()
-def LArRODMonConfig(inputFlags,cellDebug=False, dspDebug=False):
+def LArRODMonConfig(flags,cellDebug=False, dspDebug=False):
from AthenaMonitoring.AthMonitorCfgHelper import AthMonitorCfgHelper
- helper = AthMonitorCfgHelper(inputFlags,'LArRODMonAlgCfg')
+ helper = AthMonitorCfgHelper(flags,'LArRODMonAlgCfg')
from AthenaConfiguration.ComponentFactory import CompFactory
- LArRODMonConfigCore(helper, CompFactory.LArRODMonAlg,inputFlags,cellDebug, dspDebug)
+ LArRODMonConfigCore(helper, CompFactory.LArRODMonAlg,flags,cellDebug, dspDebug)
return helper.result()
-def LArRODMonConfigCore(helper, algoinstance,inputFlags, cellDebug=False, dspDebug=False):
+def LArRODMonConfigCore(helper, algoinstance,flags, cellDebug=False, dspDebug=False):
larRODMonAlg = helper.addAlgorithm(algoinstance,'larRODMonAlg')
@@ -52,7 +52,7 @@ def LArRODMonConfigCore(helper, algoinstance,inputFlags, cellDebug=False, dspDeb
if dspDebug:
larRODMonAlg.DoDspTestDump=True
- if inputFlags.Common.isOnline:
+ if flags.Common.isOnline:
larRODMonAlg.MaxEvDump=100
#from AthenaCommon.Constants import VERBOSE
@@ -216,36 +216,33 @@ def LArRODMonConfigCore(helper, algoinstance,inputFlags, cellDebug=False, dspDeb
if __name__=='__main__':
- from AthenaConfiguration.AllConfigFlags import ConfigFlags
+ from AthenaConfiguration.AllConfigFlags import initConfigFlags
from AthenaCommon.Logging import log
from AthenaCommon.Constants import DEBUG
log.setLevel(DEBUG)
-
- from LArMonitoring.LArMonConfigFlags import createLArMonConfigFlags
- createLArMonConfigFlags()
-
from AthenaConfiguration.TestDefaults import defaultTestFiles
- ConfigFlags.Input.Files = defaultTestFiles.RAW_RUN2
+ flags = initConfigFlags()
+ flags.Input.Files = defaultTestFiles.RAW_RUN2
- ConfigFlags.Output.HISTFileName = 'LArRODMonOutput.root'
- ConfigFlags.DQ.enableLumiAccess = False
- ConfigFlags.DQ.useTrigger = False
- ConfigFlags.lock()
+ flags.Output.HISTFileName = 'LArRODMonOutput.root'
+ flags.DQ.enableLumiAccess = False
+ flags.DQ.useTrigger = False
+ flags.lock()
from CaloRec.CaloRecoConfig import CaloRecoCfg
- cfg=CaloRecoCfg(ConfigFlags)
+ cfg=CaloRecoCfg(flags)
#from CaloD3PDMaker.CaloD3PDConfig import CaloD3PDCfg,CaloD3PDAlg
- #cfg.merge(CaloD3PDCfg(ConfigFlags, filename=ConfigFlags.Output.HISTFileName, streamname='CombinedMonitoring'))
+ #cfg.merge(CaloD3PDCfg(flags, filename=flags.Output.HISTFileName, streamname='CombinedMonitoring'))
- aff_acc = LArRODMonConfig(ConfigFlags)
+ aff_acc = LArRODMonConfig(flags)
cfg.merge(aff_acc)
cfg.printConfig()
- ConfigFlags.dump()
+ flags.dump()
f=open("LArRODMon.pkl","wb")
cfg.store(f)
f.close()
diff --git a/LArCalorimeter/LArMonitoring/python/LArRawChannelMonAlg.py b/LArCalorimeter/LArMonitoring/python/LArRawChannelMonAlg.py
index d867f6df632c1ba702424efff0964cae74820d78..cbdcf592287f9ae9313809ea30b165974e06c652 100644
--- a/LArCalorimeter/LArMonitoring/python/LArRawChannelMonAlg.py
+++ b/LArCalorimeter/LArMonitoring/python/LArRawChannelMonAlg.py
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
#
"""!@file LArRawChannelMonAlg.py
@@ -15,7 +15,7 @@ from GaudiKernel.SystemOfUnits import MeV, GeV
_USE_LEGACY_BINNING_IN_ENDCAPS = True
-def LArRawChannelMonConfigOld(inputFlags):
+def LArRawChannelMonConfigOld(flags):
from AthenaMonitoring import AthMonitorCfgHelperOld
from AthenaMonitoring.DQMonFlags import DQMonFlags
from AthenaCommon.BeamFlags import jobproperties
@@ -24,9 +24,9 @@ def LArRawChannelMonConfigOld(inputFlags):
stream = _get_stream(DQMonFlags)
from LArMonTools.LArMonFlags import LArMonFlags
signal = LArMonFlags.doLArRawMonitorSignal()
- helper = AthMonitorCfgHelperOld(inputFlags, 'LArRawChannelMonAlgOldCfg')
+ helper = AthMonitorCfgHelperOld(flags, 'LArRawChannelMonAlgOldCfg')
alg = LArRawChannelMonConfigCore(
- helper, instance=LArRawChannelMonAlg, inputFlags=inputFlags,
+ helper, instance=LArRawChannelMonAlg, flags=flags,
cosmics=cosmics, stream=stream, doSignal=signal)
from AthenaCommon.AthenaCommonFlags import athenaCommonFlags
if not athenaCommonFlags.isOnline():
@@ -40,30 +40,30 @@ def LArRawChannelMonConfigOld(inputFlags):
return helper.result()
-def LArRawChannelMonConfig(inputFlags):
+def LArRawChannelMonConfig(flags):
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from AthenaConfiguration.ComponentFactory import CompFactory
from AthenaMonitoring import AthMonitorCfgHelper
from CaloTools.CaloNoiseCondAlgConfig import CaloNoiseCondAlgCfg
from AthenaMonitoring.AtlasReadyFilterConfig import AtlasReadyFilterCfg
from AthenaConfiguration.Enums import BeamType
- cosmics = (inputFlags.Beam.Type is BeamType.Cosmics)
- stream = _get_stream(inputFlags.DQ)
- signal = inputFlags.LArMon.doLArRawMonitorSignal
- helper = AthMonitorCfgHelper(inputFlags, 'LArRawChannelMonAlgCfg')
+ cosmics = (flags.Beam.Type is BeamType.Cosmics)
+ stream = _get_stream(flags.DQ)
+ signal = flags.LArMon.doLArRawMonitorSignal
+ helper = AthMonitorCfgHelper(flags, 'LArRawChannelMonAlgCfg')
alg = LArRawChannelMonConfigCore(
helper, instance=CompFactory.LArRawChannelMonAlg,
- inputFlags=inputFlags, cosmics=cosmics, stream=stream, doSignal=signal)
- noise_alg = CaloNoiseCondAlgCfg(inputFlags, noisetype=alg.NoiseKey.Path)
+ flags=flags, cosmics=cosmics, stream=stream, doSignal=signal)
+ noise_alg = CaloNoiseCondAlgCfg(flags, noisetype=alg.NoiseKey.Path)
accumulator = ComponentAccumulator()
accumulator.merge(noise_alg)
alg.AtlasReadyFilterTool.append(
- accumulator.popToolsAndMerge(AtlasReadyFilterCfg(inputFlags)))
+ accumulator.popToolsAndMerge(AtlasReadyFilterCfg(flags)))
accumulator.merge(helper.result())
return accumulator
-def LArRawChannelMonConfigCore(helper, instance, inputFlags, cosmics, stream, doSignal):
+def LArRawChannelMonConfigCore(helper, instance, flags, cosmics, stream, doSignal):
alg = helper.addAlgorithm(instance, 'LArRawChannelMonAlg')
alg.occupancy_thresholds = [
100 * MeV, # EMBA
@@ -126,7 +126,7 @@ def LArRawChannelMonConfigCore(helper, instance, inputFlags, cosmics, stream, do
alg.db_and_ofc_only = True
from LArConfiguration.LArConfigFlags import RawChannelSource
- if inputFlags.LAr.RawChannelSource is RawChannelSource.Calculated:
+ if flags.LAr.RawChannelSource is RawChannelSource.Calculated:
alg.LArRawChannelContainerKey="LArRawChannels_FromDigits"
# Histograms for different partitions are handled together via a
@@ -328,26 +328,24 @@ def _superslot_channel_axis_ranges(partition):
if __name__=='__main__':
- from AthenaConfiguration.AllConfigFlags import ConfigFlags
+ from AthenaConfiguration.AllConfigFlags import initConfigFlags
from AthenaCommon.Logging import log
from AthenaCommon.Constants import WARNING
log.setLevel(WARNING)
- from LArMonitoring.LArMonConfigFlags import createLArMonConfigFlags
- createLArMonConfigFlags()
-
from AthenaConfiguration.TestDefaults import defaultTestFiles
from AthenaConfiguration.Enums import BeamType
- ConfigFlags.Input.Files = defaultTestFiles.RAW_RUN2
- ConfigFlags.Output.HISTFileName = 'LArRawChannelMonOutput.root'
- ConfigFlags.DQ.enableLumiAccess = False
- ConfigFlags.DQ.useTrigger = False
- ConfigFlags.Beam.Type = BeamType.Collisions
- ConfigFlags.lock()
+ flags = initConfigFlags()
+ flags.Input.Files = defaultTestFiles.RAW_RUN2
+ flags.Output.HISTFileName = 'LArRawChannelMonOutput.root'
+ flags.DQ.enableLumiAccess = False
+ flags.DQ.useTrigger = False
+ flags.Beam.Type = BeamType.Collisions
+ flags.lock()
from CaloRec.CaloRecoConfig import CaloRecoCfg
- cfg = CaloRecoCfg(ConfigFlags)
- acc = LArRawChannelMonConfig(ConfigFlags)
+ cfg = CaloRecoCfg(flags)
+ acc = LArRawChannelMonConfig(flags)
cfg.merge(acc)
f = open("LArRawChannelMon.pkl", "wb")
cfg.store(f)
diff --git a/LArCalorimeter/LArMonitoring/python/LArReco_fromraw_Cfg.py b/LArCalorimeter/LArMonitoring/python/LArReco_fromraw_Cfg.py
index 93075ee91eb3a2aab18dfd0efff539fd5bb538a9..d0548336c131e53f00a6301bb8c50956794010fe 100644
--- a/LArCalorimeter/LArMonitoring/python/LArReco_fromraw_Cfg.py
+++ b/LArCalorimeter/LArMonitoring/python/LArReco_fromraw_Cfg.py
@@ -1,63 +1,61 @@
-# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
if __name__=="__main__":
- from AthenaConfiguration.AllConfigFlags import ConfigFlags
+ from AthenaConfiguration.AllConfigFlags import initConfigFlags
from AthenaCommon.Logging import log
from AthenaCommon.Constants import DEBUG
log.setLevel(DEBUG)
-
- from LArMonitoring.LArMonConfigFlags import createLArMonConfigFlags
- createLArMonConfigFlags()
+ flags = initConfigFlags()
from AthenaConfiguration.TestDefaults import defaultTestFiles
- ConfigFlags.Input.Files = defaultTestFiles.RAW_RUN2
+ flags.Input.Files = defaultTestFiles.RAW_RUN2
- ConfigFlags.Output.HISTFileName = 'LArMonitoringOutput.root'
- ConfigFlags.DQ.enableLumiAccess = False
- ConfigFlags.DQ.useTrigger = False
- ConfigFlags.lock()
+ flags.Output.HISTFileName = 'LArMonitoringOutput.root'
+ flags.DQ.enableLumiAccess = False
+ flags.DQ.useTrigger = False
+ flags.lock()
## Cell building
from CaloRec.CaloRecoConfig import CaloRecoCfg
- cfg=CaloRecoCfg(ConfigFlags)
+ cfg=CaloRecoCfg(flags)
#larCoverage monitoring
from LArMonitoring.LArCoverageAlg import LArCoverageConfig
- cov_acc = LArCoverageConfig(ConfigFlags)
+ cov_acc = LArCoverageConfig(flags)
cfg.merge(cov_acc)
#affectedRegions monitoring
from LArMonitoring.LArAffectedRegionsAlg import LArAffectedRegionsConfig
- aff_acc = LArAffectedRegionsConfig(ConfigFlags)
+ aff_acc = LArAffectedRegionsConfig(flags)
cfg.merge(aff_acc)
#collision time algo
from LArCellRec.LArCollisionTimeConfig import LArCollisionTimeCfg
- cfg.merge(LArCollisionTimeCfg(ConfigFlags, cutIteration=False))
+ cfg.merge(LArCollisionTimeCfg(flags, cutIteration=False))
# and collision time monitoring algo
from LArMonitoring.LArCollisionTimeMonAlg import LArCollisionTimeMonConfig
- collmon=LArCollisionTimeMonConfig(ConfigFlags)
+ collmon=LArCollisionTimeMonConfig(flags)
cfg.merge(collmon)
#ROD monitoring
from LArMonitoring.LArRODMonAlg import LArRODMonConfig
- rodmon = LArRODMonConfig(ConfigFlags)
+ rodmon = LArRODMonConfig(flags)
cfg.merge(rodmon)
#Digit monitoring
from LArCellRec.LArNoisyROSummaryConfig import LArNoisyROSummaryCfg
- cfg.merge(LArNoisyROSummaryCfg(ConfigFlags))
+ cfg.merge(LArNoisyROSummaryCfg(flags))
from LArMonitoring.LArDigitMonAlg import LArDigitMonConfig
- digimon = LArDigitMonConfig(ConfigFlags)
+ digimon = LArDigitMonConfig(flags)
cfg.merge(digimon)
- ConfigFlags.dump()
+ flags.dump()
f=open("LArMonMaker.pkl","w")
cfg.store(f)
f.close()
diff --git a/LArCalorimeter/LArMonitoring/python/LArSuperCellMonAlg.py b/LArCalorimeter/LArMonitoring/python/LArSuperCellMonAlg.py
index 98f7e971284e2c9942b884be3eabb82f957deee5..744ed3b92fe96a2ffbbafd0f808489afe3bf5f9b 100644
--- a/LArCalorimeter/LArMonitoring/python/LArSuperCellMonAlg.py
+++ b/LArCalorimeter/LArMonitoring/python/LArSuperCellMonAlg.py
@@ -1,12 +1,12 @@
#
-# Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
#
-def LArSuperCellMonConfigOld(inputFlags):
+def LArSuperCellMonConfigOld(flags):
from AthenaMonitoring.AthMonitorCfgHelper import AthMonitorCfgHelperOld
from LArMonitoring.LArMonitoringConf import LArSuperCellMonAlg
- helper = AthMonitorCfgHelperOld(inputFlags, 'LArSuperCellMonAlgOldCfg')
+ helper = AthMonitorCfgHelperOld(flags, 'LArSuperCellMonAlgOldCfg')
from AthenaCommon.BeamFlags import jobproperties
if jobproperties.Beam.beamType() == 'cosmics':
isCosmics=True
@@ -31,7 +31,7 @@ def LArSuperCellMonConfigOld(inputFlags):
from CaloTools.CaloNoiseCondAlg import CaloNoiseCondAlg
CaloNoiseCondAlg()
- algo = LArSuperCellMonConfigCore(helper, LArSuperCellMonAlg,inputFlags,isCosmics, isMC, RemoveMasked=True)
+ algo = LArSuperCellMonConfigCore(helper, LArSuperCellMonAlg,flags,isCosmics, isMC, RemoveMasked=True)
from AthenaMonitoring.AtlasReadyFilterTool import GetAtlasReadyFilterTool
algo.ReadyFilterTool = [GetAtlasReadyFilterTool()]
@@ -40,7 +40,7 @@ def LArSuperCellMonConfigOld(inputFlags):
return helper.result()
-def LArSuperCellMonConfig(inputFlags, **kwargs):
+def LArSuperCellMonConfig(flags, **kwargs):
from AthenaCommon.Logging import logging
from ByteStreamCnvSvc.ByteStreamConfig import ByteStreamReadCfg
from AthenaConfiguration.ComponentFactory import CompFactory
@@ -48,47 +48,47 @@ def LArSuperCellMonConfig(inputFlags, **kwargs):
mask=True
from AthenaMonitoring.AthMonitorCfgHelper import AthMonitorCfgHelper
- helper = AthMonitorCfgHelper(inputFlags,'LArSuperCellMonAlgCfg')
+ helper = AthMonitorCfgHelper(flags,'LArSuperCellMonAlgCfg')
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
cfg=ComponentAccumulator()
- if not inputFlags.DQ.enableLumiAccess and not inputFlags.DQ.Environment == 'online':
+ if not flags.DQ.enableLumiAccess and not flags.DQ.Environment == 'online':
mlog.warning('This algo needs Lumi access, returning empty config')
return cfg
from LArGeoAlgsNV.LArGMConfig import LArGMCfg
- cfg.merge(LArGMCfg(inputFlags))
+ cfg.merge(LArGMCfg(flags))
from TileGeoModel.TileGMConfig import TileGMCfg
- cfg.merge(TileGMCfg(inputFlags))
+ cfg.merge(TileGMCfg(flags))
from DetDescrCnvSvc.DetDescrCnvSvcConfig import DetDescrCnvSvcCfg
- cfg.merge(DetDescrCnvSvcCfg(inputFlags))
+ cfg.merge(DetDescrCnvSvcCfg(flags))
- if inputFlags.Common.isOnline:
+ if flags.Common.isOnline:
cfg.addCondAlgo(CompFactory.CaloSuperCellAlignCondAlg('CaloSuperCellAlignCondAlg'))
from LumiBlockComps.BunchCrossingCondAlgConfig import BunchCrossingCondAlgCfg
- cfg.merge(BunchCrossingCondAlgCfg(inputFlags))
+ cfg.merge(BunchCrossingCondAlgCfg(flags))
from CaloTools.CaloNoiseCondAlgConfig import CaloNoiseCondAlgCfg
- cfg.merge(CaloNoiseCondAlgCfg(inputFlags))
- cfg.merge(CaloNoiseCondAlgCfg(inputFlags,noisetype="electronicNoise"))
+ cfg.merge(CaloNoiseCondAlgCfg(flags))
+ cfg.merge(CaloNoiseCondAlgCfg(flags,noisetype="electronicNoise"))
- cfg.merge(ByteStreamReadCfg(inputFlags))
+ cfg.merge(ByteStreamReadCfg(flags))
from LArByteStream.LArRawSCDataReadingConfig import LArRawSCDataReadingCfg
- cfg.merge(LArRawSCDataReadingCfg(inputFlags))
+ cfg.merge(LArRawSCDataReadingCfg(flags))
from TrigT1CaloFexPerf.EmulationConfig import emulateSC_Cfg
- cfg.merge(emulateSC_Cfg(inputFlags))
+ cfg.merge(emulateSC_Cfg(flags))
from LArCellRec.LArRAWtoSuperCellConfig import LArRAWtoSuperCellCfg
- cfg.merge(LArRAWtoSuperCellCfg(inputFlags,mask=mask) )
+ cfg.merge(LArRAWtoSuperCellCfg(flags,mask=mask) )
# Reco SC:
#get SC onl-offl mapping from DB
from LArCabling.LArCablingConfig import LArOnOffIdMappingSCCfg
- cfg.merge(LArOnOffIdMappingSCCfg(inputFlags))
+ cfg.merge(LArOnOffIdMappingSCCfg(flags))
# and elec. calib. coeffs
from LArConfiguration.LArElecCalibDBConfig import LArElecCalibDBSCCfg
@@ -96,7 +96,7 @@ def LArSuperCellMonConfig(inputFlags, **kwargs):
larLATOMEBuilderAlg=CompFactory.LArLATOMEBuilderAlg("LArLATOMEBuilderAlg")
from LArConditionsCommon.LArRunFormat import getLArDTInfoForRun
try:
- runinfo=getLArDTInfoForRun(inputFlags.Input.RunNumbers[0], connstring="COOLONL_LAR/CONDBR2")
+ runinfo=getLArDTInfoForRun(flags.Input.RunNumbers[0], connstring="COOLONL_LAR/CONDBR2")
streamTypes=runinfo.streamTypes()
except Exception as e:
mlog.warning("Could not get DT run info, using defaults !")
@@ -113,10 +113,10 @@ def LArSuperCellMonConfig(inputFlags, **kwargs):
larLATOMEBuilderAlg.LArDigitKey = "SC_ADC_BAS"
cfg.addEventAlgo(larLATOMEBuilderAlg)
- cfg.merge(LArRAWtoSuperCellCfg(inputFlags,name="LArRAWRecotoSuperCell",mask=mask,doReco=True,SCIn="SC_ET_RECO",SCellContainerOut="SCell_ET_RECO") )
+ cfg.merge(LArRAWtoSuperCellCfg(flags,name="LArRAWRecotoSuperCell",mask=mask,doReco=True,SCIn="SC_ET_RECO",SCellContainerOut="SCell_ET_RECO") )
- cfg.merge(LArElecCalibDBSCCfg(inputFlags, condObjs=["Ramp","DAC2uA", "Pedestal", "uA2MeV", "MphysOverMcal", "OFC", "Shape", "HVScaleCorr"]))
+ cfg.merge(LArElecCalibDBSCCfg(flags, condObjs=["Ramp","DAC2uA", "Pedestal", "uA2MeV", "MphysOverMcal", "OFC", "Shape", "HVScaleCorr"]))
#return cfg
@@ -124,27 +124,27 @@ def LArSuperCellMonConfig(inputFlags, **kwargs):
lArCellMonAlg=CompFactory.LArSuperCellMonAlg(algname,CaloCellContainerReco="SCell_ET_RECO",doSCReco=True)
- if inputFlags.Input.isMC is False and not inputFlags.Common.isOnline:
+ if flags.Input.isMC is False and not flags.Common.isOnline:
from LumiBlockComps.LuminosityCondAlgConfig import LuminosityCondAlgCfg
- cfg.merge(LuminosityCondAlgCfg(inputFlags))
+ cfg.merge(LuminosityCondAlgCfg(flags))
from LumiBlockComps.LBDurationCondAlgConfig import LBDurationCondAlgCfg
- cfg.merge(LBDurationCondAlgCfg(inputFlags))
+ cfg.merge(LBDurationCondAlgCfg(flags))
from AthenaConfiguration.Enums import BeamType
- if inputFlags.Beam.Type is BeamType.Cosmics:
+ if flags.Beam.Type is BeamType.Cosmics:
algname=algname+'Cosmics'
- LArSuperCellMonConfigCore(helper, lArCellMonAlg, inputFlags,
- inputFlags.Beam.Type is BeamType.Cosmics,
- inputFlags.Input.isMC, algname, RemoveMasked=mask)
+ LArSuperCellMonConfigCore(helper, lArCellMonAlg, flags,
+ flags.Beam.Type is BeamType.Cosmics,
+ flags.Input.isMC, algname, RemoveMasked=mask)
cfg.merge(helper.result())
return cfg
-def LArSuperCellMonConfigCore(helper, algclass, inputFlags, isCosmics=False, isMC=False, algname='LArSuperCellMonAlg', RemoveMasked=True):
+def LArSuperCellMonConfigCore(helper, algclass, flags, isCosmics=False, isMC=False, algname='LArSuperCellMonAlg', RemoveMasked=True):
LArSuperCellMonAlg = helper.addAlgorithm(algclass, algname)
@@ -154,8 +154,8 @@ def LArSuperCellMonConfigCore(helper, algclass, inputFlags, isCosmics=False, isM
LArSuperCellMonAlg.MonGroupName = GroupName
LArSuperCellMonAlg.EnableLumi = False
- LArSuperCellMonAlg.CaloCellContainer = inputFlags.LAr.DT.ET_IDKey
- LArSuperCellMonAlg.CaloCellContainerRef = inputFlags.Trigger.L1.L1CaloSuperCellContainerName
+ LArSuperCellMonAlg.CaloCellContainer = flags.LAr.DT.ET_IDKey
+ LArSuperCellMonAlg.CaloCellContainerRef = flags.Trigger.L1.L1CaloSuperCellContainerName
LArSuperCellMonAlg.RemoveMasked = RemoveMasked
diff --git a/LArCalorimeter/LArROD/python/LArFebErrorSummaryMakerConfig.py b/LArCalorimeter/LArROD/python/LArFebErrorSummaryMakerConfig.py
index 67377e7c1030021df37e590ba5d1567b55e2c429..7403c404bdb525388d205940a9eb032639401b38 100644
--- a/LArCalorimeter/LArROD/python/LArFebErrorSummaryMakerConfig.py
+++ b/LArCalorimeter/LArROD/python/LArFebErrorSummaryMakerConfig.py
@@ -1,16 +1,16 @@
-# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
from AthenaConfiguration.ComponentFactory import CompFactory
from LArBadChannelTool.LArBadChannelConfig import LArBadFebCfg
from AthenaCommon.Logging import logging
from OutputStreamAthenaPool.OutputStreamConfig import addToESD
-def LArFebErrorSummaryMakerCfg(configFlags):
+def LArFebErrorSummaryMakerCfg(flags):
log = logging.getLogger('LArFebErrorSummaryMakerConfig')
- projectName=configFlags.Input.ProjectName
+ projectName=flags.Input.ProjectName
bCheckAllFEB=True
- streamName=configFlags.Input.ProcessingTags
+ streamName=flags.Input.ProcessingTags
if len(streamName) > 0 and len(streamName[0])>4 and streamName[0].endswith("PEB"):
log.info("StreamName %s suggests partial event building. Do not check for FEB completeness",str(streamName))
bCheckAllFEB=False
@@ -37,11 +37,11 @@ def LArFebErrorSummaryMakerCfg(configFlags):
# needed only if it is not in DB.
#lMaskFebZeroSample = [0x39618000,0x39930000,0x3b1b0000,0x38db0000,0x38f60000,0x39ae8000,0x3bb90000]
- acc = LArBadFebCfg(configFlags)
+ acc = LArBadFebCfg(flags)
minErrFeb=1
# In online or express processing, EventInfo::LArError is triggered if >=4 FEB with data corrupted
- if configFlags.Common.isOnline or configFlags.Common.doExpressProcessing:
+ if flags.Common.isOnline or flags.Common.doExpressProcessing:
minErrFeb=4
acc.addEventAlgo(CompFactory.LArFebErrorSummaryMaker("LArFebErrorSummaryMaker",CheckAllFEB=bCheckAllFEB,
@@ -52,28 +52,29 @@ def LArFebErrorSummaryMakerCfg(configFlags):
)
)
- acc.merge(addToESD(configFlags,["LArFebErrorSummary#LArFebErrorSummary",]))
+ acc.merge(addToESD(flags,["LArFebErrorSummary#LArFebErrorSummary",]))
return acc
if __name__=="__main__":
- from AthenaConfiguration.AllConfigFlags import ConfigFlags
+ from AthenaConfiguration.AllConfigFlags import initConfigFlags
from AthenaCommon.Logging import log
from AthenaCommon.Constants import DEBUG
log.setLevel(DEBUG)
from AthenaConfiguration.TestDefaults import defaultTestFiles
- ConfigFlags.Input.Files = defaultTestFiles.RAW_RUN2
- ConfigFlags.lock()
+ flags = initConfigFlags()
+ flags.Input.Files = defaultTestFiles.RAW_RUN2
+ flags.lock()
from AthenaConfiguration.MainServicesConfig import MainServicesCfg
from LArByteStream.LArRawDataReadingConfig import LArRawDataReadingCfg
- acc=MainServicesCfg(ConfigFlags)
- acc.merge(LArRawDataReadingCfg(ConfigFlags))
- acc.merge(LArFebErrorSummaryMakerCfg(ConfigFlags))
+ acc=MainServicesCfg(flags)
+ acc.merge(LArRawDataReadingCfg(flags))
+ acc.merge(LArFebErrorSummaryMakerCfg(flags))
acc.run(3)
diff --git a/LArCalorimeter/LArROD/python/LArRawChannelBuilderAlgConfig.py b/LArCalorimeter/LArROD/python/LArRawChannelBuilderAlgConfig.py
index cd43f47a796801a663bbd0d4a57a2df865c402b6..5f00491ffd936d032548f6dc0bde0d04454fdcd6 100644
--- a/LArCalorimeter/LArROD/python/LArRawChannelBuilderAlgConfig.py
+++ b/LArCalorimeter/LArROD/python/LArRawChannelBuilderAlgConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
from AthenaConfiguration.ComponentFactory import CompFactory
from AthenaConfiguration.Enums import LHCPeriod, ProductionStep
from LArRecUtils.LArADC2MeVCondAlgConfig import LArADC2MeVCondAlgCfg
@@ -6,21 +6,21 @@ from LArConfiguration.LArElecCalibDBConfig import LArElecCalibDBCfg
from LArRecUtils.LArRecUtilsConfig import LArOFCCondAlgCfg
from LArConfiguration.LArConfigFlags import RawChannelSource
-def LArRawChannelBuilderAlgCfg(configFlags, **kwargs):
+def LArRawChannelBuilderAlgCfg(flags, **kwargs):
- acc = LArADC2MeVCondAlgCfg(configFlags)
+ acc = LArADC2MeVCondAlgCfg(flags)
kwargs.setdefault("name", "LArRawChannelBuilder")
- kwargs.setdefault("firstSample", configFlags.LAr.ROD.nPreceedingSamples if configFlags.LAr.ROD.nPreceedingSamples!=0 else configFlags.LAr.ROD.FirstSample)
+ kwargs.setdefault("firstSample", flags.LAr.ROD.nPreceedingSamples if flags.LAr.ROD.nPreceedingSamples!=0 else flags.LAr.ROD.FirstSample)
obj = "AthenaAttributeList"
dspkey = 'Run2DSPThresholdsKey'
from IOVDbSvc.IOVDbSvcConfig import addFolders
- if configFlags.Input.isMC:
+ if flags.Input.isMC:
# need OFC configuration, which includes appropriate ElecCalibDb
- acc.merge(LArOFCCondAlgCfg(configFlags))
+ acc.merge(LArOFCCondAlgCfg(flags))
kwargs.setdefault("LArRawChannelKey", "LArRawChannels")
kwargs.setdefault("ShapeKey", "LArShapeSym")
- if configFlags.GeoModel.Run is LHCPeriod.Run1: # back to flat threshold
+ if flags.GeoModel.Run is LHCPeriod.Run1: # back to flat threshold
kwargs.setdefault("useDB", False)
dspkey = ''
else:
@@ -28,20 +28,20 @@ def LArRawChannelBuilderAlgCfg(configFlags, **kwargs):
sgkey=fld
dbString="OFLP200"
dbInstance="LAR_OFL"
- acc.merge(addFolders(configFlags,fld, dbInstance, className=obj, db=dbString))
+ acc.merge(addFolders(flags,fld, dbInstance, className=obj, db=dbString))
- if configFlags.Common.ProductionStep is ProductionStep.PileUpPresampling:
- kwargs.setdefault("LArDigitKey", configFlags.Overlay.BkgPrefix + "LArDigitContainer_MC")
+ if flags.Common.ProductionStep is ProductionStep.PileUpPresampling:
+ kwargs.setdefault("LArDigitKey", flags.Overlay.BkgPrefix + "LArDigitContainer_MC")
else:
kwargs.setdefault("LArDigitKey", "LArDigitContainer_MC")
else:
- acc.merge(LArElecCalibDBCfg(configFlags,("OFC","Shape","Pedestal")))
- if configFlags.Overlay.DataOverlay:
+ acc.merge(LArElecCalibDBCfg(flags,("OFC","Shape","Pedestal")))
+ if flags.Overlay.DataOverlay:
kwargs.setdefault("LArDigitKey", "LArDigitContainer_MC")
kwargs.setdefault("LArRawChannelKey", "LArRawChannels")
else:
kwargs.setdefault("LArRawChannelKey", "LArRawChannels_FromDigits")
- if 'COMP200' in configFlags.IOVDb.DatabaseInstance:
+ if 'COMP200' in flags.IOVDb.DatabaseInstance:
fld='/LAR/Configuration/DSPThreshold/Thresholds'
obj='LArDSPThresholdsComplete'
dspkey = 'Run1DSPThresholdsKey'
@@ -52,12 +52,12 @@ def LArRawChannelBuilderAlgCfg(configFlags, **kwargs):
sgkey=fld
dbString="CONDBR2"
dbInstance="LAR_ONL"
- acc.merge(addFolders(configFlags,fld, dbInstance, className=obj, db=dbString))
+ acc.merge(addFolders(flags,fld, dbInstance, className=obj, db=dbString))
if len (dspkey) > 0:
kwargs.setdefault(dspkey, sgkey)
- if configFlags.LAr.ROD.forceIter or configFlags.LAr.RawChannelSource is RawChannelSource.Calculated:
+ if flags.LAr.ROD.forceIter or flags.LAr.RawChannelSource is RawChannelSource.Calculated:
# iterative OFC procedure
kwargs.setdefault('minSample',2)
kwargs.setdefault('maxSample',12)
@@ -66,7 +66,7 @@ def LArRawChannelBuilderAlgCfg(configFlags, **kwargs):
kwargs.setdefault('defaultPhase',12)
nominalPeakSample=2
from LArConditionsCommon.LArRunFormat import getLArFormatForRun
- larformat=getLArFormatForRun(configFlags.Input.RunNumbers[0],connstring="COOLONL_LAR/"+configFlags.IOVDb.DatabaseInstance)
+ larformat=getLArFormatForRun(flags.Input.RunNumbers[0],connstring="COOLONL_LAR/"+flags.IOVDb.DatabaseInstance)
if larformat is not None:
nominalPeakSample = larformat.firstSample()
else:
@@ -87,26 +87,28 @@ def LArRawChannelBuilderAlgCfg(configFlags, **kwargs):
if __name__=="__main__":
- from AthenaConfiguration.AllConfigFlags import ConfigFlags
+ from AthenaConfiguration.AllConfigFlags import initConfigFlags
from AthenaCommon.Logging import log
from AthenaCommon.Constants import DEBUG
log.setLevel(DEBUG)
- from AthenaConfiguration.TestDefaults import defaultTestFiles
- ConfigFlags.Input.Files = defaultTestFiles.RAW_RUN2
+ from AthenaConfiguration.TestDefaults import defaultTestFiles, defaultGeometryTags
+ flags = initConfigFlags()
+ flags.Input.Files = defaultTestFiles.RAW_RUN2
+ flags.GeoModel.AtlasVersion = defaultGeometryTags.RUN2
# in case of testing iterative OFC:
- #ConfigFlags.Input.Files = ['/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/data15_1beam/data15_1beam.00260466.physics_L1Calo.merge.RAW._lb1380._SFO-ALL._0001.1']
- ConfigFlags.Input.isMC = False
- ConfigFlags.Detector.GeometryTile = False
- ConfigFlags.lock()
+ #flags.Input.Files = ['/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/data15_1beam/data15_1beam.00260466.physics_L1Calo.merge.RAW._lb1380._SFO-ALL._0001.1']
+ flags.Input.isMC = False
+ flags.Detector.GeometryTile = False
+ flags.lock()
from AthenaConfiguration.MainServicesConfig import MainServicesCfg
from LArByteStream.LArRawDataReadingConfig import LArRawDataReadingCfg
- acc=MainServicesCfg(ConfigFlags)
- acc.merge(LArRawDataReadingCfg(ConfigFlags))
- acc.merge(LArRawChannelBuilderAlgCfg(ConfigFlags))
+ acc=MainServicesCfg(flags)
+ acc.merge(LArRawDataReadingCfg(flags))
+ acc.merge(LArRawChannelBuilderAlgCfg(flags))
DumpLArRawChannels=CompFactory.DumpLArRawChannels
acc.addEventAlgo(DumpLArRawChannels(LArRawChannelContainerName="LArRawChannels_FromDigits",),sequenceName="AthAlgSeq")
diff --git a/LArCalorimeter/LArROD/python/LArRawChannelBuilderCrestConfig.py b/LArCalorimeter/LArROD/python/LArRawChannelBuilderCrestConfig.py
index f128874c2c6269bcefb975b46b46578289650a1c..a0ca925967bf0fecf3a96aed6bc553aabf7f1b1d 100644
--- a/LArCalorimeter/LArROD/python/LArRawChannelBuilderCrestConfig.py
+++ b/LArCalorimeter/LArROD/python/LArRawChannelBuilderCrestConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
from AthenaConfiguration.ComponentFactory import CompFactory
from AthenaConfiguration.Enums import LHCPeriod, ProductionStep
from LArRecUtils.LArADC2MeVCondAlgConfig import LArADC2MeVCondAlgCfg
@@ -6,21 +6,21 @@ from LArConfiguration.LArElecCalibDBConfig import LArElecCalibDBCfg
from LArRecUtils.LArRecUtilsConfig import LArOFCCondAlgCfg
from LArConfiguration.LArConfigFlags import RawChannelSource
-def LArRawChannelBuilderAlgCfg(configFlags, **kwargs):
+def LArRawChannelBuilderAlgCfg(flags, **kwargs):
- acc = LArADC2MeVCondAlgCfg(configFlags)
+ acc = LArADC2MeVCondAlgCfg(flags)
kwargs.setdefault("name", "LArRawChannelBuilder")
- kwargs.setdefault("firstSample", configFlags.LAr.ROD.FirstSample)
+ kwargs.setdefault("firstSample", flags.LAr.ROD.FirstSample)
obj = "AthenaAttributeList"
dspkey = 'Run2DSPThresholdsKey'
from IOVDbSvc.IOVDbSvcConfig import addFolders
- if configFlags.Input.isMC:
+ if flags.Input.isMC:
# need OFC configuration, which includes appropriate ElecCalibDb
- acc.merge(LArOFCCondAlgCfg(configFlags))
+ acc.merge(LArOFCCondAlgCfg(flags))
kwargs.setdefault("LArRawChannelKey", "LArRawChannels")
kwargs.setdefault("ShapeKey", "LArShapeSym")
- if configFlags.GeoModel.Run is LHCPeriod.Run1: # back to flat threshold
+ if flags.GeoModel.Run is LHCPeriod.Run1: # back to flat threshold
kwargs.setdefault("useDB", False)
dspkey = ''
else:
@@ -28,20 +28,20 @@ def LArRawChannelBuilderAlgCfg(configFlags, **kwargs):
sgkey=fld
dbString="OFLP200"
dbInstance="LAR_OFL"
- acc.merge(addFolders(configFlags,fld, dbInstance, className=obj, db=dbString))
+ acc.merge(addFolders(flags,fld, dbInstance, className=obj, db=dbString))
- if configFlags.Common.ProductionStep is ProductionStep.PileUpPresampling:
- kwargs.setdefault("LArDigitKey", configFlags.Overlay.BkgPrefix + "LArDigitContainer_MC")
+ if flags.Common.ProductionStep is ProductionStep.PileUpPresampling:
+ kwargs.setdefault("LArDigitKey", flags.Overlay.BkgPrefix + "LArDigitContainer_MC")
else:
kwargs.setdefault("LArDigitKey", "LArDigitContainer_MC")
else:
- acc.merge(LArElecCalibDBCfg(configFlags,("OFC","Shape","Pedestal")))
- if configFlags.Overlay.DataOverlay:
+ acc.merge(LArElecCalibDBCfg(flags,("OFC","Shape","Pedestal")))
+ if flags.Overlay.DataOverlay:
kwargs.setdefault("LArDigitKey", "LArDigitContainer_MC")
kwargs.setdefault("LArRawChannelKey", "LArRawChannels")
else:
kwargs.setdefault("LArRawChannelKey", "LArRawChannels_FromDigits")
- if 'COMP200' in configFlags.IOVDb.DatabaseInstance:
+ if 'COMP200' in flags.IOVDb.DatabaseInstance:
fld='/LAR/Configuration/DSPThreshold/Thresholds'
obj='LArDSPThresholdsComplete'
dspkey = 'Run1DSPThresholdsKey'
@@ -52,11 +52,11 @@ def LArRawChannelBuilderAlgCfg(configFlags, **kwargs):
sgkey=fld
dbString="CONDBR2"
dbInstance="LAR_ONL"
- acc.merge(addFolders(configFlags,fld, dbInstance, className=obj, db=dbString))
+ acc.merge(addFolders(flags,fld, dbInstance, className=obj, db=dbString))
kwargs.setdefault(dspkey, sgkey)
- if configFlags.LAr.ROD.forceIter or configFlags.LAr.RawChannelSource is RawChannelSource.Calculated:
+ if flags.LAr.ROD.forceIter or flags.LAr.RawChannelSource is RawChannelSource.Calculated:
# iterative OFC procedure
kwargs.setdefault('minSample',2)
kwargs.setdefault('maxSample',12)
@@ -65,7 +65,7 @@ def LArRawChannelBuilderAlgCfg(configFlags, **kwargs):
kwargs.setdefault('defaultPhase',12)
nominalPeakSample=2
from LArConditionsCommon.LArRunFormat import getLArFormatForRun
- larformat=getLArFormatForRun(configFlags.Input.RunNumbers[0],connstring="COOLONL_LAR/"+configFlags.IOVDb.DatabaseInstance)
+ larformat=getLArFormatForRun(flags.Input.RunNumbers[0],connstring="COOLONL_LAR/"+flags.IOVDb.DatabaseInstance)
if larformat is not None:
nominalPeakSample = larformat.firstSample()
else:
@@ -86,26 +86,27 @@ def LArRawChannelBuilderAlgCfg(configFlags, **kwargs):
if __name__=="__main__":
- from AthenaConfiguration.AllConfigFlags import ConfigFlags
+ from AthenaConfiguration.AllConfigFlags import initConfigFlags
from AthenaCommon.Logging import log
from AthenaCommon.Constants import DEBUG
log.setLevel(DEBUG)
from AthenaConfiguration.TestDefaults import defaultTestFiles
- ConfigFlags.Input.Files = defaultTestFiles.RAW_RUN2
+ flags = initConfigFlags()
+ flags.Input.Files = defaultTestFiles.RAW_RUN2
# in case of testing iterative OFC:
- #ConfigFlags.Input.Files = ['/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/data15_1beam/data15_1beam.00260466.physics_L1Calo.merge.RAW._lb1380._SFO-ALL._0001.1']
- ConfigFlags.Input.isMC = False
- ConfigFlags.Detector.GeometryTile = False
- ConfigFlags.lock()
+ #flags.Input.Files = ['/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/data15_1beam/data15_1beam.00260466.physics_L1Calo.merge.RAW._lb1380._SFO-ALL._0001.1']
+ flags.Input.isMC = False
+ flags.Detector.GeometryTile = False
+ flags.lock()
from AthenaConfiguration.MainServicesConfig import MainServicesCfg
from LArByteStream.LArRawDataReadingConfig import LArRawDataReadingCfg
- acc=MainServicesCfg(ConfigFlags)
- acc.merge(LArRawDataReadingCfg(ConfigFlags))
- acc.merge(LArRawChannelBuilderAlgCfg(ConfigFlags))
+ acc=MainServicesCfg(flags)
+ acc.merge(LArRawDataReadingCfg(flags))
+ acc.merge(LArRawChannelBuilderAlgCfg(flags))
DumpLArRawChannels=CompFactory.DumpLArRawChannels
acc.addEventAlgo(DumpLArRawChannels(LArRawChannelContainerName="LArRawChannels_FromDigits",),sequenceName="AthAlgSeq")
diff --git a/LArCalorimeter/LArRecUtils/python/LArADC2MeVCondAlgConfig.py b/LArCalorimeter/LArRecUtils/python/LArADC2MeVCondAlgConfig.py
index fc880a0057d4367d72902aaa9b64d21f3a63e879..cedb7f25042d6f3ae0c204290020e634432d4040 100644
--- a/LArCalorimeter/LArRecUtils/python/LArADC2MeVCondAlgConfig.py
+++ b/LArCalorimeter/LArRecUtils/python/LArADC2MeVCondAlgConfig.py
@@ -1,24 +1,20 @@
-# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
-
-from __future__ import print_function
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from AthenaConfiguration.ComponentFactory import CompFactory
-def LArADC2MeVCondAlgCfg(configFlags):
+def LArADC2MeVCondAlgCfg(flags):
from LArCabling.LArCablingConfig import LArOnOffIdMappingCfg
from LArConfiguration.LArElecCalibDBConfig import LArElecCalibDBCfg
from LArGeoAlgsNV.LArGMConfig import LArGMCfg
result=ComponentAccumulator()
- result.merge(LArOnOffIdMappingCfg(configFlags))
- result.merge(LArGMCfg(configFlags)) #Needed for identifier helpers
+ result.merge(LArOnOffIdMappingCfg(flags))
+ result.merge(LArGMCfg(flags)) #Needed for identifier helpers
theADC2MeVCondAlg=CompFactory.LArADC2MeVCondAlg(LArADC2MeVKey = 'LArADC2MeV')
-
- isMC=configFlags.Input.isMC
- if isMC:
+ if flags.Input.isMC:
requiredConditions=["Ramp","DAC2uA","uA2MeV","MphysOverMcal","HVScaleCorr"]
theADC2MeVCondAlg.LAruA2MeVKey="LAruA2MeVSym"
theADC2MeVCondAlg.LArDAC2uAKey="LArDAC2uASym"
@@ -29,23 +25,24 @@ def LArADC2MeVCondAlgCfg(configFlags):
else: # not MC:
requiredConditions=["Ramp","DAC2uA","uA2MeV","MphysOverMcal","HVScaleCorr"]
from LArRecUtils.LArFebConfigCondAlgConfig import LArFebConfigCondAlgCfg
- if 'COMP200' in configFlags.IOVDb.DatabaseInstance: # Run1 case
+ if 'COMP200' in flags.IOVDb.DatabaseInstance: # Run1 case
theADC2MeVCondAlg.LAruA2MeVKey="LAruA2MeVSym"
theADC2MeVCondAlg.LArDAC2uAKey="LArDAC2uASym"
- result.merge(LArFebConfigCondAlgCfg(configFlags))
+ result.merge(LArFebConfigCondAlgCfg(flags))
- result.merge(LArElecCalibDBCfg(configFlags,requiredConditions))
+ result.merge(LArElecCalibDBCfg(flags,requiredConditions))
result.addCondAlgo(theADC2MeVCondAlg,primary=True)
return result
if __name__ == "__main__":
from AthenaConfiguration.AllConfigFlags import initConfigFlags
- from AthenaConfiguration.TestDefaults import defaultTestFiles
+ from AthenaConfiguration.TestDefaults import defaultTestFiles, defaultGeometryTags
print ('--- data')
flags1 = initConfigFlags()
flags1.Input.Files = defaultTestFiles.RAW_RUN2
+ flags1.GeoModel.AtlasVersion = defaultGeometryTags.RUN2
flags1.lock()
acc1 = LArADC2MeVCondAlgCfg (flags1)
acc1.printCondAlgs(summariseProps=True)
@@ -55,6 +52,7 @@ if __name__ == "__main__":
print ('--- mc')
flags2 = initConfigFlags()
flags2.Input.Files = defaultTestFiles.ESD
+ flags2.GeoModel.AtlasVersion = defaultGeometryTags.RUN2
flags2.lock()
acc2 = LArADC2MeVCondAlgCfg (flags2)
acc2.printCondAlgs(summariseProps=True)
diff --git a/LArCalorimeter/LArRecUtils/python/LArADC2MeVSCCondAlgConfig.py b/LArCalorimeter/LArRecUtils/python/LArADC2MeVSCCondAlgConfig.py
index 89657f0c45534dabebe0b9690e6d33abed2a85fe..5307ed2c1ca1f8066523c195cd735c442f0b7c10 100644
--- a/LArCalorimeter/LArRecUtils/python/LArADC2MeVSCCondAlgConfig.py
+++ b/LArCalorimeter/LArRecUtils/python/LArADC2MeVSCCondAlgConfig.py
@@ -1,22 +1,20 @@
-# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from AthenaConfiguration.ComponentFactory import CompFactory
-def LArADC2MeVSCCondAlgCfg(configFlags):
+def LArADC2MeVSCCondAlgCfg(flags):
from LArConfiguration.LArElecCalibDBConfig import LArElecCalibDBCfg, LArElecCalibDBMCSCCfg
from LArGeoAlgsNV.LArGMConfig import LArGMCfg
result=ComponentAccumulator()
from LArCabling.LArCablingConfig import LArOnOffIdMappingSCCfg
- result.merge(LArOnOffIdMappingSCCfg(configFlags))
- result.merge(LArGMCfg(configFlags)) #Needed for identifier helpers
+ result.merge(LArOnOffIdMappingSCCfg(flags))
+ result.merge(LArGMCfg(flags)) #Needed for identifier helpers
theADC2MeVCondAlg=CompFactory.LArADC2MeVCondAlg(name = "LArADC2MeVSCCondAlg", LArADC2MeVKey = 'LArADC2MeVSC')
- isMC=configFlags.Input.isMC
-
- if isMC:
+ if flags.Input.isMC:
requiredConditions=["RampSC","DAC2uASC","uA2MeVSC"]
theADC2MeVCondAlg.LAruA2MeVKey="LAruA2MeVSC"
theADC2MeVCondAlg.LArDAC2uAKey="LArDAC2uASC"
@@ -26,26 +24,27 @@ def LArADC2MeVSCCondAlgCfg(configFlags):
theADC2MeVCondAlg.UseFEBGainTresholds=False
theADC2MeVCondAlg.LArOnOffIdMappingKey="LArOnOffIdMapSC"
theADC2MeVCondAlg.isSuperCell=True
- result.merge(LArElecCalibDBMCSCCfg(configFlags,requiredConditions))
+ result.merge(LArElecCalibDBMCSCCfg(flags,requiredConditions))
else: # not MC:
requiredConditions=["Ramp","DAC2uA","uA2MeV","MphysOverMcal","HVScaleCorr"]
from LArRecUtils.LArFebConfigCondAlgConfig import LArFebConfigCondAlgCfg
- if 'COMP200' in configFlags.IOVDb.DatabaseInstance: # Run1 case
+ if 'COMP200' in flags.IOVDb.DatabaseInstance: # Run1 case
theADC2MeVCondAlg.LAruA2MeVKey="LAruA2MeVSC"
theADC2MeVCondAlg.LArDAC2uAKey="LArDAC2uASC"
- result.merge(LArFebConfigCondAlgCfg(configFlags))
- result.merge(LArElecCalibDBCfg(configFlags,requiredConditions))
+ result.merge(LArFebConfigCondAlgCfg(flags))
+ result.merge(LArElecCalibDBCfg(flags,requiredConditions))
result.addCondAlgo(theADC2MeVCondAlg,primary=True)
return result
if __name__ == "__main__":
from AthenaConfiguration.AllConfigFlags import initConfigFlags
- from AthenaConfiguration.TestDefaults import defaultTestFiles
+ from AthenaConfiguration.TestDefaults import defaultTestFiles, defaultGeometryTags
print ('--- data')
flags1 = initConfigFlags()
flags1.Input.Files = defaultTestFiles.RAW_RUN2
+ flags1.GeoModel.AtlasVersion = defaultGeometryTags.RUN2
flags1.lock()
acc1 = LArADC2MeVSCCondAlgCfg (flags1)
acc1.printCondAlgs(summariseProps=True)
@@ -55,6 +54,7 @@ if __name__ == "__main__":
print ('--- mc')
flags2 = initConfigFlags()
flags2.Input.Files = defaultTestFiles.ESD
+ flags2.GeoModel.AtlasVersion = defaultGeometryTags.RUN2
flags2.lock()
acc2 = LArADC2MeVSCCondAlgCfg (flags2)
diff --git a/LArCalorimeter/LArTest/LArEventTest/python/LArRawChannelDump.py b/LArCalorimeter/LArTest/LArEventTest/python/LArRawChannelDump.py
index a4b075b92dbacc83a42f2329011c6912999b80e1..0c619d6b6834edd5bea4a4ec0cbd64b4a74ab98b 100644
--- a/LArCalorimeter/LArTest/LArEventTest/python/LArRawChannelDump.py
+++ b/LArCalorimeter/LArTest/LArEventTest/python/LArRawChannelDump.py
@@ -3,21 +3,21 @@ from AthenaConfiguration.ComponentFactory import CompFactory
if __name__ == "__main__":
- from AthenaConfiguration.AllConfigFlags import ConfigFlags
-
- ConfigFlags.Input.Files = ["myRDO.pool.root",]
- ConfigFlags.lock()
+ from AthenaConfiguration.AllConfigFlags import initConfigFlags
+ flags = initConfigFlags()
+ flags.Input.Files = ["myRDO.pool.root",]
+ flags.lock()
from AthenaConfiguration.MainServicesConfig import MainServicesCfg
from AthenaPoolCnvSvc.PoolReadConfig import PoolReadCfg
- cfg=MainServicesCfg(ConfigFlags)
- cfg.merge(PoolReadCfg(ConfigFlags))
+ cfg=MainServicesCfg(flags)
+ cfg.merge(PoolReadCfg(flags))
from LArGeoAlgsNV.LArGMConfig import LArGMCfg
- cfg.merge(LArGMCfg(ConfigFlags))
+ cfg.merge(LArGMCfg(flags))
from LArCabling.LArCablingConfig import LArOnOffIdMappingCfg
- cfg.merge(LArOnOffIdMappingCfg(ConfigFlags))
+ cfg.merge(LArOnOffIdMappingCfg(flags))
cfg.addEventAlgo(CompFactory.DumpLArRawChannels(NtupStream="LARRC",OutputFileName="",ToLog=False))
cfg.addService(CompFactory.THistSvc(Output = ["LARRC DATAFILE='LARRC.root', OPT='RECREATE'"]))