Calorimeter/CaloCondPhysAlgs/CMakeLists.txt

@@ -21,4 +21,4 @@ atlas_add_component( CaloCondPhysAlgs
 # Install files from the package:
 atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
 atlas_install_joboptions( share/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} --extend-ignore=F401,F821 )
-atlas_install_scripts( share/CaloRescaleNoiseHV.sh share/CaloNoise_fillDB.py share/CaloPedestalShift.sh share/CaloPedestal_fillDB.py )
+atlas_install_scripts( share/CaloRescaleNoiseHV.sh share/CaloNoise_fillDB.py share/CaloPedestalShift.sh share/CaloPedestal_fillDB.py share/CaloNoise2Ntuple.py share/CaloCellPos2Ntuple.py )

Calorimeter/CaloCondPhysAlgs/share/CaloCellPos2Ntuple.py

+#!/bin/env python
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+
+from AthenaConfiguration.ComponentFactory import CompFactory
+from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
+
+def CaloCellPos2NtupleCfg(flags,outputFile):
+
+    cfg=ComponentAccumulator()
+    from LArGeoAlgsNV.LArGMConfig import LArGMCfg
+    cfg.merge(LArGMCfg(flags))
+    from TileGeoModel.TileGMConfig import TileGMCfg
+    cfg.merge(TileGMCfg(flags))
+
+    cfg.addEventAlgo(CompFactory.CaloCellPosition2Ntuple())
+    cfg.addService(CompFactory.THistSvc(Output  = ["file1 DATAFILE='"+outputFile+"' OPT='RECREATE'"]))
+
+    return cfg
+    
+if __name__=="__main__":
+    import sys,argparse
+    parser= argparse.ArgumentParser()
+    parser.add_argument("--loglevel", default=None, help="logging level (ALL, VERBOSE, DEBUG,INFO, WARNING, ERROR, or FATAL")
+    parser.add_argument("-r","--runnumber",default=0x7fffffff, type=int, help="run number to query the DB")
+    parser.add_argument("-l","--lbnumber",default=1, type=int, help="LB number to query the DB")
+    parser.add_argument("-d","--database",default=None, help="Database name or sqlite file name")
+    parser.add_argument("-o","--output",default="LArCellPos.root", help="output file name")
+    parser.add_argument("-f","--folder",default=None, help="database folder to read")
+    parser.add_argument("-t","--tag",default=None, help="folder-level tag to read")
+    parser.add_argument("-m","--mc", action='store_true', help="data or MC?")
+
+
+    (args,leftover)=parser.parse_known_args(sys.argv[1:])
+
+    if len(leftover)>0:
+        print("ERROR, unhandled argument(s):",leftover)
+        sys.exit(-1)
+    
+    from AthenaConfiguration.AllConfigFlags import initConfigFlags
+    flags=initConfigFlags()
+    flags.Input.isMC = args.mc
+    flags.IOVDb.DatabaseInstance= "OFLP200" if args.mc else "CONDBR2"
+    from Campaigns.Utils import Campaign
+    flags.Input.MCCampaign=Campaign.Unknown
+    flags.LAr.doAlign=True
+
+    flags.Input.TypedCollections=()
+    
+    flags.LAr.doHVCorr=False
+    flags.Input.RunNumbers=[args.runnumber]
+    flags.IOVDb.GlobalTag="OFLCOND-MC23-SDR-RUN3-05" if args.mc else "CONDBR2-BLKPA-2024-03"
+    from AthenaConfiguration.TestDefaults import defaultGeometryTags
+    flags.GeoModel.AtlasVersion=defaultGeometryTags.RUN3
+
+    
+    if args.loglevel:
+        from AthenaCommon import Constants
+        if hasattr(Constants,args.loglevel):
+            flags.Exec.OutputLevel=getattr(Constants,args.loglevel)
+        else:
+            raise ValueError("Unknown log-level, allowed values are ALL, VERBOSE, DEBUG,INFO, WARNING, ERROR, FATAL")
+
+    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,
+                                 FirstLB=args.lbnumber,
+                                 EventsPerRun      = 1,
+                                 FirstEvent        = 1,
+                                 InitialTimeStamp  = 0,
+                                 TimeStampInterval = 1))
+    cfg.addEventAlgo(CompFactory.xAODMaker.EventInfoCnvAlg(AODKey = 'McEventInfo'),sequenceName="AthAlgSeq")
+    
+    cfg.merge(CaloCellPos2NtupleCfg(flags,args.output)) 
+
+    dbstr=None
+    if args.database:
+        dbstr="sqlite://;schema="+args.database+";dbname=" + flags.IOVDb.DatabaseInstance
+                                  
+    if args.tag or args.database:
+        from IOVDbSvc.IOVDbSvcConfig import addOverride
+        cfg.merge(addOverride(flags,"/LAR/LArCellPositionShift",args.tag,dbstr))
+        
+
+    sc=cfg.run(1)
+    if sc.isSuccess():
+        sys.exit(0)
+    else:
+        sys.exit(1)

