AtlasGeometryCommon/CrackRegionGeoModel/CMakeLists.txt

@@ -9,6 +9,7 @@ find_package( GeoModel COMPONENTS GeoModelKernel GeoModelDBManager GeoModelRead)
 atlas_add_library( CrackRegionGeoModel
 		   src/*.cxx
 		   PUBLIC_HEADERS CrackRegionGeoModel
+		   INCLUDE_DIRS ${GEOMODEL_INCLUDE_DIRS}
 		   LINK_LIBRARIES ${GEOMODEL_LIBRARIES}
 		   PRIVATE_LINK_LIBRARIES GaudiKernel GeoModelUtilities StoreGateLib RDBAccessSvcLib )
 

AtlasGeometryCommon/GeoModelEnvelopes/CMakeLists.txt

@@ -10,4 +10,5 @@ find_package( GeoModel COMPONENTS GeoModelKernel )
 atlas_add_component( GeoModelEnvelopes
                      src/*.cxx
                      src/components/*.cxx
+		     INCLUDE_DIRS ${GEOMODEL_INCLUDE_DIRS}
                      LINK_LIBRARIES ${GEOMODEL_LIBRARIES} AthenaKernel GaudiKernel GeoModelInterfaces GeoModelUtilities SGTools StoreGateLib )

AtlasTest/CITest/Athena.cmake

@@ -246,10 +246,6 @@ atlas_add_citest( ACTS_Workflow_FastTracking
    SCRIPT ActsWorkflowFastTracking.sh
    LOG_IGNORE_PATTERN "ActsTrackFindingAlg.*ERROR Propagation reached the step count limit|ActsTrackFindingAlg.*ERROR Propagation failed: PropagatorError:3 Propagation reached the configured maximum number of steps with the initial parameters|ActsTrackFindingAlg.*ERROR CombinatorialKalmanFilter failed: CombinatorialKalmanFilterError:5 Propagation reaches max steps before track finding is finished with the initial parameters" )
  
-atlas_add_citest( Acts_Workflow_Conversion
-   SCRIPT ActsConversionWorkflow.sh
-   LOG_IGNORE_PATTERN "ActsTrackFindingAlg.*ERROR Propagation reached the step count limit|ActsTrackFindingAlg.*ERROR Propagation failed: PropagatorError:3 Propagation reached the configured maximum number of steps with the initial parameters|ActsTrackFindingAlg.*ERROR CombinatorialKalmanFilter failed: CombinatorialKalmanFilterError:5 Propagation reaches max steps before track finding is finished with the initial parameters" )
-
  atlas_add_citest( ACTS_Workflow_HeavyIons
    SCRIPT ActsWorkflowHeavyIons.sh
    LOG_IGNORE_PATTERN "ActsTrackFindingAlg.*ERROR Propagation reached the step count limit|ActsTrackFindingAlg.*ERROR Propagation failed: PropagatorError:3 Propagation reached the configured maximum number of steps with the initial parameters|ActsTrackFindingAlg.*ERROR CombinatorialKalmanFilter failed: CombinatorialKalmanFilterError:5 Propagation reaches max steps before track finding is finished with the initial parameters" )

Calorimeter/CaloTools/python/CaloNoiseCondAlg.py

+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+from AthenaCommon.AlgSequence import AthSequencer
+from IOVDbSvc.CondDB import conddb
+from AthenaCommon.Logging import logging 
+
+
+def CaloNoiseCondAlg(noisetype="totalNoise"):
+    if noisetype not in ("electronicNoise","pileupNoise","totalNoise"):
+        raise RuntimeError("Requested noise of unknown type %s" % noisetype)
+
+
+    noiseAlgName="Calo_"+noisetype+"Alg"
+    condSeq = AthSequencer("AthCondSeq")
+
+    if hasattr (condSeq,noiseAlgName):
+        return getattr(condSeq,noiseAlgName)
+ 
+    if (conddb.isMC):
+        alg = _CaloNoiseCondAlgMC(noiseAlgName,noisetype)
+    else: 
+        alg = _CaloNoiseCondAlgData(noiseAlgName,noisetype)
+    condSeq += alg
+    return alg
+
+
+def _CaloNoiseCondAlgMC(noiseAlgName,noisetype):
+    mlog = logging.getLogger('CaloNoiseCondMC')
+
+    from CaloTools.CaloToolsConf import CaloNoiseCondAlg 
+    theCaloNoiseAlg=CaloNoiseCondAlg(noiseAlgName,OutputKey=noisetype)
+    from CaloTools.CaloNoiseFlags import jobproperties
+    if jobproperties.CaloNoiseFlags.FixedLuminosity() >= 0 :
+        theCaloNoiseAlg.Luminosity=jobproperties.CaloNoiseFlags.FixedLuminosity()
+        mlog.info("  Luminosity (in 10**33) units used for pileup noise from CaloNoiseFlags : %f", theCaloNoiseAlg.Luminosity)
+    else:
+        if jobproperties.CaloNoiseFlags.UseCaloLuminosity():
+            lumiFolder='/CALO/Ofl/Noise/PileUpNoiseLumi'
+            conddb.addFolder('CALO_OFL',lumiFolder,className="CondAttrListCollection")
+            mlog.info("offline mode: use luminosity from /CALO/Ofl/Noise/PileUpNoiseLumi to scale pileup noise")
+            theCaloNoiseAlg.LumiFolder = lumiFolder
+            theCaloNoiseAlg.Luminosity=-1.
+        else:
+            from AthenaCommon.BeamFlags import jobproperties
+            theCaloNoiseAlg.Luminosity=jobproperties.Beam.estimatedLuminosity()/1e+33
+            mlog.info("  Luminosity (in 10**33) units used for pileup noise from BeamFlags : %f", theCaloNoiseAlg.Luminosity)
+            pass
+        pass
+    theCaloNoiseAlg.LArNoiseFolder="/LAR/NoiseOfl/CellNoise"
+    conddb.addFolder("LAR_OFL","/LAR/NoiseOfl/CellNoise",className="CondAttrListCollection")
+    theCaloNoiseAlg.TileNoiseFolder="/TILE/OFL02/NOISE/CELL"
+    conddb.addFolder("TILE_OFL","/TILE/OFL02/NOISE/CELL",className="CondAttrListCollection")
+    theCaloNoiseAlg.CaloNoiseFolder="/CALO/Ofl/Noise/CellNoise"
+    conddb.addFolder("CALO_OFL","/CALO/Ofl/Noise/CellNoise",className="CondAttrListCollection")
+    
+    return theCaloNoiseAlg
+
+
+
+
+def _CaloNoiseCondAlgData(noiseAlgName,noisetype):
+    mlog = logging.getLogger('CaloNoiseCondData')
+    from CaloTools.CaloNoiseFlags import jobproperties
+    fixedLumi = jobproperties.CaloNoiseFlags.FixedLuminosity()
+    caloLumi  = jobproperties.CaloNoiseFlags.UseCaloLuminosity()
+
+    from CaloTools.CaloToolsConf import CaloNoiseCondAlg     
+    theCaloNoiseAlg=CaloNoiseCondAlg(noiseAlgName,OutputKey=noisetype)
+    
+    if conddb.isOnline:
+        folder = "/CALO/Noise/CellNoise"
+        theCaloNoiseAlg.CaloNoiseFolder=folder
+        theCaloNoiseAlg.LArNoiseFolder=""
+        theCaloNoiseAlg.TileNoiseFolder=""
+        conddb.addFolder('CALO_ONL',folder,className="CondAttrListCollection")
+        if fixedLumi >= 0 :
+            theCaloNoiseAlg.Luminosity = fixedLumi
+            mlog.info("online mode: use fixed luminosity for scaling pileup noise: %f", fixedLumi)
+        else:
+            if caloLumi:
+                lumiFolder='/CALO/Noise/PileUpNoiseLumi'
+                conddb.addFolder('CALO',lumiFolder,className="CondAttrListCollection")
+                theCaloNoiseAlg.LumiFolder = lumiFolder
+                theCaloNoiseAlg.Luminosity = -1.
+                mlog.info("online mode: use luminosity from /CALO/Noise/PileUpNoiseLumi to scale pileup noise")
+            else:
+                theCaloNoiseAlg.Luminosity = 0.
+                mlog.info("online mode: ignore pileup noise") 
+                pass
+    else: #regular offline mode
+        if conddb.dbdata=="CONDBR2": # Run2 case:
+            theCaloNoiseAlg.CaloNoiseFolder=""
+            theCaloNoiseAlg.LArNoiseFolder="/LAR/NoiseOfl/CellNoise"
+            theCaloNoiseAlg.TileNoiseFolder="/TILE/OFL02/NOISE/CELL"
+            conddb.addFolder("LAR_OFL","/LAR/NoiseOfl/CellNoise",className="CondAttrListCollection")
+            conddb.addFolder("TILE_OFL","/TILE/OFL02/NOISE/CELL",className="CondAttrListCollection")
+            from CaloRec.CaloCellFlags import jobproperties
+            if jobproperties.CaloCellFlags.doLArHVCorr():
+                mlog.info("Run2 & doLArHVCorr=True: Will rescale noise automatically for HV trips")
+                theCaloNoiseAlg.useHVCorr=True
+                from LArConditionsCommon import LArHVDB  # noqa: F401
+                pass
+            pass
+        else: #COMP200 case:
+            #The noise for runs before 2012 is in different folders:
+            theCaloNoiseAlg.CaloNoiseFolder="/CALO/Ofl/Noise/CellNoise"
+            theCaloNoiseAlg.LArNoiseFolder="/LAR/NoiseOfl/CellNoise"
+            theCaloNoiseAlg.TileNoiseFolder="/TILE/OFL02/NOISE/CELL"
+            conddb.addFolder("CALO_OFL","/CALO/Ofl/Noise/CellNoise",className="CondAttrListCollection")
+            conddb.addFolder("LAR_OFL","/LAR/NoiseOfl/CellNoise",className="CondAttrListCollection")
+            conddb.addFolder("TILE_OFL","/TILE/OFL02/NOISE/CELL",className="CondAttrListCollection")
+            
+
+        # for luminosity
+        if fixedLumi >= 0 :
+            theCaloNoiseAlg.Luminosity = fixedLumi
+            mlog.info("offline mode: use fixed luminosity for scaling pileup noise: %f", fixedLumi)
+        else:
+            theCaloNoiseAlg.Luminosity = -1
+            if caloLumi:
+                lumiFolder='/CALO/Ofl/Noise/PileUpNoiseLumi'
+                conddb.addFolder('CALO_OFL',lumiFolder,className="CondAttrListCollection")
+                mlog.info("offline mode: use luminosity from /CALO/Ofl/Noise/PileUpNoiseLumi to scale pileup noise")
+            else:
+                lumiFolder = '/TRIGGER/LUMI/LBLESTONL'
+                conddb.addFolder('TRIGGER_ONL',lumiFolder,className="CondAttrListCollection")
+                mlog.info("offline mode: use luminosity = f(Lumiblock) to scale pileup noise")
+            theCaloNoiseAlg.LumiFolder = lumiFolder
+                
+    return theCaloNoiseAlg

Calorimeter/CaloTools/python/CaloNoiseFlags.py

+# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+
+""" Flags for define calo noise tool configuration
+"""
+#
+#
+__author__  = 'G.Unal'
+
+
+#=======================================================================
+# imports
+#=======================================================================
+from AthenaCommon.JobProperties import JobProperty, JobPropertyContainer
+from AthenaCommon.JobProperties import jobproperties
+
+class FixedLuminosity(JobProperty):
+   """ Flag to force luminosity (10**33 units) to a given value corresponding to a given mu 
+        Lumi is related to mu by   Lumi = (mu/2.3) * 25ns/BunchSpacing(ns)
+         BunchSpacing should be consistent with what is used from DB, as noise/sqrt(Lumi) depends on BunchSpacing
+       if -1 uses lumi from database (Data) or Beam properties (MC) to perform the sqrt(Lumi) pileup noise scaling
+   """
+   statusOn = True
+   allowedType=['float']
+   StoredValue = -1.
+
+class UseCaloLuminosity(JobProperty):
+   """ Flag to tell to use the luminosity normalization for pileup noise from dedicated calo folder
+       instead of online per LumiBlock
+       Only active if FixedLuminosity is not >0
+   """
+   statusOn = True
+   allowedType=['bool']
+   StoredValue = True
+
+class CaloNoiseFlags(JobPropertyContainer):
+   """ The CaloNoiseFlag container
+   """
+   pass
+
+
+# add container to jobProperties
+jobproperties.add_Container(CaloNoiseFlags)
+
+list_jobproperties = [
+  FixedLuminosity,UseCaloLuminosity
+  ]
+
+for i in list_jobproperties:
+    jobproperties.CaloNoiseFlags.add_JobProperty(i)
+
+del list_jobproperties

Control/AthenaConfiguration/python/Enums.py

@@ -44,6 +44,7 @@ class Format(FlagEnum):
 class ProductionStep(FlagEnum):
     # steps should be added when needed
     Default = 'Default'
+    Generation = 'Generation'
     Simulation = 'Simulation'
     PileUpPresampling = 'PileUpPresampling'
     Overlay = 'Overlay'

DataQuality/GoodRunsListsUser/CMakeLists.txt

-# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( GoodRunsListsUser )
@@ -12,6 +12,3 @@ atlas_add_component( GoodRunsListsUser
                      src/components/*.cxx
                      INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
                      LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps GoodRunsListsLib EventInfo GaudiKernel TrigDecisionToolLib TrigDecisionEvent )
-
-# Install files from the package:
-atlas_install_joboptions( share/*.py )

DataQuality/GoodRunsListsUser/share/GoodRunsListsUser_DQLumiExample.py

-# add LumiBlockMetaDataTool to ToolSvc and configure
-from LumiBlockComps.LumiBlockCompsConf import LumiBlockMetaDataTool
-ToolSvc += LumiBlockMetaDataTool( "LumiBlockMetaDataTool" )
-
-# add ToolSvc.LumiBlockMetaDataTool to MetaDataSvc
-from AthenaServices.AthenaServicesConf import MetaDataSvc
-svcMgr += MetaDataSvc( "MetaDataSvc" )
-svcMgr.MetaDataSvc.MetaDataTools += [ ToolSvc.LumiBlockMetaDataTool ]
-
-# Configure the goodrunslist selector tool
-from GoodRunsLists.GoodRunsListsConf import *
-ToolSvc += GoodRunsListSelectorTool() 
-GoodRunsListSelectorTool.GoodRunsListVec = [ '$TestArea/DataQuality/GoodRunsListsUser/run/minbias_900GeV.xml' ]
-
-## This Athena job consists of algorithms that loop over events;
-## here, the (default) top sequence is used:
-from AthenaCommon.AlgSequence import AlgSequence, AthSequencer
-job = AlgSequence()
-seq = AthSequencer("AthMasterSeq")
-
-## AthMasterSeq is always executed before the top sequence, and is configured such that
-## any follow-up sequence (eg. top sequence) is not executed in case GRLTriggerAlg1 does
-## not pass the event
-## In short, the sequence AthMasterSeq makes sure that all algs in the job sequence
-## are skipped when an event gets rejects
-from GoodRunsListsUser.GoodRunsListsUserConf import *
-seq += GRLTriggerSelectorAlg('GRLTriggerAlg1')
-seq.GRLTriggerAlg1.GoodRunsListArray = ['minbias_900GeV']        ## pick up correct name from inside xml file!
-seq.GRLTriggerAlg1.TriggerSelectionRegistration = 'L1_MBTS_1' ## set this to your favorite trigger, eg. L1_MBTS_1_1
-
-## Add the ntuple dumper to the top sequence, as usual
-## DummyDumperAlg1 is run in the top sequence, but is not executed in case GRLTriggerAlg1 rejects the event.
-job += DummyDumperAlg('DummyDumperAlg1')
-# job.DummyDumperAlg1.RootFileName = 'selection1.root'
-THistSvc.Output =  {"new DATAFILE='selection1.root' TYP='ROOT' OPT='NEW'"};
-job.DummyDumperAlg1.GRLNameVec = [ 'LumiBlocks_GoodDQ0', 'IncompleteLumiBlocks_GoodDQ0' ]
-

DataQuality/GoodRunsListsUser/share/GoodRunsListsUser_default.py

-## Example trigger joboptions
-#include ("AMAAthena/Trigger_jobOptions.py")
-
-###########################################################################################
-## Configure the goodrunslist selector tool to read and interpret xml files
-###########################################################################################
-
-## Configure the goodrunslist selector tool
-from GoodRunsLists.GoodRunsListsConf import *
-ToolSvc += GoodRunsListSelectorTool() 
-GoodRunsListSelectorTool.GoodRunsListVec  = [ '$TestArea/DataQuality/GoodRunsListsUser/run/grl_topmix_mu.xml' ]
-GoodRunsListSelectorTool.BlackRunsListVec = [ '$TestArea/DataQuality/GoodRunsListsUser/run/blacklist.xml' ]
-GoodRunsListSelectorTool.OutputLevel = DEBUG
-
-## GRL selector, dummy ntuple dumper
-from GoodRunsListsUser.GoodRunsListsUserConf import *
-
-###########################################################################################
-## Start of jobsequence
-###########################################################################################
-
-## This Athena job consists of algorithms that loop over events;
-## here, the (default) top sequence is used:
-from AthenaCommon.AlgSequence import AlgSequence, AthSequencer
-job = AlgSequence()
-
-###########################################################################################
-## GRLTriggerSelectorAlg uses GoodRunsListSelectorTool to determine for 
-##   each event whether to pass it, or to reject it.
-## As good- and black run lists GRLTriggerAlg1 uses: 'grl_topmix_mu' and 'blacklist', 
-##   which are the names of the good run list objects in grl_topmix_mu.xml 
-##   and blacklist.xml respectively.
-## As the dummy ntupledumper DummyDumperAlg1 runs in the top sequence, 
-##   after GRLTriggerAlg1, it is not executed in case GRLTriggerAlg1 rejects an event.
-###########################################################################################
-
-## AthMasterSeq is always executed before the top sequence, and is configured such that
-## any follow-up sequence (eg. top sequence) is not executed in case GRLTriggerAlg1 does
-## not pass the event
-seq = AthSequencer("AthMasterSeq")
-seq += GRLTriggerSelectorAlg('GRLTriggerAlg1')
-seq.GRLTriggerAlg1.GoodRunsListArray  = ['grl_topmix_mu']
-seq.GRLTriggerAlg1.BlackRunsListArray = ['blacklist']
-
-## DummyDumperAlg1 is run in the top sequence, but is not executed in case GRLTriggerAlg1 rejects the event.
-job += DummyDumperAlg('DummyDumperAlg1')
-# job.DummyDumperAlg1.RootFileName = 'selection1.root'
-THistSvc.Output =  {"new DATAFILE='selection1.root' TYP='ROOT' OPT='NEW'"};

DataQuality/GoodRunsListsUser/share/GoodRunsListsUser_default_data.py

-# Configure the goodrunslist selector tool
-from GoodRunsLists.GoodRunsListsConf import *
-ToolSvc += GoodRunsListSelectorTool() 
-GoodRunsListSelectorTool.GoodRunsListVec = [ '$TestArea/DataQuality/GoodRunsListsUser/run/minbias_900GeV.xml' ]
-#GoodRunsListSelectorTool.OutputLevel = DEBUG
-
-## This Athena job consists of algorithms that loop over events;
-## here, the (default) top sequence is used:
-from AthenaCommon.AlgSequence import AlgSequence, AthSequencer
-job = AlgSequence()
-seq = AthSequencer("AthMasterSeq")
-
-## AthMasterSeq is always executed before the top sequence, and is configured such that
-## any follow-up sequence (eg. top sequence) is not executed in case GRLTriggerAlg1 does
-## not pass the event
-## In short, the sequence AthMasterSeq makes sure that all algs in the job sequence
-## are skipped when an event gets rejects
-from GoodRunsListsUser.GoodRunsListsUserConf import *
-seq += GRLTriggerSelectorAlg('GRLTriggerAlg1')
-seq.GRLTriggerAlg1.GoodRunsListArray = ['minbias_900GeV']        ## pick up correct name from inside xml file!
-
-## Add the ntuple dumper to the top sequence, as usual
-## DummyDumperAlg1 is run in the top sequence, but is not executed in case GRLTriggerAlg1 rejects the event.
-job += DummyDumperAlg('DummyDumperAlg1')
-# job.DummyDumperAlg1.RootFileName = 'selection1.root'
-THistSvc.Output =  {"new DATAFILE='selection1.root' TYP='ROOT' OPT='NEW'"};

DataQuality/GoodRunsListsUser/share/GoodRunsListsUser_oneSelection.py

-## Example trigger joboptions
-#include ("AMAAthena/Trigger_jobOptions.py")
-
-###########################################################################################
-## Configure the goodrunslist selector tool to read and interpret xml files
-###########################################################################################
-
-## Configure the goodrunslist selector tool
-from GoodRunsLists.GoodRunsListsConf import *
-ToolSvc += GoodRunsListSelectorTool() 
-GoodRunsListSelectorTool.GoodRunsListVec  = [ 'grl_topmix_mu.xml' ]
-GoodRunsListSelectorTool.BlackRunsListVec = [ 'blacklist.xml' ]
-#GoodRunsListSelectorTool.OutputLevel = DEBUG
-
-## GRL selector, dummy ntuple dumper
-from GoodRunsListsUser.GoodRunsListsUserConf import *
-
-###########################################################################################
-## Start of jobsequence
-###########################################################################################
-
-## This Athena job consists of algorithms that loop over events;
-## here, the (default) top sequence is used:
-from AthenaCommon.AlgSequence import AlgSequence, AthSequencer
-job = AlgSequence()
-
-###########################################################################################
-## GRLTriggerSelectorAlg uses GoodRunsListSelectorTool to determine for 
-##   each event whether to pass it, or to reject it.
-## As good- and black run lists GRLTriggerAlg1 uses: 'grl_topmix_mu' and 'blacklist', 
-##   which are the names of the good run list objects in grl_topmix_mu.xml 
-##   and blacklist.xml respectively.
-## As the dummy ntupledumper DummyDumperAlg1 runs in sequence ModSequence1, 
-##   after GRLTriggerAlg1, it is not executed in case GRLTriggerAlg1 rejects an event.
-###########################################################################################
-
-## Sequence 1
-job += AthSequencer("ModSequence1")
-job.ModSequence1 += GRLTriggerSelectorAlg('GRLTriggerAlg1')
-job.ModSequence1 += DummyDumperAlg('DummyDumperAlg1')
-
-job.ModSequence1.GRLTriggerAlg1.GoodRunsListArray  = ['grl_topmix_mu']
-job.ModSequence1.GRLTriggerAlg1.BlackRunsListArray = ['blacklist']
-
-# job.ModSequence1.DummyDumperAlg1.RootFileName = 'selection1.root'
-THistSvc.Output =  {"new DATAFILE='selection1.root' TYP='ROOT' OPT='NEW'"};

DataQuality/GoodRunsListsUser/share/GoodRunsListsUser_preEventSelector.py

-###########################################################################################
-## IMPORTANT: Configuring the goodrunslist selector as preevent selector tool
-##            does currently not work in combination with the LumiBlockMetaDataTool
-##            USE WITH CAUTION!
-###########################################################################################
-
-###########################################################################################
-## Configure the goodrunslist selector tool
-###########################################################################################
-
-from GoodRunsLists.GoodRunsListsConf import *
-GoodRunsTool = GoodRunsListSelectorTool('GoodRunsTool')
-GoodRunsTool.GoodRunsListVec  = [ 'grl_topmix_mu.xml', 'grl_topmix_e.xml' ]
-GoodRunsTool.BlackRunsListVec = [ 'blacklist.xml' ]
-GoodRunsTool.RejectBlackRunsInEventSelector = True  ## False by default
-GoodRunsTool.EventSelectorMode = True
-#GoodRunsTool.OutputLevel = DEBUG
-
-###########################################################################################
-## Add GRL selector tool to pre-eventselector
-###########################################################################################
-
-## Klugde: eventselector currently needs private tool, will become public very soon!
-## Public version is used by eg. LumiBlockMetaDataTool
-## add the (private version of) grl selector tool to the eventselector
-AthenaEventLoopMgr = Service( "AthenaEventLoopMgr" )
-AthenaEventLoopMgr.PreSelectTools += [ GoodRunsTool ]
-#AthenaEventLoopMgr.OutputLevel = WARNING
-
-from AthenaCommon.AppMgr import ServiceMgr
-ServiceMgr += AthenaEventLoopMgr
-

DataQuality/GoodRunsListsUser/share/GoodRunsListsUser_twoSelections.py

-## Example trigger joboptions
-#include ("AMAAthena/Trigger_jobOptions.py")
-
-###########################################################################################
-## Configure the goodrunslist selector tool to read and interpret xml files
-###########################################################################################
-
-## Configure the goodrunslist selector tool
-from GoodRunsLists.GoodRunsListsConf import *
-ToolSvc += GoodRunsListSelectorTool() 
-GoodRunsListSelectorTool.GoodRunsListVec  = [ 'grl_topmix_mu.xml', 'grl_topmix_e.xml' ]
-GoodRunsListSelectorTool.BlackRunsListVec = [ 'blacklist.xml' ]
-#GoodRunsListSelectorTool.OutputLevel = DEBUG
-
-## GRL selector, dummy ntuple dumper
-from GoodRunsListsUser.GoodRunsListsUserConf import *
-
-###########################################################################################
-## Start of jobsequence
-###########################################################################################
-
-## This Athena job consists of algorithms that loop over events;
-## here, the (default) top sequence is used:
-from AthenaCommon.AlgSequence import AlgSequence, AthSequencer
-job = AlgSequence()
-
-###########################################################################################
-## GRLTriggerSelectorAlg uses GoodRunsListSelectorTool to determine for 
-##   each event whether to pass it, or to reject it.
-## As good- and black run lists GRLTriggerAlg1 uses: 'grl_topmix_mu' and 'blacklist', 
-##   which are the names of the good run list objects in grl_topmix_mu.xml 
-##   and blacklist.xml respectively. 
-## GRLTriggerAlg2 uses 'grl_topmix_e', coming from grl_topmix_e.xml
-## As the dummy ntupledumper DummyDumperAlg1 runs in sequence ModSequence1, 
-##   after GRLTriggerAlg1, it is not executed in case GRLTriggerAlg1 rejects an event.
-##   Same story for GRLTriggerAlg2 and DummyDumperAlg2, running in ModSequence2
-###########################################################################################
-
-## Selection 1
-job += AthSequencer("ModSequence1")
-job.ModSequence1 += GRLTriggerSelectorAlg('GRLTriggerAlg1')
-job.ModSequence1.GRLTriggerAlg1.GoodRunsListArray  = ['grl_topmix_mu']
-job.ModSequence1.GRLTriggerAlg1.BlackRunsListArray = ['blacklist']
-job.ModSequence1 += DummyDumperAlg('DummyDumperAlg1')
-# job.ModSequence1.DummyDumperAlg1.RootFileName = 'selection1.root'
-THistSvc.Output =  {"new DATAFILE='selection1.root' TYP='ROOT' OPT='NEW'"};
-
-## Selection 2
-job += AthSequencer("ModSequence2")
-job.ModSequence2 += GRLTriggerSelectorAlg('GRLTriggerAlg2')
-job.ModSequence2.GRLTriggerAlg2.GoodRunsListArray  = ['grl_topmix_e']
-job.ModSequence2 += DummyDumperAlg('DummyDumperAlg2')
-# job.ModSequence2.DummyDumperAlg2.RootFileName = 'selection2.root'
-THistSvc.Output =  {"new DATAFILE='selection2.root' TYP='ROOT' OPT='NEW'"};

DataQuality/GoodRunsListsUser/share/LumiBlock_LumiCalc_GRL_dumper.py

-# add LumiBlockMetaDataTool to ToolSvc and configure
-from LumiBlockComps.LumiBlockCompsConf import LumiBlockMetaDataTool
-ToolSvc += LumiBlockMetaDataTool( "LumiBlockMetaDataTool" )
-
-# add ToolSvc.LumiBlockMetaDataTool to MetaDataSvc
-from AthenaServices.AthenaServicesConf import MetaDataSvc
-svcMgr += MetaDataSvc( "MetaDataSvc" )
-svcMgr.MetaDataSvc.MetaDataTools += [ ToolSvc.LumiBlockMetaDataTool ]
-
-# Configure the goodrunslist selector tool
-from GoodRunsLists.GoodRunsListsConf import *
-ToolSvc += GoodRunsListSelectorTool() 
-GoodRunsListSelectorTool.GoodRunsListVec = [ 'grl_topmix_mu.xml', 'grl_topmix_e.xml' ]
-GoodRunsListSelectorTool.BlackRunsListVec = [ 'blacklist.xml' ]
-
-## This Athena job consists of algorithms that loop over events;
-## here, the (default) top sequence is used:
-from AthenaCommon.AlgSequence import AlgSequence, AthSequencer
-job = AlgSequence()
-job += AthSequencer("ModSequence1")
-
-## GRL selector, dummy ntuple dumper
-from GoodRunsListsUser.GoodRunsListsUserConf import *
-job.ModSequence1 += GRLTriggerSelectorAlg('GRLTriggerAlg1')
-job.ModSequence1.GRLTriggerAlg1.GoodRunsListArray = ['grl_topmix_mu']
-job.ModSequence1.GRLTriggerAlg1.BlackRunsListArray = ['blacklist']
-job.ModSequence1.GRLTriggerAlg1.TriggerSelectionRegistration = 'EF_mu20'
-
-job.ModSequence1 += DummyDumperAlg('DummyDumperAlg1')
-# job.ModSequence1.DummyDumperAlg1.RootFileName = 'selection1.root'
-THistSvc.Output =  {"new DATAFILE='selection1.root' TYP='ROOT' OPT='NEW'"};
-job.ModSequence1.DummyDumperAlg1.GRLNameVec = [ 'LumiBlocks_GoodDQ0', 'IncompleteLumiBlocks_GoodDQ0' ]

Database/AthenaPOOL/OutputStreamAthenaPool/python/OutputStreamConfig.py

@@ -160,7 +160,8 @@ def addToMetaData(flags, streamName, itemOrList, AcceptAlgs=[], HelperTools=[],
 
    Returns CA to be merged
    """
-   if not getattr(flags.Output, f"doWrite{streamName}"):
+   flagName = f"Output.doWrite{streamName}"
+   if not flags.hasFlag(flagName):
        return ComponentAccumulator()
    items = [itemOrList] if isinstance(itemOrList, str) else itemOrList
    return OutputStreamCfg(flags, streamName, MetadataItemList=items,

Database/EventIndex/EventIndexProducer/python/POOLtoEI_Skeleton.py

@@ -125,7 +125,7 @@ def configurePOOL2EIglobals(runArgs, flags):
     # if EVNT, disable trigger processing
     if job.DoTriggerInfo:
         try:
-            if (EventStreamInfo_key is not None and 'StreamEVGEN' in flags.Input.ProcessingTags):
+            if (EventStreamInfo_key is not None and ('StreamEVGEN' in flags.Input.ProcessingTags or 'StreamEVNT' in flags.Input.ProcessingTags)):
                 eilog.info("Disable trigger processing for EVNT files")
                 job.DoTriggerInfo = False
 

Database/IOVDbSvc/python/IOVDbAutoCfgFlags.py

@@ -4,6 +4,10 @@ from AthenaCommon.Logging import logging
 log = logging.getLogger('IOVDbAutoCfgFlags')
 
 def getLastGlobalTag(prevFlags):
+    from AthenaConfiguration.Enums import ProductionStep
+    if prevFlags.Common.ProductionStep == ProductionStep.Generation:
+        # No global tag should be specified in event generation jobs
+        return ''
     from AthenaConfiguration.AutoConfigFlags import GetFileMD
     globaltag = GetFileMD(prevFlags.Input.Files).get("IOVDbGlobalTag",None) or "CONDBR2-BLKPA-RUN2-09"
     if isinstance(globaltag,list): # if different tags have been used at different steps
@@ -14,7 +18,7 @@ def getDatabaseInstanceDefault(prevFlags):
     isMC=prevFlags.Input.isMC
     if (isMC):
         return "OFLP200"
-    
+
     # real-data
     projectName=prevFlags.Input.ProjectName
     try:
@@ -22,8 +26,8 @@ def getDatabaseInstanceDefault(prevFlags):
     except Exception:
         log.warning("Failed to extract year from project tag "+ projectName+". Assuming CONDBR2.")
         return "CONDBR2"
-        
+
     if (year>13):
         return "CONDBR2"
     else:
-        return "COMP200" 
+        return "COMP200"

DetectorDescription/IdDictDetDescrCnv/CMakeLists.txt

-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( IdDictDetDescrCnv )
@@ -8,6 +8,3 @@ atlas_add_component( IdDictDetDescrCnv
                      src/*.cxx
                      LINK_LIBRARIES AthenaBaseComps AthenaKernel AtlasDetDescr DetDescrCnvSvcLib GaudiKernel GeoModelInterfaces GeoModelUtilities IdDictDetDescr IdDictParser Identifier RDBAccessSvcLib StoreGateLib )
 
-# Install files from the package:
-atlas_install_joboptions( share/*.py )
-

DetectorDescription/IdDictDetDescrCnv/share/IdDictDetDescrCnv_joboptions.py

-#
-#  Joboptions for the loading of the of InDetDDMgr
-#
-
-_log = logging.getLogger( 'IdDictDetDescrCnv_joboptions' )
-from AthenaCommon.GlobalFlags  import globalflags
-from IOVDbSvc.CondDB import conddb
-
-# Disable for MC or for Run 1 (AlignL* folders are not in COMP200).
-if globalflags.DataSource.get_Value() != 'data' or conddb.dbname == 'COMP200':
-    _log.debug("Disabling ID dynamic alignment")
-    from AtlasGeoModel.InDetGMJobProperties import InDetGeometryFlags
-    InDetGeometryFlags.useDynamicAlignFolders=False
-
-# DLLs 
-theApp.Dlls += [ "IdDictDetDescrCnv" ]
-
-del _log

Event/xAOD/xAODMetaDataCnv/python/InfileMetaDataConfig.py

@@ -259,6 +259,7 @@ def SetupMetaDataForStreamCfg(
             itemOrList=helperLists.mdItems,
             AcceptAlgs=AcceptAlgs,
             HelperTools=helperLists.helperTools,
+            **kwargs
         )
     )
     # Configure the MetaDataSvc and pass the relevant tools