Merge branch 'sweep_24.0_main_2024-09-25' into 'main'

2024-09-25: merge of 24.0 into main

See merge request !74515

InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/python/TRTCalib_calib_Skeleton.py

@@ -47,10 +47,17 @@ def fromRunArgs(runArgs):
     nextstep("Renaming *straw.txt and *tracktuple.root files for the final output")
     ##################################################################################################   
     
-    command  = "mv -v %s %s.merged.straw.txt; " % (glob.glob("*.merged.straw.txt")[0],outputFile)
-    command += "mv -v %s %s.tracktuple.root; " % (glob.glob("*.tracktuple.root")[0],outputFile)
+    listOfStrawFiles = glob.glob("*.merged.straw.txt")
+    listOfTrackFiles = glob.glob("*.tracktuple.root")
     
-    # tryError(command, "Renaming *straw.txt and *tracktuple.root files\n")
+    if not listOfStrawFiles or not listOfTrackFiles:
+        print("ERROR: Empty array of \"*.merged.straw.txt\" (size %d) or \"*.tracktuple.root\" (size %d) files" % (len(listOfStrawFiles), len(listOfTrackFiles)))
+        exit(1)
+    
+    command  = "mv -v %s %s.merged.straw.txt; " % (listOfStrawFiles[0],outputFile)
+    command += "mv -v %s %s.tracktuple.root; " % (listOfTrackFiles[0],outputFile)
+    
+    tryError(command, "Renaming *straw.txt and *tracktuple.root files\n")
     
     ##################################################################################################
     nextstep("Calculating constants ATHENA")
@@ -82,7 +89,6 @@ def fromRunArgs(runArgs):
                 sys.exit(e.errno)
           
         if (not runArgs.project or not runArgs.runnr or not runArgs.stream):
-            # This part is under testing, will be further developed
             print("ERROR: Raw file not provided, project=\"%s\" or runNumber=\"%s\" or stream=\"%s\" missing..." % (runArgs.project, runArgs.runnr, runArgs.stream))
             print("Provide them!")
             sys.exit(1)

LArCalorimeter/LArCalibTools/share/LArHV2Ntuple.py

+#!/bin/env python
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+
+from AthenaConfiguration.ComponentFactory import CompFactory
+
+
+if __name__=='__main__':
+
+  import os,sys
+  import argparse
+
+  # now process the CL options and assign defaults
+  parser = argparse.ArgumentParser(formatter_class=argparse.ArgumentDefaultsHelpFormatter)
+  parser.add_argument('-s','--stime', dest='time', default=1726837122, help='TimeStamp (in s)', type=int)
+  parser.add_argument('-r','--run', dest='run', default=999999, help='Run Number', type=int)
+  parser.add_argument('-t','--tag',dest='dbtag',default=None,help="Global conditions tag", type=str)
+  parser.add_argument('-o','--out', dest='out', default="LArHV.root", help='Output root file', type=str)
+
+  args = parser.parse_args()
+  if help in args and args.help is not None and args.help:
+    parser.print_help()
+    sys.exit(0)
+
+ 
+  from AthenaConfiguration.AllConfigFlags import initConfigFlags
+  flags=initConfigFlags()
+   
+  flags.Input.RunNumbers=[args.run]
+  from AthenaConfiguration.TestDefaults import defaultGeometryTags
+  flags.GeoModel.AtlasVersion=defaultGeometryTags.RUN3
+
+  flags.Input.Files=[]
+
+  flags.Input.isMC=False
+
+  flags.LAr.doAlign=False
+
+  from AthenaConfiguration.Enums import LHCPeriod
+  if flags.Input.RunNumbers[0] < 222222:
+    #Set to run1 for early run-numbers
+    flags.GeoModel.Run=LHCPeriod.Run1 
+    flags.IOVDb.DatabaseInstance="OFLP200" if flags.Input.isMC else "COMP200" 
+  else:
+    flags.GeoModel.Run=LHCPeriod.Run2
+    flags.IOVDb.DatabaseInstance="OFLP200" if flags.Input.isMC else "CONDBR2"
+
+  if args.dbtag:
+    flags.IOVDb.GlobalTag=args.dbtag
+  elif flags.IOVDb.DatabaseInstance == "COMP200":
+    flags.IOVDb.GlobalTag="COMCOND-BLKPA-RUN1-09"
+  else: 
+    flags.IOVDb.GlobalTag="CONDBR2-BLKPA-2024-03"
+
+
+  flags.lock()
+  
+  from AthenaConfiguration.MainServicesConfig import MainServicesCfg
+  cfg=MainServicesCfg(flags)
+
+  #MC Event selector since we have no input data file
+  from McEventSelector.McEventSelectorConfig import McEventSelectorCfg
+  cfg.merge(McEventSelectorCfg(flags,
+                               EventsPerRun      = 1,
+                               FirstEvent	      = 1,
+                               InitialTimeStamp  = args.time,
+                               TimeStampInterval = 1))
+
+
+
+  from LArCalibUtils.LArHVScaleConfig import LArHVScaleCfg
+  cfg.merge(LArHVScaleCfg(flags))
+    
+  
+  cfg.addEventAlgo(CompFactory.LArHV2Ntuple())
+
+
+  rootfile=args.out
+  if os.path.exists(rootfile):
+    os.remove(rootfile)
+  cfg.addService(CompFactory.THistSvc(Output = [ "file1 DATAFILE='"+rootfile+"' TYP='ROOT' OPT='RECREATE'" ]))
+  cfg.setAppProperty("HistogramPersistency","ROOT")
+
+  cfg.run(1)
+  sys.exit(0)