Calorimeter/CaloCondPhysAlgs/share/CaloNoise2Ntuple.py

+#!/bin/env python
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+
+from AthenaConfiguration.ComponentFactory import CompFactory
+from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
+
+def CaloNoise2NtupleCfg(flags,outputFile):
+
+    cfg=ComponentAccumulator()
+    from LArGeoAlgsNV.LArGMConfig import LArGMCfg
+    cfg.merge(LArGMCfg(flags))
+    from TileGeoModel.TileGMConfig import TileGMCfg
+    cfg.merge(TileGMCfg(flags))
+
+    from CaloTools.CaloNoiseCondAlgConfig import CaloNoiseCondAlgCfg
+    cfg.merge(CaloNoiseCondAlgCfg(flags,"totalNoise"))
+    cfg.merge(CaloNoiseCondAlgCfg(flags,"electronicNoise"))
+    cfg.merge(CaloNoiseCondAlgCfg(flags,"pileupNoise"))
+
+    cfg.addEventAlgo(CompFactory.CaloNoise2Ntuple())
+    cfg.addService(CompFactory.THistSvc(Output  = ["file1 DATAFILE='"+outputFile+"' OPT='RECREATE'"]))
+
+    return cfg
+    
+if __name__=="__main__":
+    import sys,argparse
+    parser= argparse.ArgumentParser()
+    parser.add_argument("--loglevel", default=None, help="logging level (ALL, VERBOSE, DEBUG,INFO, WARNING, ERROR, or FATAL")
+    parser.add_argument("-r","--runnumber",default=0x7fffffff, type=int, help="run number to query the DB")
+    parser.add_argument("-l","--lbnumber",default=1, type=int, help="LB number to query the DB")
+    parser.add_argument("-d","--database",default=None, help="Database name or sqlite file name")
+    parser.add_argument("-o","--output",default="caloNoise.root", help="output file name")
+    parser.add_argument("-f","--folder",default=None, help="database folder to read")
+    parser.add_argument("-t","--tag",default=None, help="folder-level tag to read")
+    parser.add_argument("-m","--mc", action='store_true', help="data or MC?")
+
+
+    (args,leftover)=parser.parse_known_args(sys.argv[1:])
+
+    if len(leftover)>0:
+        print("ERROR, unhandled argument(s):",leftover)
+        sys.exit(-1)
+    
+    from AthenaConfiguration.AllConfigFlags import initConfigFlags
+    flags=initConfigFlags()
+    flags.Input.isMC = args.mc
+    flags.IOVDb.DatabaseInstance= "OFLP200" if args.mc else "CONDBR2"
+    from Campaigns.Utils import Campaign
+    flags.Input.MCCampaign=Campaign.Unknown
+    flags.LAr.doAlign=False
+    flags.LAr.doHVCorr=False
+    flags.Input.RunNumbers=[args.runnumber]
+    flags.IOVDb.GlobalTag="OFLCOND-MC23-SDR-RUN3-05" if args.mc else "CONDBR2-BLKPA-2024-03"
+    from AthenaConfiguration.TestDefaults import defaultGeometryTags
+    flags.GeoModel.AtlasVersion=defaultGeometryTags.RUN3
+
+    
+    if args.loglevel:
+        from AthenaCommon import Constants
+        if hasattr(Constants,args.loglevel):
+            flags.Exec.OutputLevel=getattr(Constants,args.loglevel)
+        else:
+            raise ValueError("Unknown log-level, allowed values are ALL, VERBOSE, DEBUG,INFO, WARNING, ERROR, FATAL")
+
+    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,
+                                 FirstLB=args.lbnumber,
+                                 EventsPerRun      = 1,
+                                 FirstEvent        = 1,
+                                 InitialTimeStamp  = 0,
+                                 TimeStampInterval = 1))
+    cfg.addEventAlgo(CompFactory.xAODMaker.EventInfoCnvAlg(AODKey = 'McEventInfo'),sequenceName="AthAlgSeq")
+    
+    cfg.merge(CaloNoise2NtupleCfg(flags,args.output)) 
+
+    dbstr=None
+    if args.database:
+        dbstr="sqlite://;schema="+args.database+";dbname=" + flags.IOVDb.DatabaseInstance
+                                  
+    if args.tag or args.database:
+        from IOVDbSvc.IOVDbSvcConfig import addOverride
+        cfg.merge(addOverride(flags,"/LAR/NoiseOfl/CellNoise",args.tag,dbstr))
+        
+
+    sc=cfg.run(1)
+    if sc.isSuccess():
+        sys.exit(0)
+    else:
+        sys.exit(1)

