diff --git a/Calorimeter/CaloRec/share/CaloRec_jobOptions.py b/Calorimeter/CaloRec/share/CaloRec_jobOptions.py index 2d26a514de26769af8c542e6b847a5517ebed074..ea2cbea3f45bce9020c147d310492dcf18fc358f 100644 --- a/Calorimeter/CaloRec/share/CaloRec_jobOptions.py +++ b/Calorimeter/CaloRec/share/CaloRec_jobOptions.py @@ -368,10 +368,3 @@ if jobproperties.CaloRecFlags.doCaloTopoTower(): #mixed topo-cluster/topo-tower if jobproperties.CaloRecFlags.doCaloTopoSignal(): include ("CaloRec/CaloTopoSignalFragment.py" ) - -# Collision time algos: Needed for monitoring, must be scheduled *before* the MonManager -from LArMonTools.LArMonFlags import LArMonFlags -from AthenaMonitoring.DQMonFlags import DQMonFlags -if rec.doMonitoring() and DQMonFlags.doMonitoring() and LArMonFlags.doLArCollisionTimeMon(): - include("LArClusterRec/LArClusterCollisionTime_jobOptions.py") - include("LArCellRec/LArCollisionTime_jobOptions.py") diff --git a/Control/AthenaMonitoring/share/DataQualitySteering_jobOptions.py b/Control/AthenaMonitoring/share/DataQualitySteering_jobOptions.py index 3ff0bd06dbe7556350998b09847b925d7b43a6fd..d5533d0a5df3236ce1c25b4400d102955a5c3f7e 100644 --- a/Control/AthenaMonitoring/share/DataQualitySteering_jobOptions.py +++ b/Control/AthenaMonitoring/share/DataQualitySteering_jobOptions.py @@ -125,6 +125,11 @@ if DQMonFlags.doMonitoring(): # LAr monitoring # #------------------# if DQMonFlags.doLArMon(): + from LArMonTools.LArMonFlags import LArMonFlags + if LArMonFlags.doLArCollisionTimeMon(): + #Schedule algorithms producing collision timing + include("LArClusterRec/LArClusterCollisionTime_jobOptions.py") + include("LArCellRec/LArCollisionTime_jobOptions.py") try: LArMon = AthenaMonManager(name="LArMonManager", FileKey = DQMonFlags.monManFileKey(), @@ -394,4 +399,4 @@ if DQMonFlags.doMonitoring(): asq = AthSequencer("AthBeginSeq") asq += AthenaMonitoringConf.ForceIDConditionsAlg("ForceIDConditionsAlg") -del local_logger \ No newline at end of file +del local_logger diff --git a/LArCalorimeter/LArClusterRec/src/LArClusterCollisionTimeAlg.cxx b/LArCalorimeter/LArClusterRec/src/LArClusterCollisionTimeAlg.cxx index 9db935d45e5bfb6507361538932434d1e6903ad7..5a942a68030cae5c866b1d53f24dca6df2d23a63 100644 --- a/LArCalorimeter/LArClusterRec/src/LArClusterCollisionTimeAlg.cxx +++ b/LArCalorimeter/LArClusterRec/src/LArClusterCollisionTimeAlg.cxx @@ -6,17 +6,6 @@ #include <algorithm> -/* -//Constructor -LArClusterCollisionTimeAlg:: LArClusterCollisionTimeAlg(const std::string& name, ISvcLocator* pSvcLocator): - AthAlgorithm(name,pSvcLocator), - m_nEvt(0), - m_nCollEvt(0), - m_clusterContainerName{this, "InputName", "LArClusterEM"}, - m_outputName{this, "OutputName", "LArClusterCollTime"} - {} -*/ - //__________________________________________________________________________ StatusCode LArClusterCollisionTimeAlg::initialize() { @@ -36,9 +25,6 @@ StatusCode LArClusterCollisionTimeAlg::finalize() return StatusCode::SUCCESS; } - - - LArClusterCollisionTimeAlg::perSide_t LArClusterCollisionTimeAlg::analyseClustersPerSide(std::vector<const xAOD::CaloCluster*>& clusters) const { perSide_t result; @@ -71,7 +57,7 @@ StatusCode LArClusterCollisionTimeAlg::execute(const EventContext& ctx) const { // Get the cluster container SG::ReadHandle<xAOD::CaloClusterContainer> cluster_container (m_clusterContainerName,ctx); if( !cluster_container.isValid()) { // record empty object - ATH_MSG_INFO (" Could not get pointer to ClusterContainer "); + ATH_MSG_WARNING ("Could not get ClusterContainer with key " << m_clusterContainerName); // Construct the output object SG::WriteHandle<LArCollisionTime> larTime (m_outputName,ctx); ATH_CHECK( larTime.record (std::make_unique<LArCollisionTime>()) ); diff --git a/LArCalorimeter/LArMonitoring/python/LArCollisionTimeMonAlg.py b/LArCalorimeter/LArMonitoring/python/LArCollisionTimeMonAlg.py index 88eb02c0a98622e1a3fe271f1a465a172828671f..98475cb68df7698a4b179094f31014647ad07ec3 100644 --- a/LArCalorimeter/LArMonitoring/python/LArCollisionTimeMonAlg.py +++ b/LArCalorimeter/LArMonitoring/python/LArCollisionTimeMonAlg.py @@ -29,6 +29,9 @@ def LArCollisionTimeMonConfig(inputFlags): from LArCellRec.LArCollisionTimeConfig import LArCollisionTimeCfg cfg = LArCollisionTimeCfg(inputFlags) + from LArClusterRec.LArClusterCollisionTimeConfig import LArClusterCollisionTimeCfg + cfg.merge(LArClusterCollisionTimeCfg(inputFlags)) + larColTime_hist_path='LArCollisionTime' from AthenaConfiguration.ComponentFactory import CompFactory @@ -267,16 +270,6 @@ if __name__=='__main__': from CaloRec.CaloRecoConfig import CaloRecoCfg cfg=CaloRecoCfg(ConfigFlags) - # try collision time algo - from LArCellRec.LArCollisionTimeConfig import LArCollisionTimeCfg - cfg.merge(LArCollisionTimeCfg(ConfigFlags, cutIteration=False)) - # add cluster collision time algo - # cluster config is still missing - #from LArClusterRec.LArClusterSwConfig import LArClusterSwConfig - #cfg.merge(LArClusterSwConfig(ConfigFlags)) - from LArClusterRec.LArClusterCollisionTimeConfig import LArClusterCollisionTimeCfg - cfg.merge(LArClusterCollisionTimeCfg(ConfigFlags)) - from LumiBlockComps.BunchCrossingCondAlgConfig import BunchCrossingCondAlgCfg cfg.merge(BunchCrossingCondAlgCfg(ConfigFlags))