Simulation/Tests/DigitizationTests/test/test_Digi_tf_RUN4_neutrinos_mu200.sh

@@ -4,7 +4,6 @@
 # art-type: grid
 # art-architecture:  '#x86_64-intel'
 # art-memory: 4096
-# art-include: 24.0/Athena
 # art-include: main/Athena
 # art-output: RUN4_neutrinos.mu200.RDO.pool.root
 # art-output: RDOAnalysis.root

Simulation/Tests/DigitizationTests/test/test_Digi_tf_RUN4_presampling_mu1.sh

@@ -4,7 +4,6 @@
 # art-type: grid
 # art-architecture:  '#x86_64-intel'
 # art-memory: 3999
-# art-include: 24.0/Athena
 # art-include: main/Athena
 # art-output: RUN4_presampling.mu1.RDO.pool.root
 # art-output: RDOAnalysis.root

Simulation/Tests/DigitizationTests/test/test_Digi_tf_RUN4_presampling_mu140.sh

@@ -4,7 +4,6 @@
 # art-type: grid
 # art-architecture:  '#x86_64-intel'
 # art-memory: 4096
-# art-include: 24.0/Athena
 # art-include: main/Athena
 # art-output: RUN4_presampling.mu140.RDO.pool.root
 # art-output: RDOAnalysis.root

Simulation/Tests/DigitizationTests/test/test_Digi_tf_RUN4_presampling_mu200.sh

@@ -4,7 +4,6 @@
 # art-type: grid
 # art-architecture:  '#x86_64-intel'
 # art-memory: 4096
-# art-include: 24.0/Athena
 # art-include: main/Athena
 # art-output: RUN4_presampling.mu200.RDO.pool.root
 # art-output: RDOAnalysis.root

Simulation/Tests/DigitizationTests/test/test_Digi_tf_RUN4_presampling_mu60.sh

@@ -4,7 +4,6 @@
 # art-type: grid
 # art-architecture:  '#x86_64-intel'
 # art-memory: 3999
-# art-include: 24.0/Athena
 # art-include: main/Athena
 # art-output: RUN4_presampling.mu60.RDO.pool.root
 # art-output: RDOAnalysis.root

Simulation/Tests/DigitizationTests/test/test_Digi_tf_RUN4_presampling_muMC21a.sh

@@ -4,7 +4,6 @@
 # art-type: grid
 # art-architecture:  '#x86_64-intel'
 # art-memory: 3999
-# art-include: 24.0/Athena
 # art-include: main/Athena
 # art-output: RUN4_presampling.muMC21a.RDO.pool.root
 # art-output: RDOAnalysis.root