Calorimeter/CaloCondPhysAlgs/src/CaloCellPosition2Ntuple.cxx

 /*
-  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "CaloCellPosition2Ntuple.h"
-#include "CaloIdentifier/CaloIdManager.h"
 #include "CaloDetDescr/CaloDetDescrElement.h"
 #include "CaloIdentifier/CaloCell_ID.h"
-#include "CaloConditions/CaloCellPositionShift.h"
 #include "Identifier/Identifier.h"
 
 
 //Constructor
 CaloCellPosition2Ntuple::CaloCellPosition2Ntuple(const std::string& name, ISvcLocator* pSvcLocator):
   AthAlgorithm(name,pSvcLocator),
-  m_thistSvc(nullptr),
-  m_calo_id(nullptr),
-  m_key("LArCellPositionShift"),
   m_Hash(0),
   m_OffId(0),
   m_eta(0),
@@ -26,28 +21,18 @@ CaloCellPosition2Ntuple::CaloCellPosition2Ntuple(const std::string& name, ISvcLo
   m_dz(0),
   m_volume(0), 
   m_tree(nullptr)
-{
-  declareProperty("inputKey",m_key,"Key for CaloCellPositionShift");
-}
+{}
 
-//__________________________________________________________________________
-//Destructor
-CaloCellPosition2Ntuple::~CaloCellPosition2Ntuple()
-{
-  ATH_MSG_DEBUG( "CaloCellPosition2Ntuple destructor called"  );
-}
 //__________________________________________________________________________
 StatusCode CaloCellPosition2Ntuple::initialize()
 {
   ATH_MSG_DEBUG ("CaloCellPosition2Ntuple initialize()" );
   ATH_CHECK( service("THistSvc",m_thistSvc) );
 
-  const CaloIdManager* mgr = nullptr;
-  ATH_CHECK( detStore()->retrieve( mgr ) );
-  m_calo_id      = mgr->getCaloCell_ID();
+  ATH_CHECK(detStore()->retrieve(m_calo_id,"CaloCell_ID"));
 
   ATH_CHECK( m_caloMgrKey.initialize() );
-  ATH_CHECK( detStore()->regHandle(m_cellPos,m_key) );
+  ATH_CHECK( m_cellPosKey.initialize() );
 
   m_tree = new TTree("mytree","Calo Noise ntuple");
   m_tree->Branch("iHash",&m_Hash,"iHash/I");
@@ -82,14 +67,18 @@ StatusCode CaloCellPosition2Ntuple::stop()
   m_calo_id->calo_cell_hash_range(CaloCell_ID::LARFCAL,fcalmin,fcalmax);
   int ncell=fcalmax-emmin;
 
-  int nread = (int)(m_cellPos->size());
-
   SG::ReadCondHandle<CaloDetDescrManager> caloMgrHandle{m_caloMgrKey};
   ATH_CHECK(caloMgrHandle.isValid());
   const CaloDetDescrManager* calodetdescrmgr = *caloMgrHandle;
 
+  SG::ReadCondHandle<CaloRec::CaloCellPositionShift> cellPosHdl{m_cellPosKey};
+  ATH_CHECK(cellPosHdl.isValid());
+  const CaloRec::CaloCellPositionShift* cellPos= *cellPosHdl;
+
+  int nread = (int)(cellPos->size());
+  
   if (nread > ncell) {
-    ATH_MSG_WARNING ( " CaloCellPosition size different from max lar hash " << m_cellPos->size() << " " << ncell );
+    ATH_MSG_WARNING ( " CaloCellPosition size different from max lar hash " << cellPos->size() << " " << ncell );
     return StatusCode::SUCCESS;
   }
   ATH_MSG_INFO ( " start loop over Calo cells " << ncell );
@@ -105,9 +94,9 @@ StatusCode CaloCellPosition2Ntuple::stop()
        m_phi = calodde->phi();
        m_layer = m_calo_id->calo_sample(id);
 
-       m_dx = m_cellPos->deltaX(i);
-       m_dy = m_cellPos->deltaY(i);
-       m_dz = m_cellPos->deltaZ(i);
+       m_dx = cellPos->deltaX(i);
+       m_dy = cellPos->deltaY(i);
+       m_dz = cellPos->deltaZ(i);
        m_volume = calodde->volume();
 
        m_tree->Fill();

Calorimeter/CaloCondPhysAlgs/src/CaloCellPosition2Ntuple.h

 /*
-  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
 
 // CaloCellPosition2Ntuple.h
@@ -13,55 +13,43 @@
 // Gaudi includes
 
 #include "AthenaBaseComps/AthAlgorithm.h"
+#include "CaloConditions/CaloCellPositionShift.h"
 #include "CaloDetDescr/CaloDetDescrManager.h"
-#include "StoreGate/ReadCondHandleKey.h"
-
 #include "GaudiKernel/ITHistSvc.h"
+#include "StoreGate/ReadCondHandleKey.h"
 #include "TTree.h"
-#include "CxxUtils/checker_macros.h"
 
-class CaloIdManager;
 class CaloCell_ID;
-namespace CaloRec {
-  class CaloCellPositionShift;
-}
 
 class CaloCellPosition2Ntuple : public AthAlgorithm {
 
-  public:
-    //Gaudi style constructor and execution methods
-    /** Standard Athena-Algorithm Constructor */
-    CaloCellPosition2Ntuple(const std::string& name, ISvcLocator* pSvcLocator) 
-      ATLAS_CTORDTOR_NOT_THREAD_SAFE;//DataHanlde is not thread safe
-    /** Default Destructor */
-    ~CaloCellPosition2Ntuple() 
-      ATLAS_CTORDTOR_NOT_THREAD_SAFE; //DataHandle is not thread safe
-    
-    /** standard Athena-Algorithm method */
-    virtual StatusCode          initialize ATLAS_NOT_THREAD_SAFE() override;
-    /** standard Athena-Algorithm method */
-    virtual StatusCode          execute() override;
-    /** standard Athena-Algorithm method */
-    virtual StatusCode          finalize() override;
-    /** standard Athena-Algorithm method */
-    virtual StatusCode          stop ATLAS_NOT_THREAD_SAFE() override;
+ public:
+  // Gaudi style constructor and execution methods
+  /** Standard Athena-Algorithm Constructor */
+  CaloCellPosition2Ntuple(const std::string& name, ISvcLocator* pSvcLocator);
 
