diff --git a/LArCalorimeter/LArCalibUtils/LArCalibUtils/LArAutoCorrDecoderTool.h b/LArCalorimeter/LArCalibUtils/LArCalibUtils/LArAutoCorrDecoderTool.h
index ca5e1ee294f6a0dc811b6dc79f9f6ab0ce78aab8..123281e0c02ce8401ae0b7d60a89878f93ed80cd 100644
--- a/LArCalorimeter/LArCalibUtils/LArCalibUtils/LArAutoCorrDecoderTool.h
+++ b/LArCalorimeter/LArCalibUtils/LArCalibUtils/LArAutoCorrDecoderTool.h
@@ -44,10 +44,10 @@ class LArAutoCorrDecoderTool:
private:
//Properties:
- Gaudi::Property<unsigned> m_decodemode{"DecodeMode",0};
- Gaudi::Property<bool> m_alwaysHighGain{"UseAlwaysHighGain",false};
- Gaudi::Property<bool> m_isSC{"isSC",false};
- Gaudi::Property<std::string> m_keyAutoCorr{"KeyAutoCorr","LArAutoCorr"};
+ Gaudi::Property<unsigned> m_decodemode{this,"DecodeMode",0};
+ Gaudi::Property<bool> m_alwaysHighGain{this,"UseAlwaysHighGain",false};
+ Gaudi::Property<bool> m_isSC{this,"isSC",false};
+ Gaudi::Property<std::string> m_keyAutoCorr{this,"KeyAutoCorr","LArAutoCorr"};
const Eigen::MatrixXd ACDiagonal( const HWIdentifier& CellID, int gain, unsigned nSamples) const;
const Eigen::MatrixXd ACPhysics( const HWIdentifier& CellID, int gain, unsigned nSamples) const;
diff --git a/LArCalorimeter/LArExample/LArCalibProcessing/python/LArCalib_Delay_OFCCaliConfig.py b/LArCalorimeter/LArExample/LArCalibProcessing/python/LArCalib_Delay_OFCCaliConfig.py
index e3b928cf83e83261becd5edd4e72cf158d1f416f..b7d1d0925cf5f42040fb6049f43ee19d1e3af964 100644
--- a/LArCalorimeter/LArExample/LArCalibProcessing/python/LArCalib_Delay_OFCCaliConfig.py
+++ b/LArCalorimeter/LArExample/LArCalibProcessing/python/LArCalib_Delay_OFCCaliConfig.py
@@ -128,13 +128,15 @@ def LArDelay_OFCCaliCfg(flags):
NtupleName = "CALIWAVE",
AddFEBTempInfo = False,
SaveDerivedInfo = True,
- ApplyCorrection = True
+ ApplyCorrection = True,
+ OffId=True
))
if rootfile2 == "":
result.addEventAlgo(CompFactory.LArOFC2Ntuple(ContainerKey = "LArOFC",
- AddFEBTempInfo = False
- ))
+ AddFEBTempInfo = False,
+ OffId=True
+ ))
import os
if os.path.exists(rootfile):
@@ -183,6 +185,9 @@ def LArDelay_OFCCaliCfg(flags):
result.getService("IOVDbSvc").DBInstance=""
+ from PerfMonComps.PerfMonCompsConfig import PerfMonMTSvcCfg
+ result.merge(PerfMonMTSvcCfg(flags))
+
return result
diff --git a/LArCalorimeter/LArExample/LArCalibProcessing/python/LArCalib_OFCPhysConfig.py b/LArCalorimeter/LArExample/LArCalibProcessing/python/LArCalib_OFCPhysConfig.py
index 4fe952adeaff952287893d203dfa6fbff00de2da..3befab03d1bd7d686e1907ea4c9a8c8b94b28099 100644
--- a/LArCalorimeter/LArExample/LArCalibProcessing/python/LArCalib_OFCPhysConfig.py
+++ b/LArCalorimeter/LArExample/LArCalibProcessing/python/LArCalib_OFCPhysConfig.py
@@ -145,6 +145,10 @@ def LArOFCPhysCfg(flags):
FirstEvent = 1,
InitialTimeStamp = 0,
TimeStampInterval = 1))
+
+ from PerfMonComps.PerfMonCompsConfig import PerfMonMTSvcCfg
+ result.merge(PerfMonMTSvcCfg(flags))
+
return result
diff --git a/LArCalorimeter/LArExample/LArCalibProcessing/python/LArCalib_PedestalAutoCorrConfig.py b/LArCalorimeter/LArExample/LArCalibProcessing/python/LArCalib_PedestalAutoCorrConfig.py
index b1d1c406fe9a550e44f3d0282d35d3bd1d99deca..fa4e29921e892cb016cbaedd12d44ab60613a813 100644
--- a/LArCalorimeter/LArExample/LArCalibProcessing/python/LArCalib_PedestalAutoCorrConfig.py
+++ b/LArCalorimeter/LArExample/LArCalibProcessing/python/LArCalib_PedestalAutoCorrConfig.py
@@ -198,6 +198,10 @@ def LArPedestalAutoCorrCfg(flags):
result.getService("IOVDbSvc").DBInstance=""
+ from PerfMonComps.PerfMonCompsConfig import PerfMonMTSvcCfg
+ result.merge(PerfMonMTSvcCfg(flags))
+
+
return result
diff --git a/LArCalorimeter/LArExample/LArCalibProcessing/python/LArCalib_PhysWavePredictionConfig.py b/LArCalorimeter/LArExample/LArCalibProcessing/python/LArCalib_PhysWavePredictionConfig.py
index e103f564238f980896fb5fed860fb96ddbd95081..64ada5d02f21f9d9f4b0fb85fd46a88d1b4d51c3 100644
--- a/LArCalorimeter/LArExample/LArCalibProcessing/python/LArCalib_PhysWavePredictionConfig.py
+++ b/LArCalorimeter/LArExample/LArCalibProcessing/python/LArCalib_PhysWavePredictionConfig.py
@@ -134,6 +134,9 @@ def LArPhysWavePredictionCfg(flags):
InitialTimeStamp = 0,
TimeStampInterval = 1))
+ from PerfMonComps.PerfMonCompsConfig import PerfMonMTSvcCfg
+ result.merge(PerfMonMTSvcCfg(flags))
+
return result
diff --git a/LArCalorimeter/LArExample/LArCalibProcessing/python/LArCalib_PileUpAutoCorrConfig.py b/LArCalorimeter/LArExample/LArCalibProcessing/python/LArCalib_PileUpAutoCorrConfig.py
index 1e611a4d00ce0166f926577092a6cc54bcfe047d..b10313fbce7141f011876102259e3e5d0cdc7696 100644
--- a/LArCalorimeter/LArExample/LArCalibProcessing/python/LArCalib_PileUpAutoCorrConfig.py
+++ b/LArCalorimeter/LArExample/LArCalibProcessing/python/LArCalib_PileUpAutoCorrConfig.py
@@ -52,8 +52,7 @@ def LArPileUpAutoCorrCfg(flags):
result.merge(LArElecCalibDbCfg(flags,requiredConditions))
result.addCondAlgo(CompFactory.LArADC2MeVCondAlg(UseFEBGainTresholds=False))
theLArAutoCorrTotalCondAlg=CompFactory.LArAutoCorrTotalCondAlg()
- theLArAutoCorrTotalCondAlg.Nminbias=nColl
- theLArAutoCorrTotalCondAlg.Nsamples=flags.LArCalib.OFC.Nsamples
+ theLArAutoCorrTotalCondAlg.Nsamples=5 #Hardcoded ...
from AthenaCommon.SystemOfUnits import ns
theLArAutoCorrTotalCondAlg.deltaBunch=int(flags.Beam.BunchSpacing/( 25.*ns)+0.5)
theLArAutoCorrTotalCondAlg.isSuperCell=flags.LArCalib.isSC
@@ -62,13 +61,14 @@ def LArPileUpAutoCorrCfg(flags):
theLArAutoCorrTotalCondAlg.LArAutoCorrTotalObjKey="LArPhysAutoCorr"
result.addCondAlgo(theLArAutoCorrTotalCondAlg)
- result.addEventAlgo(CompFactory.LArAutoCorrAlgToDB(NMinbias=nColl))
+ result.addEventAlgo(CompFactory.LArAutoCorrAlgToDB(GroupingType=flags.LArCalib.GroupingType,
+ NMinbias=nColl))
#Ntuple writing
rootfile=flags.LArCalib.Output.ROOTFile
if rootfile != "":
- result.addEventAlgo(CompFactory.LArAutoCorr2Ntuple(ContainerKey="LArPhysAutoCorr"))
+ result.addEventAlgo(CompFactory.LArAutoCorr2Ntuple(ContainerKey="LArPhysAutoCorr",OffId=True))
import os
if os.path.exists(rootfile):
os.remove(rootfile)
@@ -100,6 +100,10 @@ def LArPileUpAutoCorrCfg(flags):
InitialTimeStamp = 0,
TimeStampInterval = 1))
+
+ from PerfMonComps.PerfMonCompsConfig import PerfMonMTSvcCfg
+ result.merge(PerfMonMTSvcCfg(flags))
+
return result
diff --git a/LArCalorimeter/LArExample/LArCalibProcessing/python/LArCalib_RTMParamsConfig.py b/LArCalorimeter/LArExample/LArCalibProcessing/python/LArCalib_RTMParamsConfig.py
index 203fb2f2ec93e0fb604ffaa4b89152285bd290d2..8a81db92ebda6924d2433088b57628d1e1d666da 100644
--- a/LArCalorimeter/LArExample/LArCalibProcessing/python/LArCalib_RTMParamsConfig.py
+++ b/LArCalorimeter/LArExample/LArCalibProcessing/python/LArCalib_RTMParamsConfig.py
@@ -29,8 +29,6 @@ def LArRTMParamsCfg(flags):
LArRTMParamExtractor = CompFactory.LArRTMParamExtractor()
- LArRTMParamExtractor.useTBB=True
-
LArRTMParamExtractor.KeyList = ["LArCaliWave"]
LArRTMParamExtractor.TestMode = False
LArRTMParamExtractor.GroupingType = flags.LArCalib.GroupingType
@@ -121,6 +119,9 @@ def LArRTMParamsCfg(flags):
InitialTimeStamp = 0,
TimeStampInterval = 1))
+ from PerfMonComps.PerfMonCompsConfig import PerfMonMTSvcCfg
+ result.merge(PerfMonMTSvcCfg(flags))
+
return result
if __name__ == "__main__":
diff --git a/LArCalorimeter/LArExample/LArCalibProcessing/python/LArCalib_RampConfig.py b/LArCalorimeter/LArExample/LArCalibProcessing/python/LArCalib_RampConfig.py
index 7f6d810b8882d186f0301a04bdcd38f4b5ad3df3..2dd9e947d634561f93e0d566ff3b5e13eee35bd9 100644
--- a/LArCalorimeter/LArExample/LArCalibProcessing/python/LArCalib_RampConfig.py
+++ b/LArCalorimeter/LArExample/LArCalibProcessing/python/LArCalib_RampConfig.py
@@ -133,6 +133,10 @@ def LArRampCfg(flags):
result.setAppProperty("HistogramPersistency","ROOT")
pass # end if ROOT ntuple writing
+
+ from PerfMonComps.PerfMonCompsConfig import PerfMonMTSvcCfg
+ result.merge(PerfMonMTSvcCfg(flags))
+
return result
diff --git a/LArCalorimeter/LArExample/LArCalibProcessing/python/utils.py b/LArCalorimeter/LArExample/LArCalibProcessing/python/utils.py
index 10833efebd409feab7c36334720d27a5ec36b080..87bcaac7c4856916cac4ce2bf182d2f67ff9fc99 100644
--- a/LArCalorimeter/LArExample/LArCalibProcessing/python/utils.py
+++ b/LArCalorimeter/LArExample/LArCalibProcessing/python/utils.py
@@ -1,7 +1,7 @@
# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
from PyCool import cool
-
+from AthenaCommon.Logging import logging
class FolderTagResolver:
@@ -11,6 +11,7 @@ class FolderTagResolver:
def __init__(self,dbname="COOLOFL_LAR/CONDBR2"):
dbSvc = cool.DatabaseSvcFactory.databaseService()
self._db = dbSvc.openDatabase(dbname)
+ self._msg=logging.getLogger('FolderTagResolver')
return
def __del__(self):
@@ -21,12 +22,12 @@ class FolderTagResolver:
if globalTag is None:
globalTag=self.__class__._globalTag
- print ("globalTag=",globalTag)
+ self._msg.info("Looking up folder level tag for %s using globalTag %s",foldername,globalTag)
try:
folder=self._db.getFolder(foldername)
return folder.resolveTag(globalTag)
except Exception as e:
- print ("Could not resolve tag",globalTag)
+ self._msg.error("Could not resolve tag %s for folder %s in database %s",globalTag,foldername,self._db.databaseId())
print (e)
# new folder, should "create a tag"
return ''.join(foldername.split('/')) + '-RUN2-UPD3-00'