Simulation/Tests/DigitizationTests/test/test_Digi_tf_RUN4_single_muon_no_pileup.sh

@@ -4,7 +4,6 @@
 # art-type: grid
 # art-architecture:  '#x86_64-intel'
 # art-memory: 3999
-# art-include: 24.0/Athena
 # art-include: main/Athena
 # art-output: RUN4_muons.RDO.pool.root
 # art-output: RDOAnalysis.root

Simulation/Tests/DigitizationTests/test/test_Digi_tf_RUN4_ttbar_mu140.sh

@@ -4,7 +4,6 @@
 # art-type: grid
 # art-architecture:  '#x86_64-intel'
 # art-memory: 4096
-# art-include: 24.0/Athena
 # art-include: main/Athena
 # art-output: RUN4_ttbar.mu140.RDO.pool.root
 # art-output: RDOAnalysis.root

Simulation/Tests/DigitizationTests/test/test_Digi_tf_RUN4_ttbar_mu1_inTimeTruth.sh

@@ -4,7 +4,6 @@
 # art-type: grid
 # art-architecture:  '#x86_64-intel'
 # art-memory: 3999
-# art-include: 24.0/Athena
 # art-include: main/Athena
 # art-output: RUN4_ttbar.puTruth.RDO.pool.root
 # art-output: RDOAnalysis.root

Simulation/Tests/DigitizationTests/test/test_Digi_tf_RUN4_ttbar_mu200.sh

@@ -4,7 +4,6 @@
 # art-type: grid
 # art-architecture:  '#x86_64-intel'
 # art-memory: 4096
-# art-include: 24.0/Athena
 # art-include: main/Athena
 # art-output: RUN4_ttbar.mu200.RDO.pool.root
 # art-output: RDOAnalysis.root

Simulation/Tests/DigitizationTests/test/test_Digi_tf_RUN4_ttbar_mu60.sh

@@ -4,7 +4,6 @@
 # art-type: grid
 # art-architecture:  '#x86_64-intel'
 # art-memory: 3999
-# art-include: 24.0/Athena
 # art-include: main/Athena
 # art-output: RUN4_ttbar.mu60.RDO.pool.root
 # art-output: RDOAnalysis.root

Simulation/Tests/DigitizationTests/test/test_Digi_tf_RUN4_ttbar_muMC21a.sh

@@ -4,7 +4,6 @@
 # art-type: grid
 # art-architecture:  '#x86_64-intel'
 # art-memory: 3999
-# art-include: 24.0/Athena
 # art-include: main/Athena
 # art-output: RUN4_ttbar.muMC21a.RDO.pool.root
 # art-output: RDOAnalysis.root

Simulation/Tests/DigitizationTests/test/test_Digi_tf_RUN4_ttbar_no_pileup.sh

@@ -4,7 +4,6 @@
 # art-type: grid
 # art-architecture:  '#x86_64-intel'
 # art-memory: 3999
-# art-include: 24.0/Athena
 # art-include: main/Athena
 # art-output: RUN4_ttbar.RDO.pool.root
 # art-output: RDOAnalysis.root

Simulation/Tests/DigitizationTestsMT/test/test_Digi_tf_RUN4_MP_presampling_reproducibility.sh

@@ -4,7 +4,6 @@
 # art-type: grid
 # art-architecture:  '#x86_64-intel'
 # art-athena-mt: 8
-# art-include: 24.0/Athena
 # art-include: main/Athena
 # art-output: RUN4_presampling_SP.RDO.pool.root
 # art-output: RUN4_presampling_MP_fork_evt0.RDO.pool.root
@@ -68,7 +67,7 @@ Digi_tf.py \
 --multiprocess --athenaMPEventsBeforeFork 0 \
 --CA \
 --PileUpPresampling True \
---conditionsTag default:OFLCOND-MC15c-SDR-14-05 \
+--conditionsTag default:OFLCOND-MC21-SDR-RUN4-02 \
 --digiSeedOffset1 170 --digiSeedOffset2 170 \
 --digiSteeringConf 'StandardSignalOnlyTruth' \
 --geometryVersion default:${geotag} \