-    
-  private:
+  /** standard Athena-Algorithm method */
+  virtual StatusCode initialize() override;
+  /** standard Athena-Algorithm method */
+  virtual StatusCode execute() override;
+  /** standard Athena-Algorithm method */
+  virtual StatusCode finalize() override;
+  /** standard Athena-Algorithm method */
+  virtual StatusCode stop() override;
 
+ private:
   //---------------------------------------------------
   // Member variables
   //---------------------------------------------------
-  ITHistSvc* m_thistSvc;
 
-  const CaloCell_ID*       m_calo_id;
+  ITHistSvc* m_thistSvc = nullptr;
 
-  const DataHandle<CaloRec::CaloCellPositionShift> m_cellPos;//DataHandle is marked as not thread safe
-  std::string m_key;
-  SG::ReadCondHandleKey<CaloDetDescrManager> m_caloMgrKey { this
-      , "CaloDetDescrManager"
-      , "CaloDetDescrManager"
-      , "SG Key for CaloDetDescrManager in the Condition Store" };
+  const CaloCell_ID* m_calo_id = nullptr;
+
+  SG::ReadCondHandleKey<CaloRec::CaloCellPositionShift> m_cellPosKey{this, "inputKey", "LArCellPositionShift", "Key for CaloCellPositionShift"};
+
+  SG::ReadCondHandleKey<CaloDetDescrManager> m_caloMgrKey{this, "CaloDetDescrManager", "CaloDetDescrManager",
+                                                          "SG Key for CaloDetDescrManager in the Condition Store"};
 
   int m_Hash;
   int m_OffId;
@@ -73,6 +61,5 @@ class CaloCellPosition2Ntuple : public AthAlgorithm {
   float m_dz;
   float m_volume;
   TTree* m_tree;
-
 };
 #endif

Calorimeter/CaloRec/python/CaloTopoClusterConfig.py

@@ -437,7 +437,7 @@ def CaloTopoClusterCfg(flags, cellsname="AllCalo", clustersname=None, clustersna
 
     from OutputStreamAthenaPool.OutputStreamConfig import addToAOD, addToESD
     toESD = [f"xAOD::CaloClusterContainer#{CaloTopoCluster.ClustersOutputName}",
-             f"xAOD::CaloClusterAuxContainer#{CaloTopoCluster.ClustersOutputName}Aux.",
+             f"xAOD::CaloClusterAuxContainer#{CaloTopoCluster.ClustersOutputName}Aux.-sigmaWidth",
              f"CaloClusterCellLinkContainer#{CaloTopoCluster.ClustersOutputName}_links"]
     toAOD = [f"xAOD::CaloClusterContainer#{CaloTopoCluster.ClustersOutputName}",
              f"CaloClusterCellLinkContainer#{CaloTopoCluster.ClustersOutputName}_links"]

Calorimeter/CaloRec/python/CaloTopoClusterFlags.py

-
-# Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
-
-#
-# $Id: CaloTopoClusterFlags.py,v 1.5 2009-05-04 16:23:04 lochp Exp $
-#
-# File: CaloRec/python/CaloTopoClusterFlags.py
-# Created: June 2007, S.Menke
-# Purpose: Define flags to steer topo cluster algorithm
-#
-# Modified: May 4, 2009, P.Loch
-# Purpose: Added steering for H1-style calibration of TopoClusters
-
-"""  A container of flags for CaloTopoCluster making configuring
-"""
-
-from AthenaCommon.JobProperties import JobProperty, JobPropertyContainer
-from AthenaCommon.JobProperties import jobproperties
-
-#
-class doTopoClusterLocalCalib(JobProperty):
-    """ Flag to activate Local Hadron Calibration
-    """
-    statusOn     = True
-    allowedTypes = ['bool']
-    StoredValue  = True
-
-#
-class usePhysicsList(JobProperty):
-    """ indicate the Physics List most appropriate for Local Hadron Calibration
-    """
-    statusOn     = True
-    allowedTypes = ['str']
-    StoredValue  = "QGSP_BERT"
-
-#
-class doClusterVertexFraction(JobProperty):
-    """ Flag to activate calculation of cluster vertex fraction and append it as a cluster moment
-    """
-    statusOn     = True
-    allowedTypes = ['bool']
-    StoredValue  = False
-                           
-#
-class doCalibHitMoments(JobProperty):
-    """ Flag to activate calibration hit based cluster moments
-    """
-    statusOn     = True
-    allowedTypes = ['bool']
-    StoredValue  = True
-#>> PL May 4, 2009
-# Defines if cell weight signal is to be calculated
-class doCellWeightCalib(JobProperty):
-    """ Apply H1-style cell weighting to cluster (3rd signal state)
-    """
-    statusOn     = True
-    allowedTypes = ['bool']
-    StoredValue  = False
-# Defines reference jet finder for cell weights
-class cellWeightRefFinder(JobProperty):
-    """ Default jet finder for calibration weight extraction
-    """
-    statusOn      = True
-    allowedTypes  = ['str']
-    allowedValues = ["Cone","Kt","SISCone","AntKt"]
-    StoredValue   = "Cone"
-# Defines reference jet size for cell weights
-class cellWeightRefSize(JobProperty):
-    """ Default jet size for calibration weight extraction
-    """
-    statusOn     = True
-    allowedTypes = ['float']
-    StoredValue  = 0.4
-# Defines reference jet calorimeter signal
-class cellWeightRefSignal(JobProperty):
-    """ Default calorimeter signal for cell weights
-    """
-    statusOn      = True
-    allowedTypes  = ['str']
-    allowedValues = ["Tower","Topo"]
-    StoredValue   = "Topo"
-
-class doTwoGaussianNoise(JobProperty):
-    """ Flag to activate two gaussian noise description
-    """
-    statusOn=True
-    allowedTypes=['bool']
-    StoredValue=True
-
-# Defines the container for the topo cluster making flags
-class CaloTopoClusterFlags(JobPropertyContainer):
-    """ The CaloTopoCluster making flag property container
-    """
-    pass
-  
-#Split clusters according to abs E only   
-class doTreatEnergyCutAsAbsolute(JobProperty):    
-    """ 
-    """
-    statusOn=True
-    allowedTypes=['bool']
-    StoredValue=False    
-    
-#also compute moments from abs E from the Cells only  (has to go together with doTreatEnergyCutAsAbsolute)
-class doMomentsfromAbs(JobProperty):    
-    """ 
-    """
-    statusOn=True
-    allowedTypes=['bool']
-    StoredValue=False       
-  
-
-class doTimeCut(JobProperty):
-    """
-    """
-    statusOn=True
-    allowedTypes=['bool']
-    StoredValue=True
-
-
-class extendTimeCut(JobProperty):
-    """
-    """
-    statusOn=True
-    allowedTypes=['bool']
-    StoredValue=True
-
-class useUpperLimitForTimeCut(JobProperty):
-    """
-    """
-    statusOn=True
-    allowedTypes=['bool']
-    StoredValue=True
-
-class timeCutUpperLimit(JobProperty):
-    """
-    """
-    statusOn=True
-    allowedTypes=['float']
-    StoredValue=20.0
-
-class xtalkEM2(JobProperty):
-    """
-    """
-    statusOn=True
-    allowedTypes=['bool']
-    StoredValue=False
-
-class xtalkEM2D(JobProperty):
-    """
-    """
-    statusOn=True
-    allowedTypes=['bool']
-    StoredValue=False
-
-class xtalkEM2n(JobProperty):
-    """
-    """
-    statusOn=True
-    allowedTypes=['bool']
-    StoredValue=False
-
-class xtalkEM3(JobProperty):
-    """
-    """
-    statusOn=True
-    allowedTypes=['bool']
-    StoredValue=False
-
-class xtalkEMEta(JobProperty):
-    """
-    """
-    statusOn=True
-    allowedTypes=['bool']
-    StoredValue=False
-
-class xtalkDeltaT(JobProperty):
-    """
-    """
-    statusOn=True
-    allowedTypes=['float']
-    StoredValue=15.0
-
-class xtalk2Eratio1(JobProperty):
-    """
-    """
-    statusOn=True
-    allowedTypes=['float']
-    StoredValue=4.0
-
-class xtalk2Eratio2(JobProperty):
-    """
-    """
-    statusOn=True
-    allowedTypes=['float']
-    StoredValue=25.
-
-class xtalk3Eratio(JobProperty):
-    """
-    """
-    statusOn=True
-    allowedTypes=['float']
-    StoredValue=10.
-
-class xtalkEtaEratio(JobProperty):
-    """
-    """
-    statusOn=True
-    allowedTypes=['float']
-    StoredValue=4.
-
-class xtalk2DEratio(JobProperty):
-    """
-    """
-    statusOn=True
-    allowedTypes=['float']
-    StoredValue=4.
-
-
-
-# add the flags container to the top container 
-jobproperties.add_Container(CaloTopoClusterFlags)
-
-
-# We want always the following flags in the container  
-list_jobproperties = [
-    doTopoClusterLocalCalib
-    ,usePhysicsList
-    #,lockTopoClusterSamplingEnergies
-    #,lockTopoClusterSamplingVariables
-    ,doClusterVertexFraction
-    #,printTopoClusters
-    ,doCalibHitMoments
-    ,doCellWeightCalib
-    ,cellWeightRefFinder
-    ,cellWeightRefSize
-    ,cellWeightRefSignal
-    ,doTwoGaussianNoise
-    ,doTreatEnergyCutAsAbsolute
-    ,doMomentsfromAbs
-    ,doTimeCut
-    ,extendTimeCut
-    ,useUpperLimitForTimeCut
-    ,timeCutUpperLimit
-    ,xtalkEM2
-    ,xtalkEM2D
-    ,xtalkEM2n
-    ,xtalkEM3
-    ,xtalkEMEta
-    ,xtalkDeltaT
-    ,xtalk2Eratio1
-    ,xtalk2Eratio2
-    ,xtalk3Eratio
-    ,xtalkEtaEratio
-    ,xtalk2DEratio
-    ]
-
-for i in list_jobproperties:
-    jobproperties.CaloTopoClusterFlags.add_JobProperty(i)
-
-## module clean-up
-del list_jobproperties

Control/AthenaCommon/python/AthOptionsParser.py

@@ -46,19 +46,20 @@ class MemCheckAction(argparse.Action):
             setattr(args, 'memchk_mode', 'leak-check')
 
 
-class AthHelp(argparse.Action):
-   """Custom help to hide/show expert groups"""
-   def __call__(self, parser, namespace, values, option_string=None):
+class AthHelpFlags(argparse.Action):
+    """Custom help action to support flags"""
+    def __call__(self, parser, namespace, values, option_string=None):
 
-      for g in parser.expert_groups:
-         for a in g._group_actions:
-            if values!='all':
-               a.help = argparse.SUPPRESS
+        if not values:
+            parser.print_help()
+        else:
+            import runpy
+            sys.argv = ['athena.py', '--help']
+            if values != 'flags':
+                sys.argv.append(values)
+            runpy.run_module('AthenaConfiguration.AthNoop', run_name='__main__')
 
-      parser.print_help()
-      if values!='all':
-         print('\nUse --help=all to show all (expert) options')
-      sys.exit(0)
+        sys.exit(0)
 
 
 def get_version():
@@ -190,8 +191,9 @@ def getArgumentParser(legacy_args=False, **kwargs):
     g.add_argument('--version', action='version', version=get_version(),
                    help='print version number')
 
-    g.add_argument('-h', '--help', action='help',
-                   help='show help message')
+    g.add_argument('-h', '--help', metavar='FLAGS', nargs='?', action=AthHelpFlags,
+                   help='show help message (for FLAGS, "flags" for all categories)' if __athenaCLI
+                   else 'show help message (for FLAGS category)')
 
     # --------------------------------------------------------------------------
     g = parser.add_argument_group('Monitoring and debugging')

Control/AthenaConfiguration/python/AllConfigFlags.py

@@ -29,6 +29,7 @@ def initConfigFlags():
     acf.addFlag('Exec.DebugStage', '', help='attach debugger at stage: conf, init, exec, fini')
     acf.addFlag('Exec.Interactive', "", help='interactive prompt at stage: init, exec')
     acf.addFlag('Exec.FPE', 0, help='FPE check mode: -2 (no FPE check), -1 (abort with core-dump), 0 (FPE Auditor w/o stack-tace) , >0 (number of stack-traces printed by the job)')
+    acf.addFlag('Exec.EventTimeOut', 0, help='per-event timeout (in ns) after which the job is aborted (0 means no timeout)')
 
     #Custom messaging for components, see Utils.setupLoggingLevels
     acf.addFlag('Exec.VerboseMessageComponents', [], help='verbose output for listed components (wildcards)')

Control/AthenaConfiguration/python/AthNoop.py

+#!/usr/bin/env athena
 # Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 
 # Dummy script for the purpose of printing the --help text w/o any further script

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'

Control/AthenaConfiguration/python/MainServicesConfig.py

@@ -6,7 +6,9 @@ from AthenaCommon.Constants import INFO
 
 def MainServicesMiniCfg(flags, loopMgr='AthenaEventLoopMgr', masterSequence='AthAlgSeq'):
     """Mininmal basic config, just good enough for HelloWorld and alike"""
-    cfg = ComponentAccumulator(CompFactory.AthSequencer(masterSequence,Sequential=True))
+    cfg = ComponentAccumulator(CompFactory.AthSequencer(masterSequence,
+                                                        Sequential=True,
+                                                        TimeOut=flags.Exec.EventTimeOut))
     cfg.setAsTopLevel()
     cfg.setAppProperty('TopAlg',['AthSequencer/'+masterSequence])
     cfg.setAppProperty('MessageSvcType', 'MessageSvc')

DataQuality/DQDefects/python/db.py

@@ -354,7 +354,7 @@ class DefectsDB(DefectsDBVirtualDefectsMixin,
                         flask_cool_target: str = 'oracle://ATONR_COOLOFL_GPN/ATLAS_COOLOFL_GLOBAL',
                         flask_auth: Mapping[str, str] = {},
                         flask_db: str = 'CONDBR2',
-                        flask_uri: str = 'https://aiatlas003.cern.ch:5000/cool/multi_iovs'
+                        flask_uri: str = 'https://cool-proxy-app.cern.ch/cool/multi_iovs'
                         ):
         if not use_flask:
             for defect in defect_list:
@@ -364,7 +364,7 @@ class DefectsDB(DefectsDBVirtualDefectsMixin,
             import os
             flask_uri = os.environ.get('DQM_COOL_FLASK_URI', flask_uri)
 
-            print(flask_uri)
+            log.debug(f'Flask server URI: {flask_uri}')
             self._insert_multiple_flask(defect_list, tag, flask_cool_target, 
                                         flask_auth, flask_db, flask_uri)
 
@@ -377,6 +377,7 @@ class DefectsDB(DefectsDBVirtualDefectsMixin,
         import requests
         import json
         import urllib.parse
+        import os
         from DQUtils.oracle import get_authentication
         data = {'grant_type':'client_credentials',
                 'audience': 'cool-flask-server'}
@@ -431,7 +432,7 @@ class DefectsDB(DefectsDBVirtualDefectsMixin,
                             headers={'Authorization': f'Bearer {token}'},
                             files={'file': ('iov.json', 
                                             json.dumps({'cool_multi_iov_request': submit_map}))},
-                                            verify=False
+                                            verify=('DQM_COOL_FLASK_NOVERIFY' not in os.environ)
                             )
             log.debug(r.content)
             if not r or r.json()['code'] != 0:

DataQuality/DQUtils/python/general.py

@@ -165,7 +165,7 @@ def timer(name):
         yield
     finally:
         end = time()
-        log.debug("Took %.2f to %s", (end - start, name))                
+        log.debug("Took %.2f to %s", end - start, name)
 
 def interleave(*args):
     return [item for items in zip(*args) for item in items]

DataQuality/DataQualityConfigurations/config/HLT/HLTegamma/collisions_run.config

@@ -1746,15 +1746,15 @@ compositeAlgorithm HLTegamma_Histogram_Not_Empty&GatherData {
 }
 algorithm HLTegamma_Histogram_Not_Empty&GatherData {
   name = HLTegamma_Histogram_Not_Empty&GatherData
-  #reference = HLT_local_egamma_reference
+  reference = HLT_local_egamma_reference
   reference = stream=physics_Main:CentrallyManagedReferences_TriggerMain;CentrallyManagedReferences_Trigger
 }
 
 reference HLT_local_egamma_reference {
   location = /eos/atlas/atlascerngroupdisk/data-dqm/references/,root://eosatlas.cern.ch//eos/atlas/atlascerngroupdisk/data-dqm/references/
-  file = HIST.29737390._000001.pool.root.1
-  path = run_360026
-  info = Run 360026
+  file = data23_13p6TeV.00456729.physics_Main.merge.HIST.f1370_h435._0001.1
+  path = run_456729
+  info = Run 456729
   #From ATR-25951
   name = same_name
 }
\ No newline at end of file

DataQuality/DataQualityConfigurations/config/Tile/collisions_run.config

@@ -2726,7 +2726,7 @@ dir Tile {
 
   dir DigiNoise {
     output = TileCal/Noise/Digit
-    hist noisemap_.*_hi_.* {
+    hist TileDigiNoise.*_HG {
       regex = 1
     }
   }
@@ -3335,20 +3335,16 @@ algorithm Tile_TileDigiErrors_CheckNonZeroBins {
   UseTotalEntries = 0
   EntriesBin = 18
   algorithm LB {
-    reference = TileDigiErrorsLB
   }
   algorithm EB {
-    reference = TileDigiErrorsEB
     IgnoreBin_DMU0_BadQ = 559
     IgnoreBin_DMU4_BadQ = 563
   }
   algorithm EB_special {
-    reference = TileDigiErrorsEB_special
     IgnoreBin_DMU0_BadQ = 559
     IgnoreBin_DMU4_BadQ = 563
   }
   algorithm EB_innerMBTS {
-    reference = TileDigiErrorsEB_innerMBTS
     UseReference = 0
     IgnoreBin_DMU0_BadQ = 559
     IgnoreBin_DMU1_Zeros = 344
@@ -3356,7 +3352,6 @@ algorithm Tile_TileDigiErrors_CheckNonZeroBins {
     IgnoreBin_DMU4_BadQ = 563
   }
   algorithm EBA40 {
-    reference = TileDigiErrorsEB_innerMBTS
     UseReference = 0
     thresholds = DMU_thr_EBA40
     IgnoreBin_DMU0_BadQ = 559
@@ -3624,7 +3619,7 @@ thresholds DMU_thr {
 thresholds DMU_thr_EBA40 {
   limits BinThreshold {
     warning = 0.001
-    error = 0.03
+    error = 0.01
   }
 }
 

DataQuality/DataQualityConfigurations/config/Tile/cosmics_run.config

@@ -1505,17 +1505,13 @@ algorithm DMU_alg {
   UseTotalEntries = 0
   EntriesBin = 18
   algorithm LB {
-    reference = TileDigiErrorsLB
   }
   algorithm EB {
-    reference = TileDigiErrorsEB
   }
   algorithm EB_special {
-    reference = TileDigiErrorsEB_special
   }
   algorithm EBA40 {
     thresholds = DMU_thr_EBA40
-    reference = TileDigiErrorsEB
   }
 }
 

DataQuality/DataQualityConfigurations/config/Tile/heavyions_run.config

@@ -3332,20 +3332,16 @@ algorithm Tile_TileDigiErrors_CheckNonZeroBins {
   UseTotalEntries = 0
   EntriesBin = 18
   algorithm LB {
-    reference = TileDigiErrorsLB
   }
   algorithm EB {
-    reference = TileDigiErrorsEB
     IgnoreBin_DMU0_BadQ = 559
     IgnoreBin_DMU4_BadQ = 563
   }
   algorithm EB_special {
-    reference = TileDigiErrorsEB_special
     IgnoreBin_DMU0_BadQ = 559
     IgnoreBin_DMU4_BadQ = 563
   }
   algorithm EB_innerMBTS {
-    reference = TileDigiErrorsEB_innerMBTS
     UseReference = 0
     IgnoreBin_DMU0_BadQ = 559
     IgnoreBin_DMU1_Zeros = 344
@@ -3353,7 +3349,6 @@ algorithm Tile_TileDigiErrors_CheckNonZeroBins {
     IgnoreBin_DMU4_BadQ = 563
   }
   algorithm EBA40 {
-    reference = TileDigiErrorsEB_innerMBTS
     UseReference = 0
     thresholds = DMU_thr_EBA40
     IgnoreBin_DMU0_BadQ = 559

DataQuality/DataQualityConfigurations/config/common/collisions_run.config

@@ -3,36 +3,36 @@
 #######################
 reference CentrallyManagedReferences {
   location = /eos/atlas/atlascerngroupdisk/data-dqm/references/,root://eosatlas.cern.ch//eos/atlas/atlascerngroupdisk/data-dqm/references/
-  file = data23_13p6TeV.00456729.express_express.merge.HIST.x755_h433._0001.1
-  path = run_456729
-  info = Run 456729, express_express
+  file = data24_13p6TeV.00474926.express_express.merge.HIST.f1462_h469_slimmed
+  path = run_474926
+  info = Run 474926, express_express
   #database = collisions
   name = same_name
 }
 
 reference CentrallyManagedReferences_Main {
   location = /eos/atlas/atlascerngroupdisk/data-dqm/references/,root://eosatlas.cern.ch//eos/atlas/atlascerngroupdisk/data-dqm/references/
-  file = data23_13p6TeV.00456729.physics_Main.merge.HIST.f1370_h435._0001.1
-  path = run_456729
-  info = Run 456729, physics_Main
+  file = data24_13p6TeV.00474926.physics_Main.merge.HIST.f1462_h469_slimmed
+  path = run_474926
+  info = Run 474926, physics_Main
   #database = collisions
   name = same_name
 }
 
 reference CentrallyManagedReferences_Trigger {
   location = /eos/atlas/atlascerngroupdisk/data-dqm/references/,root://eosatlas.cern.ch//eos/atlas/atlascerngroupdisk/data-dqm/references/
-  file = data23_13p6TeV.00456729.express_express.merge.HIST.x755_h433._0001.1
-  path = run_456729
-  info = Run 456729, express_express
+  file = data24_13p6TeV.00474926.express_express.merge.HIST.f1462_h469_slimmed
+  path = run_474926
+  info = Run 474926, express_express
   #database = collisions
   name = same_name
 }
 
 reference CentrallyManagedReferences_TriggerMain {
   location = /eos/atlas/atlascerngroupdisk/data-dqm/references/,root://eosatlas.cern.ch//eos/atlas/atlascerngroupdisk/data-dqm/references/
-  file = data23_13p6TeV.00456729.physics_Main.merge.HIST.f1370_h435._0001.1
-  path = run_456729
-  info = Run 456729, physics_Main
+  file = data24_13p6TeV.00474926.physics_Main.merge.HIST.f1462_h469_slimmed
+  path = run_474926
+  info = Run 474926, physics_Main
   #database = collisions
   name = same_name
 }