@@ -93,7 +92,7 @@ Digi_tf.py \
 --multiprocess --athenaMPEventsBeforeFork 1 \
 --CA \
 --PileUpPresampling True \
---conditionsTag default:OFLCOND-MC15c-SDR-14-05 \
+--conditionsTag default:OFLCOND-MC21-SDR-RUN4-02 \
 --digiSeedOffset1 170 --digiSeedOffset2 170 \
 --digiSteeringConf 'StandardSignalOnlyTruth' \
 --geometryVersion default:${geotag} \

Simulation/Tests/DigitizationTestsMT/test/test_Digi_tf_RUN4_MP_ttbar_reproducibility.sh

@@ -4,7 +4,6 @@
 # art-type: grid
 # art-architecture:  '#x86_64-intel'
 # art-athena-mt: 8
-# art-include: 24.0/Athena
 # art-include: main/Athena
 # art-output: RUN4_ttbar_SP.RDO.pool.root
 # art-output: RUN4_ttbar_MP_fork_evt0.RDO.pool.root
@@ -62,7 +61,7 @@ echo "art-result: $rc1 RDOMerge_tf.py SP"
 Digi_tf.py \
 --multiprocess --athenaMPEventsBeforeFork 0 \
 --CA \
---conditionsTag default:OFLCOND-MC15c-SDR-14-05 \
+--conditionsTag default:OFLCOND-MC21-SDR-RUN4-02 \
 --digiSeedOffset1 170 --digiSeedOffset2 170 \
 --digiSteeringConf 'StandardSignalOnlyTruth' \
 --geometryVersion default:${geotag} \
@@ -86,7 +85,7 @@ echo "art-result: $rc2 Digi_tf.py MP fork after 0"
 Digi_tf.py \
 --multiprocess --athenaMPEventsBeforeFork 1 \
 --CA \
---conditionsTag default:OFLCOND-MC15c-SDR-14-05 \
+--conditionsTag default:OFLCOND-MC21-SDR-RUN4-02 \
 --digiSeedOffset1 170 --digiSeedOffset2 170 \
 --digiSteeringConf 'StandardSignalOnlyTruth' \
 --geometryVersion default:${geotag} \

Simulation/Tests/DigitizationTestsMT/test/test_Digi_tf_RUN4_MT_presampling.sh

@@ -4,7 +4,6 @@
 # art-type: grid
 # art-architecture:  '#x86_64-intel'
 # art-athena-mt: 8
-# art-include: 24.0/Athena
 # art-include: main/Athena
 # art-output: RUN4_presampling_MT.RDO.pool.root
 

Simulation/Tests/DigitizationTestsMT/test/test_Digi_tf_RUN4_MT_presampling_ITkPixel.sh

@@ -4,7 +4,6 @@
 # art-type: grid
 # art-architecture:  '#x86_64-intel'
 # art-athena-mt: 8
-# art-include: 24.0/Athena
 # art-include: main/Athena
 # art-output: RUN4_presampling_MT.RDO.pool.root
 

Trigger/TrigT1/TrigT1CaloByteStream/python/LVL1CaloRun2ByteStreamConfig.py

@@ -131,6 +131,10 @@ def LVL1CaloRun2ReadBSCfg(flags, forRoIBResultToxAOD=False):
 
     acc.merge(ByteStreamReadCfg(flags, type_names=typeNamesToDecode))
 
+    # need to set UseSWROD property of the decoder tools that are sensitive to it (crates 6 and 7) ....
+    acc.addPublicTool(CompFactory.LVL1BS.RodHeaderByteStreamTool("RodHeaderByteStreamTool",UseSWROD=(flags.Input.DataYear>=2024)))
+    acc.addPublicTool(CompFactory.LVL1BS.PpmByteStreamReadV1V2Tool("PpmByteStreamReadV1V2Tool",UseSWROD=(flags.Input.DataYear>=2024)))
+
     if flags.Trigger.Online.isPartition:
         acc.merge(readOnlyToolsForRerunLVL1(flags))