diff --git a/TileCalorimeter/TileRecUtils/TileRecUtils/TileCellBuilder.h b/TileCalorimeter/TileRecUtils/TileRecUtils/TileCellBuilder.h
index 6ab441ed6f98ea6ca388d09be4f47d49f4042db0..8e0bcabc98c9623dac257255f11a97b75e54a987 100644
--- a/TileCalorimeter/TileRecUtils/TileRecUtils/TileCellBuilder.h
+++ b/TileCalorimeter/TileRecUtils/TileRecUtils/TileCellBuilder.h
@@ -27,6 +27,10 @@
#include "TileEvent/TileRawChannelContainer.h"
#include "TileIdentifier/TileFragHash.h"
#include "TileIdentifier/TileRawChannelUnit.h"
+#include "TileConditions/ITileBadChanTool.h"
+#include "TileConditions/TileCondToolEmscale.h"
+#include "TileConditions/TileCondToolTiming.h"
+#include "TileRecUtils/ITileRawChannelTool.h"
//#include "TileRecUtils/TileBeamInfoProvider.h"
// Calo includes
@@ -61,10 +65,6 @@ class MbtsDetDescrManager;
class TileDetDescrManager;
class TileCellCollection;
class CaloCellContainer;
-class ITileBadChanTool;
-class TileCondToolEmscale;
-class TileCondToolTiming;
-class ITileRawChannelTool;
class TileBeamInfoProvider;
class TileDQstatus;
@@ -200,11 +200,19 @@ class TileCellBuilder: public AthAlgTool, virtual public ICaloCellMakerTool {
const TileCablingService* m_cabling; //!< TileCabling instance
const TileDQstatus* m_DQstatus;
- ToolHandle<ITileBadChanTool> m_tileBadChanTool; //!< Tile Bad Channel tool
- ToolHandle<TileCondToolEmscale> m_tileToolEmscale; //!< main Tile Calibration tool
- ToolHandle<TileCondToolTiming> m_tileToolTiming; //!< Tile Timing Calibration tool
+ ToolHandle<ITileBadChanTool> m_tileBadChanTool{this,
+ "TileBadChanTool", "TileBadChanTool", "Tile bad channel tool"};
+
+ ToolHandle<TileCondToolEmscale> m_tileToolEmscale{this,
+ "TileCondToolEmscale", "TileCondToolEmscale", "Tile EM scale calibration tool"};
+
+ ToolHandle<TileCondToolTiming> m_tileToolTiming{this,
+ "TileCondToolTiming", "TileCondToolTiming", "Tile timing tool"};
+
ToolHandle<TileBeamInfoProvider> m_beamInfo; //!< Beam Info tool to get the DQ Status object
- ToolHandleArray<ITileRawChannelTool> m_noiseFilterTools; //!< noise filter tools to apply
+
+ ToolHandleArray<ITileRawChannelTool> m_noiseFilterTools{this,
+ "NoiseFilterTools", {}, "Tile noise filter tools"};
const TileDetDescrManager* m_tileMgr; //!< Pointer to TileDetDescrManager
const MbtsDetDescrManager* m_mbtsMgr; //!< Pointer to MbtsDetDescrManager
diff --git a/TileCalorimeter/TileRecUtils/TileRecUtils/TileCellBuilderFromHit.h b/TileCalorimeter/TileRecUtils/TileRecUtils/TileCellBuilderFromHit.h
index a68d3971fae4bfebb65ed8d95e08a22346bf75dd..1c2c238c180a34e3a3e506eead28d04324bce74d 100644
--- a/TileCalorimeter/TileRecUtils/TileRecUtils/TileCellBuilderFromHit.h
+++ b/TileCalorimeter/TileRecUtils/TileRecUtils/TileCellBuilderFromHit.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TILERECUTILS_TILECELLBUILDERFROMHIT_H
@@ -28,6 +28,9 @@
#include "TileIdentifier/TileFragHash.h"
#include "TileIdentifier/TileRawChannelUnit.h"
#include "TileRecUtils/TileCellBuilder.h"
+#include "TileConditions/ITileBadChanTool.h"
+#include "TileConditions/TileCondToolEmscale.h"
+#include "TileConditions/TileCondToolTiming.h"
// Calo includes
#include "CaloInterface/ICaloCellMakerTool.h"
@@ -61,8 +64,6 @@ class MbtsDetDescrManager;
class TileDetDescrManager;
class TileCellCollection;
class CaloCellContainer;
-class ITileBadChanTool;
-class TileCondToolEmscale;
class TileCablingService;
class ICalorimeterNoiseTool;
class IAtRndmGenSvc;
@@ -140,8 +141,12 @@ class TileCellBuilderFromHit: public AthAlgTool, virtual public ICaloCellMakerTo
CLHEP::HepRandomEngine * m_pHRengine; //!< Random number generator engine to use
ServiceHandle<IAtRndmGenSvc> m_rndmSvc; //!< Random number service to use
- ToolHandle<ITileBadChanTool> m_tileBadChanTool; //!< Tile Bad Channel tool
- ToolHandle<TileCondToolEmscale> m_tileToolEmscale; //!< main Tile Calibration tool
+ ToolHandle<ITileBadChanTool> m_tileBadChanTool{this,
+ "TileBadChanTool", "TileBadChanTool", "Tile bad channel tool"};
+
+ ToolHandle<TileCondToolEmscale> m_tileToolEmscale{this,
+ "TileCondToolEmscale", "TileCondToolEmscale", "Tile EM scale calibration tool"};
+
ToolHandle<ICalorimeterNoiseTool> m_noiseTool; //!< Calo Noise tool with noise values
const TileDetDescrManager* m_tileMgr; //!< Pointer to TileDetDescrManager
diff --git a/TileCalorimeter/TileRecUtils/TileRecUtils/TileCellNoiseFilter.h b/TileCalorimeter/TileRecUtils/TileRecUtils/TileCellNoiseFilter.h
index a075ecf3d8af59f886c8f40820aa2045ef6bc9cc..1fb4959bfd012ff58bca6af8fe38b2b1f3d1c885 100644
--- a/TileCalorimeter/TileRecUtils/TileRecUtils/TileCellNoiseFilter.h
+++ b/TileCalorimeter/TileRecUtils/TileRecUtils/TileCellNoiseFilter.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
*/
//////////////////////////////////////////////////////////////////////
@@ -8,32 +8,34 @@
#ifndef TILERECUTILS_TILECELLNOISEFILTER_H
#define TILERECUTILS_TILECELLNOISEFILTER_H
-// Atlas includes
-#include "AthenaBaseComps/AthAlgTool.h"
-#include "GaudiKernel/ToolHandle.h"
-#include "GaudiKernel/ServiceHandle.h"
+// Tile includes
+#include "TileConditions/ITileBadChanTool.h"
+#include "TileConditions/TileCondToolEmscale.h"
+#include "TileConditions/TileCondToolNoiseSample.h"
// Calo includes
#include "CaloIdentifier/CaloCell_ID.h"
#include "CaloInterface/ICaloCellMakerTool.h"
#include "CaloInterface/ICalorimeterNoiseTool.h"
-// Tile includes
-#include "TileConditions/ITileBadChanTool.h"
+// Atlas includes
+#include "AthenaBaseComps/AthAlgTool.h"
+#include "GaudiKernel/ToolHandle.h"
+#include "GaudiKernel/ServiceHandle.h"
+
// forward declarations
class TileID;
class TileHWID;
class TileCell;
class CaloCellContainer;
-class TileCondToolEmscale;
-class TileCondToolNoiseSample;
/**
@class TileCellNoiseFilter
@brief This tool subtracts common-mode noise from all TileCells
*/
-class TileCellNoiseFilter: public AthAlgTool, virtual public ICaloCellMakerTool {
+class TileCellNoiseFilter: public extends<AthAlgTool, ICaloCellMakerTool> {
+
public:
/** AlgTool like constructor */
@@ -70,10 +72,16 @@ class TileCellNoiseFilter: public AthAlgTool, virtual public ICaloCellMakerTool
const TileID* m_tileID; //!< Pointer to TileID
const TileHWID* m_tileHWID; //!< Pointer to TileHWID
- ToolHandle<TileCondToolEmscale> m_tileToolEmscale; //!< main Tile Calibration tool
- ToolHandle<TileCondToolNoiseSample> m_tileToolNoiseSample; //!< tool which provided noise values
+ ToolHandle<TileCondToolEmscale> m_tileToolEmscale{this,
+ "TileCondToolEmscale", "TileCondToolEmscale", "Tile EM scale calibration tool"};
+
+ ToolHandle<TileCondToolNoiseSample> m_tileToolNoiseSample{this,
+ "TileCondToolNoiseSample", "TileCondToolNoiseSample", "Tile noise sample tool"};
+
ToolHandle<ICalorimeterNoiseTool> m_noiseTool; //!< Calo Noise tool
- ToolHandle<ITileBadChanTool> m_tileBadChanTool; //!< Tile Bad Channel tool
+
+ ToolHandle<ITileBadChanTool> m_tileBadChanTool{this,
+ "TileBadChanTool", "TileBadChanTool", "Tile bad channel tool"};
// properties
float m_truncationThresholdOnAbsEinSigma;
diff --git a/TileCalorimeter/TileRecUtils/TileRecUtils/TileRawChannelBuilder.h b/TileCalorimeter/TileRecUtils/TileRecUtils/TileRawChannelBuilder.h
index 5e2e6d344b4dd89616d3cea4861845416e146026..260e86c5bc5d3ae776e0d1adc7dd3d41908b2086 100644
--- a/TileCalorimeter/TileRecUtils/TileRecUtils/TileRawChannelBuilder.h
+++ b/TileCalorimeter/TileRecUtils/TileRecUtils/TileRawChannelBuilder.h
@@ -28,6 +28,7 @@
#include "TileEvent/TileMutableRawChannelContainer.h"
#include "TileEvent/TileRawChannelContainer.h"
#include "TileEvent/TileDigitsCollection.h"
+#include "TileRecUtils/ITileRawChannelTool.h"
// Atlas includes
#include "AthenaBaseComps/AthAlgTool.h"
@@ -47,7 +48,6 @@ class TileID;
class TileHWID;
class TileInfo;
class TileBeamInfoProvider;
-class ITileRawChannelTool;
class StoreGateSvc;
typedef std::vector<std::pair<TileRawChannel*, const TileDigits*> > Overflows_t;
@@ -172,7 +172,8 @@ class TileRawChannelBuilder: public AthAlgTool {
const TileInfo* m_tileInfo;
ToolHandle<TileBeamInfoProvider> m_beamInfo;
- ToolHandleArray<ITileRawChannelTool> m_noiseFilterTools;
+ ToolHandleArray<ITileRawChannelTool> m_noiseFilterTools{this,
+ "NoiseFilterTools", {}, "Tile nose filter tools"};
int m_trigType;
bool m_idophys; // Phys fitting
diff --git a/TileCalorimeter/TileRecUtils/TileRecUtils/TileRawChannelBuilderFitFilterCool.h b/TileCalorimeter/TileRecUtils/TileRecUtils/TileRawChannelBuilderFitFilterCool.h
index b84c05bc47b87a4580192d177084e1948a39453c..1245759a599fab1dfb55738ffbc96b1e3360e303 100644
--- a/TileCalorimeter/TileRecUtils/TileRecUtils/TileRawChannelBuilderFitFilterCool.h
+++ b/TileCalorimeter/TileRecUtils/TileRecUtils/TileRawChannelBuilderFitFilterCool.h
@@ -126,12 +126,21 @@ class TileRawChannelBuilderFitFilterCool: public TileRawChannelBuilder
// Pulse shapes
TilePulseShapesStruct* m_pulseShapes;
- ToolHandle<TileCondToolPulseShape> m_tileToolPulseShape;
- ToolHandle<TileCondToolPulseShape> m_tileToolLeak100Shape;
- ToolHandle<TileCondToolPulseShape> m_tileToolLeak5p2Shape;
- ToolHandle<TileCondToolPulseShape> m_tileToolPulse5p2Shape;
+ ToolHandle<TileCondToolPulseShape> m_tileToolPulseShape{this,
+ "TileCondToolPulseShape", "TileCondToolPulseShape", "Tile pulse shape tool"};
+
+ ToolHandle<TileCondToolPulseShape> m_tileToolLeak100Shape{this,
+ "TileCondToolLeak100Shape", "", "Tile CIS leakage shape for 100 pF capacitor tool"};
+
+ ToolHandle<TileCondToolPulseShape> m_tileToolLeak5p2Shape{this,
+ "TileCondToolLeak5p2Shape", "", "Tile CIS leakage shape for 5.2 pF capacitor tool"};
+
+ ToolHandle<TileCondToolPulseShape> m_tileToolPulse5p2Shape{this,
+ "TileCondToolPulse5p2Shape", "", "Tile CIS pulse shape for 5.2 pF capacitor tool"};
+
+ ToolHandle<TileCondToolNoiseSample> m_tileToolNoiseSample{this,
+ "TileCondToolNoiseSample", "TileCondToolNoiseSample", "Tile sample noise tool"};
- ToolHandle<TileCondToolNoiseSample> m_tileToolNoiseSample;
TilePulseShapesStruct* m_shapes;
};
diff --git a/TileCalorimeter/TileRecUtils/TileRecUtils/TileRawChannelBuilderMF.h b/TileCalorimeter/TileRecUtils/TileRecUtils/TileRawChannelBuilderMF.h
index acd8c6d235c4a4d00f4ea295a9618348d565c62d..b86facab38d067f2ee806b4c0b4580877ddeec87 100644
--- a/TileCalorimeter/TileRecUtils/TileRecUtils/TileRawChannelBuilderMF.h
+++ b/TileCalorimeter/TileRecUtils/TileRecUtils/TileRawChannelBuilderMF.h
@@ -47,10 +47,18 @@ class TileRawChannelBuilderMF: public TileRawChannelBuilder {
virtual TileRawChannel * rawChannel(const TileDigits* digits);
private:
- ToolHandle<TileCondToolTiming> m_tileToolTiming;
- ToolHandle<ITileCondToolOfc> m_tileCondToolOfc;
- ToolHandle<ITileCondToolOfc> m_tileCondToolOfcOnFly;
- ToolHandle<TileCondToolNoiseSample> m_tileToolNoiseSample;
+
+ ToolHandle<TileCondToolTiming> m_tileToolTiming{this,
+ "TileCondToolTiming", "TileCondToolTiming", "Tile timing tool"};
+
+ ToolHandle<ITileCondToolOfc> m_tileCondToolOfc{this,
+ "TileCondToolOfc", "TileCondToolOfc", "Tile OFC tool"};
+
+ ToolHandle<ITileCondToolOfc> m_tileCondToolOfcOnFly{this,
+ "TileCondToolOfcOnFly", "TileCondToolOfc", "Tile OFC (calculated on the fly) tool"};
+
+ ToolHandle<TileCondToolNoiseSample> m_tileToolNoiseSample{this,
+ "TileCondToolNoiseSample", "TileCondToolNoiseSample", "Tile noise sample tool"};
bool are3FF(float &dmin, float &dmax); //!< Checks that all the samples are 0x3FF (as sent by the DSP when no data arrives)
diff --git a/TileCalorimeter/TileRecUtils/TileRecUtils/TileRawChannelBuilderOpt2Filter.h b/TileCalorimeter/TileRecUtils/TileRecUtils/TileRawChannelBuilderOpt2Filter.h
index f88aeb34e06d6a2d0be117c73caf284db58acf59..1d4fe4fdaa2ab9b3ca4377d003f06c1edb96e09e 100644
--- a/TileCalorimeter/TileRecUtils/TileRecUtils/TileRawChannelBuilderOpt2Filter.h
+++ b/TileCalorimeter/TileRecUtils/TileRecUtils/TileRawChannelBuilderOpt2Filter.h
@@ -66,9 +66,14 @@ class TileRawChannelBuilderOpt2Filter: public TileRawChannelBuilder {
private:
- ToolHandle<TileCondToolTiming> m_tileToolTiming;
- ToolHandle<ITileCondToolOfc> m_tileCondToolOfc;
- ToolHandle<TileCondToolNoiseSample> m_tileToolNoiseSample; //!< tool which provides noise values
+ ToolHandle<TileCondToolTiming> m_tileToolTiming{this,
+ "TileCondToolTiming", "TileCondToolTiming", "Tile timing tool"};
+
+ ToolHandle<ITileCondToolOfc> m_tileCondToolOfc{this,
+ "TileCondToolOfc", "TileCondToolOfc", "Tile OFC tool"};
+
+ ToolHandle<TileCondToolNoiseSample> m_tileToolNoiseSample{this,
+ "TileCondToolNoiseSample", "TileCondToolNoiseSample", "Tile noise sample tool"};
//!< Applies OF algorithm
double filter(int ros, int drawer, int channel, int &gain, double &pedestal, double &litude, double &time);
diff --git a/TileCalorimeter/TileRecUtils/TileRecUtils/TileRawChannelMaker.h b/TileCalorimeter/TileRecUtils/TileRecUtils/TileRawChannelMaker.h
index 2dffc9e5385425e159248e2a602e39cfa549649c..3c1839a7796647e0971d17b98bdeca4618184c82 100644
--- a/TileCalorimeter/TileRecUtils/TileRecUtils/TileRawChannelMaker.h
+++ b/TileCalorimeter/TileRecUtils/TileRecUtils/TileRawChannelMaker.h
@@ -26,6 +26,7 @@
// Tile includes
#include "TileEvent/TileDigitsContainer.h"
+#include "TileRecUtils/TileRawChannelBuilder.h"
// Atlas includes
#include "AthenaBaseComps/AthAlgorithm.h"
@@ -66,10 +67,12 @@ class TileRawChannelMaker: public AthAlgorithm {
* Vector of builder algtools
*/
// std::vector<TileRawChannelBuilder*> m_TileRawChannelBuilderVec;
- ToolHandleArray<TileRawChannelBuilder> m_tileRawChannelBuilderList;
+ ToolHandleArray<TileRawChannelBuilder> m_tileRawChannelBuilderList{this,
+ "TileRawChannelBuilder", {}, "Tile raw channels builder tools"};
bool m_fitOverflow;
- ToolHandle<TileRawChannelBuilder> m_tileRawChannelBuilderFitOverflow;
+ ToolHandle<TileRawChannelBuilder> m_tileRawChannelBuilderFitOverflow{this,
+ "TileRawChannelBuilderFitOverflow", "", "Tile raw channels builder tool to fit overflows"};
float m_overflowReplaceTimeCut;
float m_overflowReplacePedestalCut;
diff --git a/TileCalorimeter/TileRecUtils/TileRecUtils/TileRawChannelNoiseFilter.h b/TileCalorimeter/TileRecUtils/TileRecUtils/TileRawChannelNoiseFilter.h
index e5de9b827bfbd107305322be2e64a88c6dbbf38b..ce0cae35b92ad4c53aa554a0749a0e1c8778bde5 100644
--- a/TileCalorimeter/TileRecUtils/TileRecUtils/TileRawChannelNoiseFilter.h
+++ b/TileCalorimeter/TileRecUtils/TileRecUtils/TileRawChannelNoiseFilter.h
@@ -8,32 +8,31 @@
#ifndef TILERAWCHANNELNOISEFILTER_H
#define TILERAWCHANNELNOISEFILTER_H
-// Atlas includes
-#include "AthenaBaseComps/AthAlgTool.h"
-#include "GaudiKernel/ToolHandle.h"
-#include "GaudiKernel/ServiceHandle.h"
-
// Tile includes
#include "TileIdentifier/TileRawChannelUnit.h"
#include "TileRecUtils/ITileRawChannelTool.h"
#include "TileConditions/TileCondToolEmscale.h"
+#include "TileConditions/ITileBadChanTool.h"
+#include "TileConditions/TileCondToolNoiseSample.h"
+
+// Atlas includes
+#include "AthenaBaseComps/AthAlgTool.h"
+#include "GaudiKernel/ToolHandle.h"
+#include "GaudiKernel/ServiceHandle.h"
// forward declarations
class TileHWID;
class TileRawChannel;
class TileRawChannelContainer;
class TileRawChannelCollection;
-class ITileBadChanTool;
-//class TileCondToolEmscale;
-class TileCondToolNoiseSample;
class TileBeamInfoProvider;
/**
@class TileRawChannelNoiseFilter
@brief This tool subtracts common-mode noise from all TileRawChannels in one container
*/
-class TileRawChannelNoiseFilter: public extends<AthAlgTool, ITileRawChannelTool>
-{
+class TileRawChannelNoiseFilter: public extends<AthAlgTool, ITileRawChannelTool> {
+
public:
/** AlgTool like constructor */
@@ -56,9 +55,15 @@ class TileRawChannelNoiseFilter: public extends<AthAlgTool, ITileRawChannelTool>
const TileHWID* m_tileHWID; //!< Pointer to TileHWID
- ToolHandle<TileCondToolEmscale> m_tileToolEmscale; //!< main Tile Calibration tool
- ToolHandle<TileCondToolNoiseSample> m_tileToolNoiseSample; //!< tool which provided noise values
- ToolHandle<ITileBadChanTool> m_tileBadChanTool; //!< Tile Bad Channel tool
+ ToolHandle<TileCondToolEmscale> m_tileToolEmscale{this,
+ "TileCondToolEmscale", "TileCondToolEmscale", "Tile EM scale calibration tool"};
+
+ ToolHandle<TileCondToolNoiseSample> m_tileToolNoiseSample{this,
+ "TileCondToolNoiseSample", "TileCondToolNoiseSample", "Tile noise sample tool"};
+
+ ToolHandle<ITileBadChanTool> m_tileBadChanTool{this,
+ "TileBadChanTool", "TileBadChanTool", "Tile bad channel tool"};
+
ToolHandle<TileBeamInfoProvider> m_beamInfo; //!< Beam Info tool to get the DQ Status object
// properties
diff --git a/TileCalorimeter/TileRecUtils/TileRecUtils/TileRawChannelOF1Corrector.h b/TileCalorimeter/TileRecUtils/TileRecUtils/TileRawChannelOF1Corrector.h
index e21bdad22250e817ea95990db80518e319bd6ad3..92e63c4faf3ae486c32c59b9a5c61cc07948a644 100644
--- a/TileCalorimeter/TileRecUtils/TileRecUtils/TileRawChannelOF1Corrector.h
+++ b/TileCalorimeter/TileRecUtils/TileRecUtils/TileRawChannelOF1Corrector.h
@@ -12,6 +12,10 @@
#include "TileRecUtils/ITileRawChannelTool.h"
#include "TileEvent/TileDigitsContainer.h"
#include "TileConditions/ITileCondToolDspThreshold.h"
+#include "TileConditions/TileCondToolNoiseSample.h"
+#include "TileConditions/TileCondToolOfc.h"
+#include "TileConditions/TileCondToolTiming.h"
+#include "TileConditions/TileCondToolEmscale.h"
// Atlas includes
#include "AthenaBaseComps/AthAlgTool.h"
@@ -26,19 +30,14 @@ class TileRawChannel;
class TileRawChannelContainer;
class TileRawChannelCollection;
class TileHWID;
-class TileCondToolNoiseSample;
-class ITileCondToolOfc;
-class TileCondToolTiming;
-class TileCondToolEmscale;
-//class ITileCondToolDspThresholds;
/**
@class TileRawChannelOF1Corrector
@brief This tool correct TileRawChannels amplitudes which came from OF1 DSP if pedestal changed
*/
-class TileRawChannelOF1Corrector: public extends<AthAlgTool, ITileRawChannelTool>
-{
-public:
+class TileRawChannelOF1Corrector: public extends<AthAlgTool, ITileRawChannelTool> {
+
+ public:
/** AlgTool like constructor */
TileRawChannelOF1Corrector(const std::string& type, const std::string& name, const IInterface* parent);
@@ -59,15 +58,24 @@ public:
const TileHWID* m_tileHWID; //!< Pointer to TileHWID
- ToolHandle<TileCondToolNoiseSample> m_tileToolNoiseSample; //!< tool which provided noise values
- ToolHandle<ITileCondToolOfc> m_tileCondToolOfc;
- ToolHandle<TileCondToolTiming> m_tileToolTiming;
- ToolHandle<TileCondToolEmscale> m_tileToolEms;
- ToolHandle<ITileCondToolDspThreshold> m_tileDspThreshold;
+ ToolHandle<TileCondToolNoiseSample> m_tileToolNoiseSample{this,
+ "TileCondToolNoiseSample", "TileCondToolNoiseSample", "Tile noise sample tool"};
+
+ ToolHandle<ITileCondToolOfc> m_tileCondToolOfc{this,
+ "TileCondToolOfc", "TileCondToolOfcCoolOF1", "Tile OFC tool"};
+
+ ToolHandle<TileCondToolTiming> m_tileToolTiming{this,
+ "TileCondToolTiming", "TileCondToolOnlineTiming", "Tile timing tool"};
+
+ ToolHandle<TileCondToolEmscale> m_tileToolEms{this,
+ "TileCondToolEmscale", "TileCondToolEmscale", "Tile EM scale calibration tool"};
+
+ ToolHandle<ITileCondToolDspThreshold> m_tileDspThreshold{this,
+ "TileCondToolDspThreshold", "TileCondToolDspThreshold", "Tile DSP thresholds tool"};
- SG::ReadHandleKey<TileDigitsContainer> m_digitsContainerKey{this, "TileDigitsContainer",
- "TileDigitsCnt", "Input Tile digits container key"};
+ SG::ReadHandleKey<TileDigitsContainer> m_digitsContainerKey{this,
+ "TileDigitsContainer", "TileDigitsCnt", "Input Tile digits container key"};
bool m_zeroAmplitudeWithoutDigits;
diff --git a/TileCalorimeter/TileRecUtils/python/TileRawChannelGetter.py b/TileCalorimeter/TileRecUtils/python/TileRawChannelGetter.py
index 8480a5932087d5c86a97578add132052d201cc79..dd28988cdc05e0d4083d528ad1a41450ed1d6578 100644
--- a/TileCalorimeter/TileRecUtils/python/TileRawChannelGetter.py
+++ b/TileCalorimeter/TileRecUtils/python/TileRawChannelGetter.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
# Author: J. Poveda (Ximo.Poveda@cern.ch)
# TileRawChannel creation from TileDigits
@@ -20,8 +20,7 @@ class TileRawChannelGetter ( Configured) :
algorithm to obtain TileRawChannel objects from the TileDigits stored
in a TileDigitsContainer.
According to the values of the TileRecFlags jobProperties, the
- corresponding AlgTools are added tothe ToolSvc and associated to
- TileRawChannelMaker algorithm.
+ corresponding AlgTools are added to TileRawChannelMaker algorithm.
"""
_outputType = "TileRawChannelContainer"
@@ -95,38 +94,6 @@ class TileRawChannelGetter ( Configured) :
ToolSvc += theTileBeamInfoProvider
- NoiseFilterTools = []
- if jobproperties.TileRecFlags.noiseFilter() == 1:
-
- if globalflags.DataSource() == 'data':
-
- # check if there are DSP thresholds in DB
- if jobproperties.TileRecFlags.zeroAmplitudeWithoutDigits() and not tileInfoConfigurator.setupCOOLDspThreshold():
- jobproperties.TileRecFlags.zeroAmplitudeWithoutDigits = False
-
- if jobproperties.TileRecFlags.correctPedestalDifference():
- # check if offline and there are OFCs in DB for OF1 method
- if athenaCommonFlags.isOnline() or not tileInfoConfigurator.setupCOOLOFC(ofcType = 'OF1'):
- jobproperties.TileRecFlags.correctPedestalDifference = False
- else:
- tileInfoConfigurator.setupCOOLTIME(online = True)
-
- if jobproperties.TileRecFlags.zeroAmplitudeWithoutDigits() or jobproperties.TileRecFlags.correctPedestalDifference():
- from TileRecUtils.TileRecUtilsConf import TileRawChannelOF1Corrector
- theTileRawChannelOF1Corrector = TileRawChannelOF1Corrector()
- theTileRawChannelOF1Corrector.CorrectPedestalDifference = jobproperties.TileRecFlags.correctPedestalDifference()
- theTileRawChannelOF1Corrector.ZeroAmplitudeWithoutDigits = jobproperties.TileRecFlags.zeroAmplitudeWithoutDigits()
-
- ToolSvc += theTileRawChannelOF1Corrector
- NoiseFilterTools += [theTileRawChannelOF1Corrector]
-
- from TileRecUtils.TileRecUtilsConf import TileRawChannelNoiseFilter
- theTileRawChannelNoiseFilter = TileRawChannelNoiseFilter()
- ToolSvc += theTileRawChannelNoiseFilter
- NoiseFilterTools += [theTileRawChannelNoiseFilter]
-
-
-
TileFrameLength = ServiceMgr.TileInfoLoader.NSamples
if TileFrameLength!=7:
mlog.info("disabling reading of OFC from COOL because Nsamples!=7")
@@ -140,6 +107,46 @@ class TileRawChannelGetter ( Configured) :
TilePulseTypes = {0 : 'PHY', 1 : 'PHY', 2 : 'LAS', 4 : 'PHY', 8 : 'CIS'}
TilePulse = TilePulseTypes[jobproperties.TileRecFlags.TileRunType()]
+ from TileConditions.TileCondToolConf import getTileCondToolOfcCool
+ toolOfcCool = None
+ toolOfcCoolOF1 = None
+
+ NoiseFilterTools = []
+ if jobproperties.TileRecFlags.noiseFilter() == 1:
+
+ if globalflags.DataSource() == 'data':
+
+ # check if there are DSP thresholds in DB
+ if jobproperties.TileRecFlags.zeroAmplitudeWithoutDigits() and not tileInfoConfigurator.setupCOOLDspThreshold():
+ jobproperties.TileRecFlags.zeroAmplitudeWithoutDigits = False
+
+ if jobproperties.TileRecFlags.correctPedestalDifference():
+ # check if offline and there are OFCs in DB for OF1 method
+ toolOfcCoolOF1 = getTileCondToolOfcCool('COOL', TilePulse, 'OF1', 'TileCondToolOfcCoolOF1')
+ if athenaCommonFlags.isOnline() or not toolOfcCoolOF1:
+ jobproperties.TileRecFlags.correctPedestalDifference = False
+ else:
+ tileInfoConfigurator.setupCOOLTIME(online = True)
+
+ if jobproperties.TileRecFlags.zeroAmplitudeWithoutDigits() or jobproperties.TileRecFlags.correctPedestalDifference():
+ from TileRecUtils.TileRecUtilsConf import TileRawChannelOF1Corrector
+ theTileRawChannelOF1Corrector = TileRawChannelOF1Corrector()
+ theTileRawChannelOF1Corrector.CorrectPedestalDifference = jobproperties.TileRecFlags.correctPedestalDifference()
+ theTileRawChannelOF1Corrector.ZeroAmplitudeWithoutDigits = jobproperties.TileRecFlags.zeroAmplitudeWithoutDigits()
+
+ if jobproperties.TileRecFlags.correctPedestalDifference():
+ from TileConditions.TileCondToolConf import getTileCondToolTiming
+ toolOnlineTiming = getTileCondToolTiming('COOL', TilePulse, True, 'TileCondToolOnlineTiming')
+ theTileRawChannelOF1Corrector.TileCondToolTiming = toolOnlineTiming
+ theTileRawChannelOF1Corrector.TileCondToolOfc = toolOfcCoolOF1
+
+ NoiseFilterTools += [theTileRawChannelOF1Corrector]
+
+ from TileRecUtils.TileRecUtilsConf import TileRawChannelNoiseFilter
+ theTileRawChannelNoiseFilter = TileRawChannelNoiseFilter()
+ NoiseFilterTools += [theTileRawChannelNoiseFilter]
+
+
if (jobproperties.TileRecFlags.doTileMF()
or (not jobproperties.TileRecFlags.OfcFromCOOL()
and (jobproperties.TileRecFlags.doTileOF1()
@@ -158,10 +165,14 @@ class TileRawChannelGetter ( Configured) :
or jobproperties.TileRecFlags.doTileOptATLAS()):
tileInfoConfigurator.setupCOOLOFC(type = TilePulse)
+ toolOfcCool = getTileCondToolOfcCool('COOL', TilePulse)
if jobproperties.TileRecFlags.doTileOF1():
tileInfoConfigurator.setupCOOLOFC(type = TilePulse, ofcType = 'OF1')
+ if not toolOfcCoolOF1:
+ toolOfcCoolOF1 = getTileCondToolOfcCool('COOL', TilePulse, 'OF1', 'TileCondToolOfcCoolOF1')
+
if jobproperties.TileRecFlags.doTileQIE():
try:
@@ -181,10 +192,9 @@ class TileRawChannelGetter ( Configured) :
theTileRawChannelBuilderQIEFilter.NoiseFilterTools= NoiseFilterTools
theTileRawChannelBuilderQIEFilter.PedestalMode = 1
- mlog.info(" adding now TileRawChannelBuilderQIEFilter to ToolSvc")
- ToolSvc += theTileRawChannelBuilderQIEFilter
+ mlog.info(" adding now TileRawChannelBuilderQIEFilter to the aglorithm: %s" % theTileRawChannelMaker.name())
- theTileRawChannelMaker.TileRawChannelBuilder += [ToolSvc.TileRawChannelBuilderQIEFilter]
+ theTileRawChannelMaker.TileRawChannelBuilder += [theTileRawChannelBuilderQIEFilter]
# fit with several amplitudes
if jobproperties.TileRecFlags.doTileManyAmps():
@@ -205,10 +215,9 @@ class TileRawChannelGetter ( Configured) :
theTileRawChannelBuilderManyAmps.correctTime = jobproperties.TileRecFlags.correctTime()
theTileRawChannelBuilderManyAmps.NoiseFilterTools= NoiseFilterTools
- mlog.info(" adding now TileRawChannelBuilderManyAmps to ToolSvc")
- ToolSvc += theTileRawChannelBuilderManyAmps
+ mlog.info(" adding now TileRawChannelBuilderManyAmps to the aglorithm: %s" % theTileRawChannelMaker.name())
- theTileRawChannelMaker.TileRawChannelBuilder += [ToolSvc.TileRawChannelBuilderManyAmps]
+ theTileRawChannelMaker.TileRawChannelBuilder += [theTileRawChannelBuilderManyAmps]
# flat filter - sum of 5 samples
if jobproperties.TileRecFlags.doTileFlat():
@@ -231,10 +240,9 @@ class TileRawChannelGetter ( Configured) :
theTileRawChannelBuilderFlatFilter.FrameLength = TileFrameLength
theTileRawChannelBuilderFlatFilter.SignalLength = TileFrameLength - 1
- mlog.info(" adding now TileRawChannelBuilderFlatFilter to ToolSvc")
- ToolSvc += theTileRawChannelBuilderFlatFilter
+ mlog.info(" adding now TileRawChannelBuilderFlatFilter to the aglorithm: %s" % theTileRawChannelMaker.name())
- theTileRawChannelMaker.TileRawChannelBuilder += [ToolSvc.TileRawChannelBuilderFlatFilter]
+ theTileRawChannelMaker.TileRawChannelBuilder += [theTileRawChannelBuilderFlatFilter]
# Fit method
if jobproperties.TileRecFlags.doTileFit() or jobproperties.TileRecFlags.doTileOverflowFit():
@@ -256,18 +264,17 @@ class TileRawChannelGetter ( Configured) :
theTileRawChannelBuilderFitFilter.FrameLength = TileFrameLength
# add the tool to list of tool ( should use ToolHandle eventually)
- mlog.info(" adding now TileRawChannelBuilderFitFilter to ToolSvc")
- ToolSvc += theTileRawChannelBuilderFitFilter
+ mlog.info(" adding now TileRawChannelBuilderFitFilter to the aglorithm: %s" % theTileRawChannelMaker.name())
if jobproperties.TileRecFlags.doTileFit():
jobproperties.TileRecFlags.TileRawChannelContainer = "TileRawChannelFit"
theTileRawChannelBuilderFitFilter.TileRawChannelContainer = "TileRawChannelFit"
- theTileRawChannelMaker.TileRawChannelBuilder += [ToolSvc.TileRawChannelBuilderFitFilter]
+ theTileRawChannelMaker.TileRawChannelBuilder += [theTileRawChannelBuilderFitFilter]
if jobproperties.TileRecFlags.doTileOverflowFit():
theTileRawChannelMaker.FitOverflow = True
- theTileRawChannelMaker.TileRawChannelBuilderFitOverflow = ToolSvc.TileRawChannelBuilderFitFilter
- mlog.info(" set up TileRawChannelBuilderFitOverflow to TileRawChannelBuilderFitFilter")
+ theTileRawChannelMaker.TileRawChannelBuilderFitOverflow = theTileRawChannelBuilderFitFilter
+ mlog.info(" set up TileRawChannelBuilderFitOverflow to TileRawChannelBuilderFitFilter")
# Fit method with reading from COOL
if jobproperties.TileRecFlags.doTileFitCool():
@@ -291,10 +298,9 @@ class TileRawChannelGetter ( Configured) :
theTileRawChannelBuilderFitFilterCool.FrameLength = TileFrameLength
# add the tool to list of tool ( should use ToolHandle eventually)
- mlog.info(" adding now TileRawChannelBuilderFitFilterCool to ToolSvc")
- ToolSvc += theTileRawChannelBuilderFitFilterCool
+ mlog.info(" adding now TileRawChannelBuilderFitFilterCool to the aglorithm: %s" % theTileRawChannelMaker.name())
- theTileRawChannelMaker.TileRawChannelBuilder += [ToolSvc.TileRawChannelBuilderFitFilterCool]
+ theTileRawChannelMaker.TileRawChannelBuilder += [theTileRawChannelBuilderFitFilterCool]
# matched filter
if jobproperties.TileRecFlags.doTileMF():
@@ -309,7 +315,7 @@ class TileRawChannelGetter ( Configured) :
# setup COOL to get OFCs, needed for COF to retrieve pulse shape and derivatives
if jobproperties.TileRecFlags.OfcFromCOOL():
- theTileRawChannelBuilderMF.TileCondToolOfc = ToolSvc.TileCondToolOfcCool
+ theTileRawChannelBuilderMF.TileCondToolOfc = toolOfcCool
#TileRawChannelBuilderMF Options:
jobproperties.TileRecFlags.TileRawChannelContainer = "TileRawChannelMF"
@@ -330,10 +336,9 @@ class TileRawChannelGetter ( Configured) :
theTileRawChannelBuilderMF.TimeMinForAmpCorrection = jobproperties.TileRecFlags.TimeMinForAmpCorrection()
theTileRawChannelBuilderMF.TimeMaxForAmpCorrection = jobproperties.TileRecFlags.TimeMaxForAmpCorrection()
- mlog.info(" adding now TileRawChannelBuilderMF to ToolSvc")
- ToolSvc += theTileRawChannelBuilderMF
+ mlog.info(" adding now TileRawChannelBuilderMF to the aglorithm: %s" % theTileRawChannelMaker.name())
- theTileRawChannelMaker.TileRawChannelBuilder += [ToolSvc.TileRawChannelBuilderMF]
+ theTileRawChannelMaker.TileRawChannelBuilder += [theTileRawChannelBuilderMF]
if jobproperties.TileRecFlags.doTileOpt():
try:
@@ -359,10 +364,9 @@ class TileRawChannelGetter ( Configured) :
ServiceMgr.TileInfoLoader.LoadOptFilterWeights=True
- mlog.info(" adding now TileRawChannelBuilderOptFilter to ToolSvc")
- ToolSvc += theTileRawChannelBuilderOptFilter
+ mlog.info(" adding now TileRawChannelBuilderOptFilter to the aglorithm: %s" % theTileRawChannelMaker.name())
- theTileRawChannelMaker.TileRawChannelBuilder += [ToolSvc.TileRawChannelBuilderOptFilter]
+ theTileRawChannelMaker.TileRawChannelBuilder += [theTileRawChannelBuilderOptFilter]
if jobproperties.TileRecFlags.doTileOF1():
try:
@@ -375,8 +379,8 @@ class TileRawChannelGetter ( Configured) :
# setup COOL to get OFCs
if jobproperties.TileRecFlags.OfcFromCOOL():
- if hasattr(ToolSvc, 'TileCondToolOfcCoolOF1'):
- theTileRawChannelBuilderOF1.TileCondToolOfc = ToolSvc.TileCondToolOfcCoolOF1
+ if toolOfcCoolOF1:
+ theTileRawChannelBuilderOF1.TileCondToolOfc = toolOfcCoolOF1
else:
# There are no OF1 OFC in the COOL
# OFC will be calculated on the fly
@@ -405,10 +409,9 @@ class TileRawChannelGetter ( Configured) :
theTileRawChannelBuilderOF1.TimeMinForAmpCorrection = jobproperties.TileRecFlags.TimeMinForAmpCorrection()
theTileRawChannelBuilderOF1.TimeMaxForAmpCorrection = jobproperties.TileRecFlags.TimeMaxForAmpCorrection()
- mlog.info(" adding now TileRawChannelBuilderOF1 to ToolSvc")
- ToolSvc += theTileRawChannelBuilderOF1
+ mlog.info(" adding now TileRawChannelBuilderOF1 to the aglorithm: %s" % theTileRawChannelMaker.name())
- theTileRawChannelMaker.TileRawChannelBuilder += [ToolSvc.TileRawChannelBuilderOF1]
+ theTileRawChannelMaker.TileRawChannelBuilder += [theTileRawChannelBuilderOF1]
if jobproperties.TileRecFlags.doTileOpt2():
try:
@@ -421,7 +424,7 @@ class TileRawChannelGetter ( Configured) :
# setup COOL to get OFCs
if jobproperties.TileRecFlags.OfcFromCOOL():
- theTileRawChannelBuilderOpt2Filter.TileCondToolOfc = ToolSvc.TileCondToolOfcCool
+ theTileRawChannelBuilderOpt2Filter.TileCondToolOfc = toolOfcCool
#TileRawChannelBuilderOpt2Filter Options:
jobproperties.TileRecFlags.TileRawChannelContainer = "TileRawChannelOpt2"
@@ -438,10 +441,9 @@ class TileRawChannelGetter ( Configured) :
theTileRawChannelBuilderOpt2Filter.AmplitudeCorrection = False; # don't need correction after iterations
theTileRawChannelBuilderOpt2Filter.TimeCorrection = False; # don't need correction after iterations
- mlog.info(" adding now TileRawChannelBuilderOpt2Filter to ToolSvc")
- ToolSvc += theTileRawChannelBuilderOpt2Filter
+ mlog.info(" adding now TileRawChannelBuilderOpt2Filter to the aglorithm: %s" % theTileRawChannelMaker.name())
- theTileRawChannelMaker.TileRawChannelBuilder += [ToolSvc.TileRawChannelBuilderOpt2Filter]
+ theTileRawChannelMaker.TileRawChannelBuilder += [theTileRawChannelBuilderOpt2Filter]
if jobproperties.TileRecFlags.doTileOptATLAS():
@@ -455,7 +457,7 @@ class TileRawChannelGetter ( Configured) :
# setup COOL to get OFCs
if jobproperties.TileRecFlags.OfcFromCOOL():
- theTileRawChannelBuilderOptATLAS.TileCondToolOfc = ToolSvc.TileCondToolOfcCool
+ theTileRawChannelBuilderOptATLAS.TileCondToolOfc = toolOfcCool
#TileRawChannelBuilderOptATLAS Options:
if globalflags.DataSource()=='data': # don't use the name which is used for reco data from DSP
@@ -484,10 +486,10 @@ class TileRawChannelGetter ( Configured) :
theTileRawChannelBuilderOptATLAS.TimeMinForAmpCorrection = jobproperties.TileRecFlags.TimeMinForAmpCorrection()
theTileRawChannelBuilderOptATLAS.TimeMaxForAmpCorrection = jobproperties.TileRecFlags.TimeMaxForAmpCorrection()
- mlog.info(" adding now TileRawChannelBuilderOpt2Filter with name TileRawChannelBuilderOptATLAS to ToolSvc")
- ToolSvc += theTileRawChannelBuilderOptATLAS
+ mlog.info(" adding now TileRawChannelBuilderOpt2Filter with name TileRawChannelBuilderOptATLAS to the aglorithm: %s"
+ % theTileRawChannelMaker.name())
- theTileRawChannelMaker.TileRawChannelBuilder += [ToolSvc.TileRawChannelBuilderOptATLAS]
+ theTileRawChannelMaker.TileRawChannelBuilder += [theTileRawChannelBuilderOptATLAS]
# now add algorithm to topSequence
diff --git a/TileCalorimeter/TileRecUtils/python/TileRawChannelGetter_DigiHSTruth.py b/TileCalorimeter/TileRecUtils/python/TileRawChannelGetter_DigiHSTruth.py
index 642c2c572083ef6c85af958c95173a6989305cdd..136d6fa045b2527620313982a72e9f507bbe6683 100644
--- a/TileCalorimeter/TileRecUtils/python/TileRawChannelGetter_DigiHSTruth.py
+++ b/TileCalorimeter/TileRecUtils/python/TileRawChannelGetter_DigiHSTruth.py
@@ -16,8 +16,7 @@ class TileRawChannelGetter_DigiHSTruth ( Configured) :
algorithm to obtain TileRawChannel objects from the TileDigits stored
in a TileDigitsContainer.
According to the values of the TileRecFlags jobProperties, the
- corresponding AlgTools are added tothe ToolSvc and associated to
- TileRawChannelMaker algorithm.
+ corresponding AlgTools are added to TileRawChannelMaker algorithm.
"""
_outputType = "TileRawChannelContainer"
@@ -79,7 +78,6 @@ class TileRawChannelGetter_DigiHSTruth ( Configured) :
if jobproperties.TileRecFlags.noiseFilter() == 1:
from TileRecUtils.TileRecUtilsConf import TileRawChannelNoiseFilter
theTileRawChannelNoiseFilter = TileRawChannelNoiseFilter()
- ToolSvc += theTileRawChannelNoiseFilter
NoiseFilterTools += [theTileRawChannelNoiseFilter]
TileFrameLength = ServiceMgr.TileInfoLoader.NSamples
@@ -101,10 +99,13 @@ class TileRawChannelGetter_DigiHSTruth ( Configured) :
return False
# setup COOL to get OFCs
+ toolOfcCool = None
if jobproperties.TileRecFlags.OfcFromCOOL():
from TileConditions.TileInfoConfigurator import TileInfoConfigurator
tileInfoConfigurator = TileInfoConfigurator()
tileInfoConfigurator.setupCOOLOFC()
+ from TileConditions.TileCondToolConf import getTileCondToolOfcCool
+ toolOfcCool = getTileCondToolOfcCool('COOL')
else:
from TileConditions.TileInfoConfigurator import TileInfoConfigurator
tileInfoConfigurator = TileInfoConfigurator()
@@ -126,18 +127,18 @@ class TileRawChannelGetter_DigiHSTruth ( Configured) :
theTileRawChannelBuilderOptATLAS.MaxIterations = 1; # just one iteration
theTileRawChannelBuilderOptATLAS.Minus1Iteration = FALSE; # assume that max sample is at t=0
theTileRawChannelBuilderOptATLAS.AmplitudeCorrection = jobproperties.TileRecFlags.correctAmplitude()
- #theTileRawChannelBuilderOptATLAS.OfcfromCool = jobproperties.TileRecFlags.OfcFromCOOL()
- theTileRawChannelBuilderOptATLAS.TileCondToolOfc = ToolSvc.TileCondToolOfcCool
+ if jobproperties.TileRecFlags.OfcFromCOOL():
+ theTileRawChannelBuilderOptATLAS.TileCondToolOfc = toolOfcCool
theTileRawChannelBuilderOptATLAS.AmpMinForAmpCorrection = jobproperties.TileRecFlags.AmpMinForAmpCorrection()
if jobproperties.TileRecFlags.TimeMaxForAmpCorrection() > jobproperties.TileRecFlags.TimeMinForAmpCorrection():
theTileRawChannelBuilderOptATLAS.TimeMinForAmpCorrection = jobproperties.TileRecFlags.TimeMinForAmpCorrection()
theTileRawChannelBuilderOptATLAS.TimeMaxForAmpCorrection = jobproperties.TileRecFlags.TimeMaxForAmpCorrection()
- mlog.info(" adding now TileRawChannelBuilderOpt2Filter with name TileRawChannelBuilderOptATLAS to ToolSvc")
- ToolSvc += theTileRawChannelBuilderOptATLAS
-
- theTileRawChannelMaker.TileRawChannelBuilder += [ToolSvc.TileRawChannelBuilderOptATLAS_DigiHSTruth]
+ mlog.info(" adding now TileRawChannelBuilderOpt2Filter with name TileRawChannelBuilderOptATLAS to the aglorithm: %s"
+ % theTileRawChannelMaker.name())
+
+ theTileRawChannelMaker.TileRawChannelBuilder += [theTileRawChannelBuilderOptATLAS]
#jobproperties.TileRecFlags.print_JobProperties('tree&value')
diff --git a/TileCalorimeter/TileRecUtils/share/TileCellBuilderFromHit_test.py b/TileCalorimeter/TileRecUtils/share/TileCellBuilderFromHit_test.py
index eb727ce36898d5c68a564d718aa9a9c61ea14132..ec8476d086edd9939ac28aabba0591ee7ec84bd4 100644
--- a/TileCalorimeter/TileRecUtils/share/TileCellBuilderFromHit_test.py
+++ b/TileCalorimeter/TileRecUtils/share/TileCellBuilderFromHit_test.py
@@ -392,7 +392,6 @@ def make_tileBadChanTool (name, chans = [], lines = ''):
bct = TileBadChanTool (name,
TileBadChannels = name + 'CondData')
- ToolSvc += bct
return bct
diff --git a/TileCalorimeter/TileRecUtils/share/TileCellBuilder_test.py b/TileCalorimeter/TileRecUtils/share/TileCellBuilder_test.py
index d2161f672f4da8c53a77b68e11c52a66712bebc2..ee913b05f7615292ce7d6435cd8748c4446f411d 100644
--- a/TileCalorimeter/TileRecUtils/share/TileCellBuilder_test.py
+++ b/TileCalorimeter/TileRecUtils/share/TileCellBuilder_test.py
@@ -616,7 +616,6 @@ def make_tileBadChanTool (name, chans = [], lines = ''):
bct = TileBadChanTool (name,
TileBadChannels = name + 'CondData')
- ToolSvc += bct
return bct
@@ -645,7 +644,6 @@ from TileRecUtils.TileRecUtilsConf import TileCellBuilder, TileBeamInfoProvider,
beaminfo4 = TileBeamInfoProvider ('beaminfo4')
ToolSvc += beaminfo4
noisefilter = TileRawChannelNoiseFilter ('noisefilter')
-ToolSvc += noisefilter
def maketool (name, bct, **kw):
return TileCellBuilder (name, TileBadChanTool = bct, **kw)
diff --git a/TileCalorimeter/TileRecUtils/share/TileCellBuilder_test.ref b/TileCalorimeter/TileRecUtils/share/TileCellBuilder_test.ref
index 793baf43b1f1542a019c4e78fc4f4012f71a8b04..3a9c2dbcd162c2fab040762469db6d2fd5482080 100644
--- a/TileCalorimeter/TileRecUtils/share/TileCellBuilder_test.ref
+++ b/TileCalorimeter/TileRecUtils/share/TileCellBuilder_test.ref
@@ -1,14 +1,14 @@
-Thu Dec 6 06:00:11 CET 2018
+Tue Dec 11 16:46:07 CET 2018
Preloading tcmalloc_minimal.so
Py:Athena INFO including file "AthenaCommon/Preparation.py"
-Py:Athena INFO using release [AthenaWorkDir-22.0.1] [x86_64-slc6-gcc62-dbg] [atlas-work3/fa0fd6d0989] -- built on [2018-12-06T0537]
+Py:Athena INFO using release [WorkDir-22.0.1] [x86_64-slc6-gcc62-opt] [master-tile-recutils-private-tools/e7ac04bfe0] -- built on [2018-12-11T1507]
Py:Athena INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
Py:Athena INFO executing ROOT6Setup
Py:Athena INFO including file "AthenaCommon/Execution.py"
Py:Athena INFO including file "TileRecUtils/TileCellBuilder_test.py"
-[?1034hSetGeometryVersion.py obtained major release version 22
+SetGeometryVersion.py obtained major release version 22
Py:Athena INFO including file "IdDictDetDescrCnv/IdDictDetDescrCnv_joboptions.py"
-Py:ConfigurableDb INFO Read module info for 5473 configurables from 61 genConfDb files
+Py:ConfigurableDb INFO Read module info for 5442 configurables from 5 genConfDb files
Py:ConfigurableDb INFO No duplicates have been found: that's good !
EventInfoMgtInit: Got release version Athena-22.0.1
Py:IOVDbSvc.CondDB INFO Setting up conditions DB access to instance OFLP200
@@ -29,7 +29,7 @@ ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to leve
ApplicationMgr SUCCESS
====================================================================================================================================
Welcome to ApplicationMgr (GaudiCoreSvc v30r5)
- running on lxplus071.cern.ch on Thu Dec 6 06:00:33 2018
+ running on pcatl12 on Tue Dec 11 16:46:15 2018
====================================================================================================================================
ApplicationMgr INFO Successfully loaded modules : AthenaServices
ApplicationMgr INFO Application Manager Configured successfully
@@ -46,8 +46,8 @@ PoolSvc INFO io_register[PoolSvc](xmlcatalog_file:PoolFileCatalog.x
PoolSvc INFO Set connectionsvc retry/timeout/IDLE timeout to 'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled
PoolSvc INFO Frontier compression level set to 5
DBReplicaSvc INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://lcgft-atlas.gridpp.rl.ac.uk:3128/frontierATLAS)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy-wigner.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
-DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-04T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/dbreplica.config
-DBReplicaSvc INFO Total of 10 servers found for host lxplus071.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
+DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-10T2259/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/dbreplica.config
+DBReplicaSvc INFO Total of 10 servers found for host pcatl12.dyndns.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
PoolSvc INFO Successfully setup replica sorting algorithm
PoolSvc INFO Setting up APR FileCatalog and Streams
PoolSvc WARNING Unable to locate catalog for prfile:poolcond/PoolCat_oflcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
@@ -176,7 +176,7 @@ TileDddbManager INFO n_tileSwitches = 1
ClassIDSvc INFO getRegistryEntries: read 213 CLIDRegistry entries for module ALL
CaloIDHelper_ID... INFO in createObj: creating a TileID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-04T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/TileNeighbour_reduced.txt
+TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-10T2259/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/TileNeighbour_reduced.txt
TileHWIDDetDesc... INFO in createObj: creating a TileHWID helper object in the detector store
TileHWID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -188,9 +188,9 @@ CaloIDHelper_ID... INFO in createObj: creating a LArHEC_ID helper object in th
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIDHelper_ID... INFO in createObj: creating a LArFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-04T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/FCal2DNeighbors-April2011.txt
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-04T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/FCal3DNeighborsNext-April2011.txt
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-04T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/FCal3DNeighborsPrev-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-10T2259/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCal2DNeighbors-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-10T2259/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCal3DNeighborsNext-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-10T2259/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCal3DNeighborsPrev-April2011.txt
CaloIDHelper_ID... INFO in createObj: creating a LArMiniFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
LArMiniFCAL_ID INFO initialize_from_dict - LArCalorimeter dictionary does NOT contain miniFCAL description. Unable to initialize LArMiniFCAL_ID.
@@ -217,11 +217,11 @@ TileInfoLoader INFO Sampling fraction for E2 cells 1/107
TileInfoLoader INFO Sampling fraction for E3 cells 1/97
TileInfoLoader INFO Sampling fraction for E4 cells 1/75
TileInfoLoader INFO Sampling fraction for E4' cells 1/75
-TileInfoLoader INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-04T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/pulsehi_physics.dat
-TileInfoLoader INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-04T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/pulselo_physics.dat
-TileInfoLoader INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-04T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/pulse_adder_tower_physics.dat
-TileInfoLoader INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-04T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/pulse_adder_muonRcv_physics.dat
-TileInfoLoader INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-04T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/pulse_adder_muon_physics.dat
+TileInfoLoader INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-10T2259/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/pulsehi_physics.dat
+TileInfoLoader INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-10T2259/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/pulselo_physics.dat
+TileInfoLoader INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-10T2259/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/pulse_adder_tower_physics.dat
+TileInfoLoader INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-10T2259/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/pulse_adder_muonRcv_physics.dat
+TileInfoLoader INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-10T2259/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/pulse_adder_muon_physics.dat
CaloIDHelper_ID... INFO in createObj: creating a CaloLVL1_ID helper object in the detector store
CaloLVL1_ID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -230,12 +230,12 @@ TileCablingSvc INFO Cabling for RUN2 (2014-2017) ATLAS geometry is set via
TileCablingSvc INFO Setting Cabling type to 4
TileInfoLoader INFO Placed TileInfo object in the detector store.
ToolSvc.TileBad... INFO Creating TileCondProxyCool(ToolSvc.TileBadChanLegacyTool.TileCondProxyCool_OnlBch) for folder: "/TILE/ONL01/STATUS/ADC"
-IOVSvcTool INFO Still in initialize phase, not tiggering callback for TileCondProxyCool<TileCalibDrawerBch>[0x1c543600]+7fd0d226ea54 bound to CondAttrListCollection[/TILE/ONL01/STATUS/ADC]
+IOVSvcTool INFO Still in initialize phase, not tiggering callback for TileCondProxyCool<TileCalibDrawerBch>[0x1be33600]+7fd2aac171a0 bound to CondAttrListCollection[/TILE/ONL01/STATUS/ADC]
ToolSvc.TileBad... INFO Creating TileCondProxyCool(ToolSvc.TileBadChanLegacyTool.TileCondProxyCool_OflBch) for folder: "/TILE/OFL02/STATUS/ADC"
-IOVSvcTool INFO Still in initialize phase, not tiggering callback for TileCondProxyCool<TileCalibDrawerBch>[0x1c544c00]+7fd0d226ea54 bound to CondAttrListCollection[/TILE/OFL02/STATUS/ADC]
+IOVSvcTool INFO Still in initialize phase, not tiggering callback for TileCondProxyCool<TileCalibDrawerBch>[0x1be34c00]+7fd2aac171a0 bound to CondAttrListCollection[/TILE/OFL02/STATUS/ADC]
ToolSvc.TileBad... INFO ProxyOnlBch and ProxyOflBch will be used for bad channel status
-IOVSvcTool INFO Still in initialize phase, not tiggering callback for TileBadChanLegacyTool[0x189ba000]+7fd0d2088c6e bound to /TILE/ONL01/STATUS/ADC
-IOVSvcTool INFO Still in initialize phase, not tiggering callback for TileBadChanLegacyTool[0x189ba000]+7fd0d2088c6e bound to /TILE/OFL02/STATUS/ADC
+IOVSvcTool INFO Still in initialize phase, not tiggering callback for TileBadChanLegacyTool[0x18323000]+7fd2aabb3e80 bound to /TILE/ONL01/STATUS/ADC
+IOVSvcTool INFO Still in initialize phase, not tiggering callback for TileBadChanLegacyTool[0x18323000]+7fd2aabb3e80 bound to /TILE/OFL02/STATUS/ADC
AthenaEventLoopMgr INFO Initializing AthenaEventLoopMgr - package version AthenaServices-00-00-00
ClassIDSvc INFO getRegistryEntries: read 265 CLIDRegistry entries for module ALL
CondInputLoader INFO Initializing CondInputLoader...
@@ -281,11 +281,11 @@ TileEMScaleCond... INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCond
TileEMScaleCond... INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OnlEms) for folder: "/TILE/OFL02/CALIB/EMS"
TileSampleNoise... INFO Creating TileCondProxyCool(TileSampleNoiseCondAlg.TileCondProxyCool_NoiseSample) for folder: "/TILE/OFL02/NOISE/SAMPLE"
TileTimingCondA... INFO Creating TileCondProxyCool(TileTimingCondAlg.TileCondProxyCool_AdcOffset) for folder: "/TILE/OFL02/TIME/CHANNELOFFSET/PHY"
-tilecellbuilder... INFO Creating TileCondProxyFile(tilecellbuilder_bct1Cond.tilecellbuilder_bct1_onl) for ASCII file name: "/cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-04T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/TileNoBad.oflBch"
-tilecellbuilder... INFO Creating TileCondProxyFile(tilecellbuilder_bct1Cond.tilecellbuilder_bct1_ofl) for ASCII file name: "/cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-04T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/TileNoBad.oflBch"
+tilecellbuilder... INFO Creating TileCondProxyFile(tilecellbuilder_bct1Cond.tilecellbuilder_bct1_onl) for ASCII file name: "/cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-10T2259/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/TileNoBad.oflBch"
+tilecellbuilder... INFO Creating TileCondProxyFile(tilecellbuilder_bct1Cond.tilecellbuilder_bct1_ofl) for ASCII file name: "/cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-10T2259/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/TileNoBad.oflBch"
tilecellbuilder... INFO ProxyOnlBch and ProxyOflBch will be used for bad channel status
-tilecellbuilder... INFO Creating TileCondProxyFile(tilecellbuilder_bct2Cond.tilecellbuilder_bct2_onl) for ASCII file name: "/cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-04T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/TileNoBad.oflBch"
-tilecellbuilder... INFO Creating TileCondProxyFile(tilecellbuilder_bct2Cond.tilecellbuilder_bct2_ofl) for ASCII file name: "/afs/cern.ch/work/s/ssnyder/builds/atlas-work3/build-x86_64-slc6-gcc62-dbg/TileCalorimeter/TileRecUtils/unitTestRun/tilecellbuilder_bct2.bch"
+tilecellbuilder... INFO Creating TileCondProxyFile(tilecellbuilder_bct2Cond.tilecellbuilder_bct2_onl) for ASCII file name: "/cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-10T2259/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/TileNoBad.oflBch"
+tilecellbuilder... INFO Creating TileCondProxyFile(tilecellbuilder_bct2Cond.tilecellbuilder_bct2_ofl) for ASCII file name: "/data/harkusha/tools_recutils3/build/TileCalorimeter/TileRecUtils/unitTestRun/tilecellbuilder_bct2.bch"
tilecellbuilder... INFO ProxyOnlBch and ProxyOflBch will be used for bad channel status
ClassIDSvc INFO getRegistryEntries: read 504 CLIDRegistry entries for module ALL
xAODMaker::Even... INFO Initializing - Package version: xAODEventInfoCnv-00-00-00
@@ -342,7 +342,7 @@ ToolSvc.tool7 INFO taking RawChannels from 'TileRawChannelCnt'
ToolSvc.tool7 INFO Storing E4' cells in E4prContainer
ToolSvc.tool7 INFO TileCellBuilder initialization completed
ToolSvc.tool8 INFO Storing MBTS cells in MBTSContainer
-ToolSvc.noisefi... INFO Initializing...
+ToolSvc.tool8.n... INFO Initializing...
ToolSvc.tool8 INFO none of thresholds set, all RawChannels will be converted to Cells
ToolSvc.tool8 INFO size of temp vector set to 5184
ToolSvc.tool8 INFO taking RawChannels from 'TileRawChannelCnt'
@@ -361,6 +361,7 @@ ToolSvc.tool10 INFO taking RawChannels from 'TileRawChannelCnt'
ToolSvc.tool10 INFO Storing E4' cells in E4prContainer
ToolSvc.tool10 INFO TileCellBuilder initialization completed
ToolSvc.tool11 INFO Storing MBTS cells in MBTSContainer
+ToolSvc.tool11.... INFO Initializing...
ToolSvc.tool11 INFO none of thresholds set, all RawChannels will be converted to Cells
ToolSvc.tool11 INFO size of temp vector set to 5184
ToolSvc.tool11 INFO taking RawChannels from 'TileRawChannelCnt'
@@ -422,12 +423,12 @@ CaloIDHelper_ID... INFO in createObj: creating a LArHEC_SuperCell_ID helper ob
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIDHelper_ID... INFO in createObj: creating a LArFCAL_SuperCell_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-04T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/FCalSuperCells2DNeighborsNew-April2014.txt
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-04T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-04T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-10T2259/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-10T2259/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-10T2259/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
CaloIDHelper_ID... INFO in createObj: creating a Tile_SuperCell_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-04T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/TileSuperCellNeighbour.txt
+TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-10T2259/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/TileSuperCellNeighbour.txt
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIdMgrDetDes... INFO Finished
CaloIdMgrDetDes... INFO Initializing CaloIdMgr from values in CaloIdMgrDetDescrCnv
@@ -455,8 +456,8 @@ TileBadChannels... INFO TileBchStatus::isNoisy() is defined by: Large HF noise
TileBadChannels... INFO TileBchStatus::isNoGainL1() is defined by: ADC dead; No PMT connected; No HV; Channel masked for LV1 (unspecified); LV1 channel no gain; LV1 channel noisy; Channel disabled for LV1;
TileBadChannels... INFO TileBchStatus::isBadTiming() is defined by: Bad timing; Online bad timing;
TileBadChannels... INFO No drawer trips probabilities found in DB
-tilecellbuilder... INFO Creating TileCondProxyFile(tilecellbuilder_bct1Cond.tilecellbuilder_bct1_onl) for ASCII file name: "/cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-04T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/TileNoBad.oflBch"
-tilecellbuilder... INFO Creating TileCondProxyFile(tilecellbuilder_bct1Cond.tilecellbuilder_bct1_ofl) for ASCII file name: "/cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-04T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/TileNoBad.oflBch"
+tilecellbuilder... INFO Creating TileCondProxyFile(tilecellbuilder_bct1Cond.tilecellbuilder_bct1_onl) for ASCII file name: "/cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-10T2259/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/TileNoBad.oflBch"
+tilecellbuilder... INFO Creating TileCondProxyFile(tilecellbuilder_bct1Cond.tilecellbuilder_bct1_ofl) for ASCII file name: "/cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-10T2259/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/TileNoBad.oflBch"
tilecellbuilder... INFO No TileBchStatus::isBad() definition found in DB, using defaults
tilecellbuilder... INFO No TileBchStatus::isNoisy() definition found in DB, using defaults
tilecellbuilder... INFO No TileBchStatus::isNoGainL1() definition found in DB, using defaults
@@ -466,8 +467,8 @@ tilecellbuilder... INFO TileBchStatus::isNoisy() is defined by: Large HF noise
tilecellbuilder... INFO TileBchStatus::isNoGainL1() is defined by: ADC dead; No PMT connected; No HV; Channel masked for LV1 (unspecified); LV1 channel no gain; LV1 channel noisy; Channel disabled for LV1;
tilecellbuilder... INFO TileBchStatus::isBadTiming() is defined by: Bad timing; Online bad timing;
tilecellbuilder... INFO No drawer trips probabilities found in DB
-tilecellbuilder... INFO Creating TileCondProxyFile(tilecellbuilder_bct2Cond.tilecellbuilder_bct2_onl) for ASCII file name: "/cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-04T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/TileNoBad.oflBch"
-tilecellbuilder... INFO Creating TileCondProxyFile(tilecellbuilder_bct2Cond.tilecellbuilder_bct2_ofl) for ASCII file name: "/afs/cern.ch/work/s/ssnyder/builds/atlas-work3/build-x86_64-slc6-gcc62-dbg/TileCalorimeter/TileRecUtils/unitTestRun/tilecellbuilder_bct2.bch"
+tilecellbuilder... INFO Creating TileCondProxyFile(tilecellbuilder_bct2Cond.tilecellbuilder_bct2_onl) for ASCII file name: "/cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-10T2259/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/TileNoBad.oflBch"
+tilecellbuilder... INFO Creating TileCondProxyFile(tilecellbuilder_bct2Cond.tilecellbuilder_bct2_ofl) for ASCII file name: "/data/harkusha/tools_recutils3/build/TileCalorimeter/TileRecUtils/unitTestRun/tilecellbuilder_bct2.bch"
tilecellbuilder... INFO No TileBchStatus::isBad() definition found in DB, using defaults
tilecellbuilder... INFO No TileBchStatus::isNoisy() definition found in DB, using defaults
tilecellbuilder... INFO No TileBchStatus::isNoGainL1() definition found in DB, using defaults
@@ -530,23 +531,23 @@ testalg1 INFO Finalizing testalg1...
IncidentProcAlg2 INFO Finalize
PyComponentMgr INFO Finalizing PyComponentMgr...
IdDictDetDescrCnv INFO in finalize
-IOVDbFolder INFO Folder /LAR/Align (PoolRef) db-read 1/1 objs/chan/bytes 1/1/170 (( 2.26 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CES (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/103344 (( 0.91 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/80 (( 1.25 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/80 (( 0.93 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/EMS (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/92 (( 0.72 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/FIBER (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/940 (( 1.35 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/72 (( 1.57 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/76 (( 1.80 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/NOISE/SAMPLE (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/641476 (( 1.56 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/STATUS/ADC (AttrListColl) db-read 1/2 objs/chan/bytes 277/277/97884 (( 0.05 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/TIME/CHANNELOFFSET/PHY (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/96 (( 0.06 ))s
-IOVDbFolder INFO Folder /TILE/ONL01/STATUS/ADC (AttrListColl) db-read 1/2 objs/chan/bytes 277/277/76 (( 0.03 ))s
-IOVDbFolder INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 1/1 objs/chan/bytes 1/1/195 (( 0.78 ))s
-IOVDbSvc INFO bytes in (( 13.27 ))s
+IOVDbFolder INFO Folder /LAR/Align (PoolRef) db-read 1/1 objs/chan/bytes 1/1/170 (( 0.38 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CES (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/103344 (( 0.47 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/80 (( 0.06 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/80 (( 0.05 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/EMS (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/92 (( 0.04 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/FIBER (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/940 (( 0.05 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/72 (( 0.05 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/76 (( 0.06 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/NOISE/SAMPLE (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/641476 (( 0.14 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/STATUS/ADC (AttrListColl) db-read 1/2 objs/chan/bytes 277/277/97884 (( 0.90 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/TIME/CHANNELOFFSET/PHY (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/96 (( 0.84 ))s
+IOVDbFolder INFO Folder /TILE/ONL01/STATUS/ADC (AttrListColl) db-read 1/2 objs/chan/bytes 277/277/76 (( 0.05 ))s
+IOVDbFolder INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 1/1 objs/chan/bytes 1/1/195 (( 0.04 ))s
+IOVDbSvc INFO bytes in (( 3.14 ))s
IOVDbSvc INFO Connection sqlite://;schema=mycool.db;dbname=OFLP200 : nConnect: 0 nFolders: 0 ReadTime: (( 0.00 ))s
-IOVDbSvc INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 2 ReadTime: (( 3.04 ))s
-IOVDbSvc INFO Connection COOLOFL_TILE/OFLP200 : nConnect: 2 nFolders: 11 ReadTime: (( 10.23 ))s
+IOVDbSvc INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 2 ReadTime: (( 0.43 ))s
+IOVDbSvc INFO Connection COOLOFL_TILE/OFLP200 : nConnect: 2 nFolders: 11 ReadTime: (( 2.71 ))s
TileInfoLoader INFO TileInfoLoader::finalize()
AthDictLoaderSvc INFO in finalize...
ToolSvc INFO Removing all tools created by ToolSvc
@@ -565,9 +566,9 @@ ToolSvc.TileBea... INFO Finalizing
*****Chrono***** INFO ****************************************************************************************************
*****Chrono***** INFO The Final CPU consumption ( Chrono ) Table (ordered)
*****Chrono***** INFO ****************************************************************************************************
-cObjR_ALL INFO Time User : Tot= 0.72 [s] Ave/Min/Max= 0.36(+- 0.35)/ 0.01/ 0.71 [s] #= 2
-cObj_ALL INFO Time User : Tot= 0.98 [s] Ave/Min/Max=0.0653(+-0.203)/ 0/ 0.81 [s] #= 15
-ChronoStatSvc INFO Time User : Tot= 68.5 [s] #= 1
+cObjR_ALL INFO Time User : Tot= 270 [ms] Ave/Min/Max= 135(+- 135)/ 0/ 270 [ms] #= 2
+cObj_ALL INFO Time User : Tot= 350 [ms] Ave/Min/Max= 23.3(+- 77.3)/ 0/ 310 [ms] #= 15
+ChronoStatSvc INFO Time User : Tot= 27.6 [s] #= 1
*****Chrono***** INFO ****************************************************************************************************
ChronoStatSvc.f... INFO Service finalized successfully
ApplicationMgr INFO Application Manager Finalized successfully
diff --git a/TileCalorimeter/TileRecUtils/share/TileRawChannelBuilder_test.py b/TileCalorimeter/TileRecUtils/share/TileRawChannelBuilder_test.py
index 8bb3b564ae37542a8bb5467ff633d8e92323b599..2a539f98a8cd6c95e5623ea22c5d53e160088385 100644
--- a/TileCalorimeter/TileRecUtils/share/TileRawChannelBuilder_test.py
+++ b/TileCalorimeter/TileRecUtils/share/TileRawChannelBuilder_test.py
@@ -428,7 +428,6 @@ ToolSvc += beaminfo2
beaminfo4 = TileBeamInfoProvider ('beaminfo4')
ToolSvc += beaminfo4
noisefilter = TileRawChannelNoiseFilter ('noisefilter')
-ToolSvc += noisefilter
ToolSvc += TileRawChannelBuilderTest ('tool1')
ToolSvc += TileRawChannelBuilderTest ('tool2', BeamInfo = beaminfo2)
diff --git a/TileCalorimeter/TileRecUtils/share/TileRawChannelBuilder_test.ref b/TileCalorimeter/TileRecUtils/share/TileRawChannelBuilder_test.ref
index 87ead7ac0b6b946a3f03b747b8ebf55263b612b3..1a3c092d0c55a4cf4b70fab995c05e6c35c98933 100644
--- a/TileCalorimeter/TileRecUtils/share/TileRawChannelBuilder_test.ref
+++ b/TileCalorimeter/TileRecUtils/share/TileRawChannelBuilder_test.ref
@@ -1,14 +1,14 @@
-Thu Dec 6 06:06:32 CET 2018
+Tue Dec 11 16:48:55 CET 2018
Preloading tcmalloc_minimal.so
Py:Athena INFO including file "AthenaCommon/Preparation.py"
-Py:Athena INFO using release [AthenaWorkDir-22.0.1] [x86_64-slc6-gcc62-dbg] [atlas-work3/fa0fd6d0989] -- built on [2018-12-06T0537]
+Py:Athena INFO using release [WorkDir-22.0.1] [x86_64-slc6-gcc62-opt] [master-tile-recutils-private-tools/e7ac04bfe0] -- built on [2018-12-11T1507]
Py:Athena INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
Py:Athena INFO executing ROOT6Setup
Py:Athena INFO including file "AthenaCommon/Execution.py"
Py:Athena INFO including file "TileRecUtils/TileRawChannelBuilder_test.py"
-[?1034hSetGeometryVersion.py obtained major release version 22
+SetGeometryVersion.py obtained major release version 22
Py:Athena INFO including file "IdDictDetDescrCnv/IdDictDetDescrCnv_joboptions.py"
-Py:ConfigurableDb INFO Read module info for 5473 configurables from 61 genConfDb files
+Py:ConfigurableDb INFO Read module info for 5442 configurables from 5 genConfDb files
Py:ConfigurableDb INFO No duplicates have been found: that's good !
EventInfoMgtInit: Got release version Athena-22.0.1
Py:IOVDbSvc.CondDB INFO Setting up conditions DB access to instance OFLP200
@@ -29,7 +29,7 @@ ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to leve
ApplicationMgr SUCCESS
====================================================================================================================================
Welcome to ApplicationMgr (GaudiCoreSvc v30r5)
- running on lxplus071.cern.ch on Thu Dec 6 06:06:53 2018
+ running on pcatl12 on Tue Dec 11 16:49:06 2018
====================================================================================================================================
ApplicationMgr INFO Successfully loaded modules : AthenaServices
ApplicationMgr INFO Application Manager Configured successfully
@@ -46,8 +46,8 @@ PoolSvc INFO io_register[PoolSvc](xmlcatalog_file:PoolFileCatalog.x
PoolSvc INFO Set connectionsvc retry/timeout/IDLE timeout to 'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled
PoolSvc INFO Frontier compression level set to 5
DBReplicaSvc INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://lcgft-atlas.gridpp.rl.ac.uk:3128/frontierATLAS)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy-wigner.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
-DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-04T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/dbreplica.config
-DBReplicaSvc INFO Total of 10 servers found for host lxplus071.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
+DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-10T2259/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/dbreplica.config
+DBReplicaSvc INFO Total of 10 servers found for host pcatl12.dyndns.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
PoolSvc INFO Successfully setup replica sorting algorithm
PoolSvc INFO Setting up APR FileCatalog and Streams
PoolSvc WARNING Unable to locate catalog for prfile:poolcond/PoolCat_oflcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
@@ -172,7 +172,7 @@ EndcapDMConstru... INFO Start building EC electronics geometry
multi-layered version of absorbers activated, mlabs == 1
================================================
EndcapDMConstru... INFO Start building EC electronics geometry
-GeoModelSvc INFO GeoModelSvc.LArDetectorToolNV SZ= 28544Kb Time = 1.58S
+GeoModelSvc INFO GeoModelSvc.LArDetectorToolNV SZ= 22928Kb Time = 0.58S
GeoModelSvc.Til... INFO Entering TileDetectorTool::create()
TileDddbManager INFO m_tag = ATLAS-R2-2016-01-00-01
TileDddbManager INFO n_tiglob = 5
@@ -184,7 +184,7 @@ TileDddbManager INFO n_tileSwitches = 1
ClassIDSvc INFO getRegistryEntries: read 213 CLIDRegistry entries for module ALL
CaloIDHelper_ID... INFO in createObj: creating a TileID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-04T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/TileNeighbour_reduced.txt
+TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-10T2259/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/TileNeighbour_reduced.txt
TileHWIDDetDesc... INFO in createObj: creating a TileHWID helper object in the detector store
TileHWID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -196,9 +196,9 @@ CaloIDHelper_ID... INFO in createObj: creating a LArHEC_ID helper object in th
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIDHelper_ID... INFO in createObj: creating a LArFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-04T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/FCal2DNeighbors-April2011.txt
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-04T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/FCal3DNeighborsNext-April2011.txt
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-04T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/FCal3DNeighborsPrev-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-10T2259/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCal2DNeighbors-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-10T2259/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCal3DNeighborsNext-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-10T2259/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCal3DNeighborsPrev-April2011.txt
CaloIDHelper_ID... INFO in createObj: creating a LArMiniFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
LArMiniFCAL_ID INFO initialize_from_dict - LArCalorimeter dictionary does NOT contain miniFCAL description. Unable to initialize LArMiniFCAL_ID.
@@ -233,7 +233,7 @@ GeoModelSvc.Til... INFO Global positioning of barrel with rotation (0,0,0)) a
GeoModelSvc.Til... INFO Global positioning of positive ext.barrel with rotation (0,0,0)) and translation (0,0,0) CLHEP::cm
GeoModelSvc.Til... INFO Global positioning of negative ext.barrel with rotation (0,0,0)) and translation (0,0,1) CLHEP::cm
TileDetDescrMan... INFO Entering create_elements()
-GeoModelSvc INFO GeoModelSvc.TileDetectorTool SZ= 5196Kb Time = 1.65S
+GeoModelSvc INFO GeoModelSvc.TileDetectorTool SZ= 4592Kb Time = 0.16S
ClassIDSvc INFO getRegistryEntries: read 65 CLIDRegistry entries for module ALL
TileInfoLoader INFO Initializing....TileInfoLoader
TileInfoLoader INFO New ATLAS geometry detected: ATLAS-R2-2016-01-00-01 (010001) version 10001
@@ -255,11 +255,11 @@ TileInfoLoader INFO Sampling fraction for E2 cells 1/107
TileInfoLoader INFO Sampling fraction for E3 cells 1/97
TileInfoLoader INFO Sampling fraction for E4 cells 1/75
TileInfoLoader INFO Sampling fraction for E4' cells 1/75
-TileInfoLoader INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-04T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/pulsehi_physics.dat
-TileInfoLoader INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-04T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/pulselo_physics.dat
-TileInfoLoader INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-04T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/pulse_adder_tower_physics.dat
-TileInfoLoader INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-04T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/pulse_adder_muonRcv_physics.dat
-TileInfoLoader INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-04T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/pulse_adder_muon_physics.dat
+TileInfoLoader INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-10T2259/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/pulsehi_physics.dat
+TileInfoLoader INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-10T2259/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/pulselo_physics.dat
+TileInfoLoader INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-10T2259/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/pulse_adder_tower_physics.dat
+TileInfoLoader INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-10T2259/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/pulse_adder_muonRcv_physics.dat
+TileInfoLoader INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-10T2259/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/pulse_adder_muon_physics.dat
CaloIDHelper_ID... INFO in createObj: creating a CaloLVL1_ID helper object in the detector store
CaloLVL1_ID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -268,12 +268,12 @@ TileCablingSvc INFO Cabling for RUN2 (2014-2017) ATLAS geometry is set via
TileCablingSvc INFO Setting Cabling type to 4
TileInfoLoader INFO Placed TileInfo object in the detector store.
ToolSvc.TileBad... INFO Creating TileCondProxyCool(ToolSvc.TileBadChanLegacyTool.TileCondProxyCool_OnlBch) for folder: "/TILE/ONL01/STATUS/ADC"
-IOVSvcTool INFO Still in initialize phase, not tiggering callback for TileCondProxyCool<TileCalibDrawerBch>[0x1d977600]+7f8cdde5ea54 bound to CondAttrListCollection[/TILE/ONL01/STATUS/ADC]
+IOVSvcTool INFO Still in initialize phase, not tiggering callback for TileCondProxyCool<TileCalibDrawerBch>[0x1c109600]+7f108deaf1a0 bound to CondAttrListCollection[/TILE/ONL01/STATUS/ADC]
ToolSvc.TileBad... INFO Creating TileCondProxyCool(ToolSvc.TileBadChanLegacyTool.TileCondProxyCool_OflBch) for folder: "/TILE/OFL02/STATUS/ADC"
-IOVSvcTool INFO Still in initialize phase, not tiggering callback for TileCondProxyCool<TileCalibDrawerBch>[0x1d978c00]+7f8cdde5ea54 bound to CondAttrListCollection[/TILE/OFL02/STATUS/ADC]
+IOVSvcTool INFO Still in initialize phase, not tiggering callback for TileCondProxyCool<TileCalibDrawerBch>[0x1c10ac00]+7f108deaf1a0 bound to CondAttrListCollection[/TILE/OFL02/STATUS/ADC]
ToolSvc.TileBad... INFO ProxyOnlBch and ProxyOflBch will be used for bad channel status
-IOVSvcTool INFO Still in initialize phase, not tiggering callback for TileBadChanLegacyTool[0xc4f4000]+7f8cddc78c6e bound to /TILE/ONL01/STATUS/ADC
-IOVSvcTool INFO Still in initialize phase, not tiggering callback for TileBadChanLegacyTool[0xc4f4000]+7f8cddc78c6e bound to /TILE/OFL02/STATUS/ADC
+IOVSvcTool INFO Still in initialize phase, not tiggering callback for TileBadChanLegacyTool[0x16a7d000]+7f108de4be80 bound to /TILE/ONL01/STATUS/ADC
+IOVSvcTool INFO Still in initialize phase, not tiggering callback for TileBadChanLegacyTool[0x16a7d000]+7f108de4be80 bound to /TILE/OFL02/STATUS/ADC
AthenaEventLoopMgr INFO Initializing AthenaEventLoopMgr - package version AthenaServices-00-00-00
ClassIDSvc INFO getRegistryEntries: read 265 CLIDRegistry entries for module ALL
CondInputLoader INFO Initializing CondInputLoader...
@@ -335,9 +335,10 @@ ToolSvc.TileBea... INFO in initialize()
ToolSvc.tool2 INFO TileRawChannelBuilder::initialize()
ToolSvc.beaminfo2 INFO in initialize()
ToolSvc.tool3 INFO TileRawChannelBuilder::initialize()
-ToolSvc.noisefi... INFO Initializing...
+ToolSvc.tool3.n... INFO Initializing...
ToolSvc.tool4 INFO TileRawChannelBuilder::initialize()
ToolSvc.beaminfo4 INFO in initialize()
+ToolSvc.tool4.n... INFO Initializing...
HistogramPersis...WARNING Histograms saving not required.
ApplicationMgr INFO Application Manager Initialized successfully
ClassIDSvc INFO getRegistryEntries: read 149 CLIDRegistry entries for module ALL
@@ -394,12 +395,12 @@ CaloIDHelper_ID... INFO in createObj: creating a LArHEC_SuperCell_ID helper ob
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIDHelper_ID... INFO in createObj: creating a LArFCAL_SuperCell_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-04T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/FCalSuperCells2DNeighborsNew-April2014.txt
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-04T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-04T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-10T2259/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-10T2259/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-10T2259/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
CaloIDHelper_ID... INFO in createObj: creating a Tile_SuperCell_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-04T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/TileSuperCellNeighbour.txt
+TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-10T2259/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/TileSuperCellNeighbour.txt
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIdMgrDetDes... INFO Finished
CaloIdMgrDetDes... INFO Initializing CaloIdMgr from values in CaloIdMgrDetDescrCnv
@@ -452,23 +453,23 @@ testalg1 INFO Finalizing testalg1...
IncidentProcAlg2 INFO Finalize
PyComponentMgr INFO Finalizing PyComponentMgr...
IdDictDetDescrCnv INFO in finalize
-IOVDbFolder INFO Folder /LAR/Align (PoolRef) db-read 1/1 objs/chan/bytes 1/1/170 (( 0.61 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CES (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/103344 (( 2.80 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/80 (( 0.61 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/80 (( 0.61 ))s
+IOVDbFolder INFO Folder /LAR/Align (PoolRef) db-read 1/1 objs/chan/bytes 1/1/170 (( 3.74 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CES (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/103344 (( 4.33 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/80 (( 1.61 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/80 (( 1.10 ))s
IOVDbFolder INFO Folder /TILE/OFL02/CALIB/EMS (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/92 (( 0.83 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/FIBER (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/940 (( 0.88 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/72 (( 0.66 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/76 (( 0.58 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/NOISE/SAMPLE (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/641476 (( 0.66 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/STATUS/ADC (AttrListColl) db-read 1/2 objs/chan/bytes 277/277/97884 (( 0.04 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/TIME/CHANNELOFFSET/PHY (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/96 (( 0.04 ))s
-IOVDbFolder INFO Folder /TILE/ONL01/STATUS/ADC (AttrListColl) db-read 1/2 objs/chan/bytes 277/277/76 (( 0.01 ))s
-IOVDbFolder INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 1/1 objs/chan/bytes 1/1/195 (( 0.35 ))s
-IOVDbSvc INFO bytes in (( 8.70 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/FIBER (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/940 (( 1.13 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/72 (( 0.78 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/76 (( 1.10 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/NOISE/SAMPLE (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/641476 (( 1.15 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/STATUS/ADC (AttrListColl) db-read 1/2 objs/chan/bytes 277/277/97884 (( 1.62 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/TIME/CHANNELOFFSET/PHY (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/96 (( 2.33 ))s
+IOVDbFolder INFO Folder /TILE/ONL01/STATUS/ADC (AttrListColl) db-read 1/2 objs/chan/bytes 277/277/76 (( 0.08 ))s
+IOVDbFolder INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 1/1 objs/chan/bytes 1/1/195 (( 1.56 ))s
+IOVDbSvc INFO bytes in (( 21.36 ))s
IOVDbSvc INFO Connection sqlite://;schema=mycool.db;dbname=OFLP200 : nConnect: 0 nFolders: 0 ReadTime: (( 0.00 ))s
-IOVDbSvc INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 2 ReadTime: (( 0.96 ))s
-IOVDbSvc INFO Connection COOLOFL_TILE/OFLP200 : nConnect: 2 nFolders: 11 ReadTime: (( 7.74 ))s
+IOVDbSvc INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 2 ReadTime: (( 5.30 ))s
+IOVDbSvc INFO Connection COOLOFL_TILE/OFLP200 : nConnect: 2 nFolders: 11 ReadTime: (( 16.06 ))s
TileInfoLoader INFO TileInfoLoader::finalize()
AthDictLoaderSvc INFO in finalize...
ToolSvc INFO Removing all tools created by ToolSvc
@@ -482,9 +483,9 @@ ToolSvc.TileBea... INFO Finalizing
*****Chrono***** INFO ****************************************************************************************************
*****Chrono***** INFO The Final CPU consumption ( Chrono ) Table (ordered)
*****Chrono***** INFO ****************************************************************************************************
-cObjR_ALL INFO Time User : Tot= 0.78 [s] Ave/Min/Max= 0.39(+- 0.37)/ 0.02/ 0.76 [s] #= 2
-cObj_ALL INFO Time User : Tot= 1.02 [s] Ave/Min/Max=0.068(+-0.213)/ 0/ 0.85 [s] #= 15
-ChronoStatSvc INFO Time User : Tot= 67.8 [s] #= 1
+cObjR_ALL INFO Time User : Tot= 270 [ms] Ave/Min/Max= 135(+- 125)/ 10/ 260 [ms] #= 2
+cObj_ALL INFO Time User : Tot= 340 [ms] Ave/Min/Max= 22.7(+- 74.8)/ 0/ 300 [ms] #= 15
+ChronoStatSvc INFO Time User : Tot= 26.9 [s] #= 1
*****Chrono***** INFO ****************************************************************************************************
ChronoStatSvc.f... INFO Service finalized successfully
ApplicationMgr INFO Application Manager Finalized successfully
diff --git a/TileCalorimeter/TileRecUtils/src/TileCellBuilder.cxx b/TileCalorimeter/TileRecUtils/src/TileCellBuilder.cxx
index fe79f1d4f26e596fa9189658f7494adf067c88ec..6475b62cbceced40d1d0ed7acba607c1aa6f096d 100644
--- a/TileCalorimeter/TileRecUtils/src/TileCellBuilder.cxx
+++ b/TileCalorimeter/TileRecUtils/src/TileCellBuilder.cxx
@@ -6,7 +6,6 @@
#include "TileRecUtils/TileCellBuilder.h"
#include "TileRecUtils/TileRawChannelBuilder.h"
#include "TileRecUtils/TileBeamInfoProvider.h"
-#include "TileRecUtils/ITileRawChannelTool.h"
#include "TileEvent/TileMutableRawChannelContainer.h"
#include "TileEvent/TileCell.h"
#include "TileEvent/TileCellCollection.h"
@@ -16,9 +15,6 @@
#include "TileIdentifier/TileHWID.h"
#include "CaloDetDescr/MbtsDetDescrManager.h"
#include "TileDetDescr/TileDetDescrManager.h"
-#include "TileConditions/ITileBadChanTool.h"
-#include "TileConditions/TileCondToolEmscale.h"
-#include "TileConditions/TileCondToolTiming.h"
#include "TileCalibBlobObjs/TileCalibUtils.h"
// Calo includes
@@ -68,11 +64,7 @@ TileCellBuilder::TileCellBuilder(const std::string& type, const std::string& nam
, m_tileHWID(0)
, m_cabling(0)
, m_DQstatus(0)
- , m_tileBadChanTool("TileBadChanTool")
- , m_tileToolEmscale("TileCondToolEmscale")
- , m_tileToolTiming("TileCondToolTiming")
, m_beamInfo("TileBeamInfoProvider/TileBeamInfoProvider")
- , m_noiseFilterTools() // "TileRawChannelNoiseFilter/TileRawChannelNoiseFilter")
, m_tileMgr(0)
, m_mbtsMgr(0)
, m_RChType(TileFragHash::Default)
@@ -99,11 +91,7 @@ TileCellBuilder::TileCellBuilder(const std::string& type, const std::string& nam
//!< MBTS channel energy threshold for masking (not used currently(
m_minEneChan[2] = -999999. * MeV;
- declareProperty("TileBadChanTool" , m_tileBadChanTool);
- declareProperty("TileCondToolEmscale" , m_tileToolEmscale);
- declareProperty("TileCondToolTiming" , m_tileToolTiming);
declareProperty("BeamInfo", m_beamInfo);
- declareProperty("NoiseFilterTools", m_noiseFilterTools);
declareProperty( "MinEnergyChan", m_minEneChan[0]);
declareProperty( "MinEnergyGap", m_minEneChan[1]);
@@ -188,25 +176,25 @@ StatusCode TileCellBuilder::initialize() {
ATH_CHECK( m_eventInfoKey.initialize() );
- CHECK( detStore()->retrieve(m_tileMgr) );
- CHECK( detStore()->retrieve(m_tileID) );
- CHECK( detStore()->retrieve(m_tileTBID) );
- CHECK( detStore()->retrieve(m_tileHWID) );
+ ATH_CHECK( detStore()->retrieve(m_tileMgr) );
+ ATH_CHECK( detStore()->retrieve(m_tileID) );
+ ATH_CHECK( detStore()->retrieve(m_tileTBID) );
+ ATH_CHECK( detStore()->retrieve(m_tileHWID) );
//=== get TileBadChanTool
- CHECK( m_tileBadChanTool.retrieve() );
+ ATH_CHECK( m_tileBadChanTool.retrieve() );
//=== get TileBeamInfo
- CHECK( m_beamInfo.retrieve() );
+ ATH_CHECK( m_beamInfo.retrieve() );
// access tools and store them
- CHECK( m_noiseFilterTools.retrieve() );
+ ATH_CHECK( m_noiseFilterTools.retrieve() );
//=== get TileCondToolEmscale
- CHECK( m_tileToolEmscale.retrieve() );
+ ATH_CHECK( m_tileToolEmscale.retrieve() );
//=== get TileCondToolTiming
- CHECK( m_tileToolTiming.retrieve() );
+ ATH_CHECK( m_tileToolTiming.retrieve() );
m_cabling = TileCablingService::getInstance();
diff --git a/TileCalorimeter/TileRecUtils/src/TileCellBuilderFromHit.cxx b/TileCalorimeter/TileRecUtils/src/TileCellBuilderFromHit.cxx
index 0071e1c037a91f67d1732e64ffe4ce09261fc5d1..2d7978825a8b247484520048bfcc369bf79fcd9e 100644
--- a/TileCalorimeter/TileRecUtils/src/TileCellBuilderFromHit.cxx
+++ b/TileCalorimeter/TileRecUtils/src/TileCellBuilderFromHit.cxx
@@ -12,13 +12,10 @@
#include "CaloDetDescr/MbtsDetDescrManager.h"
#include "TileDetDescr/TileDetDescrManager.h"
#include "TileConditions/TileInfo.h"
-#include "TileConditions/ITileBadChanTool.h"
#include "TileSimEvent/TileHit.h"
#include "TileSimEvent/TileHitVector.h"
#include "TileEvent/TileHitContainer.h"
#include "TileEvent/TileCellCollection.h"
-#include "TileConditions/TileCondToolEmscale.h"
-#include "TileConditions/TileCondToolTiming.h"
#include "TileCalibBlobObjs/TileCalibUtils.h"
// Calo includes
@@ -89,8 +86,6 @@ TileCellBuilderFromHit::TileCellBuilderFromHit(const std::string& type, const st
, m_tileInfo(0)
, m_pHRengine(0)
, m_rndmSvc ("AtRndmGenSvc", name)
- , m_tileBadChanTool("TileBadChanTool")
- , m_tileToolEmscale("TileCondToolEmscale")
, m_noiseTool("CaloNoiseTool")
, m_tileMgr(0)
, m_mbtsMgr(0)
@@ -108,8 +103,6 @@ TileCellBuilderFromHit::TileCellBuilderFromHit(const std::string& type, const st
m_zeroEnergy = 0.5 * MeV; // half a MeV in both PMTs i.e. one MeV in a cell
declareProperty("TileInfoName" ,m_infoName); // Name of TileInfo store (default=TileInfo);
- declareProperty("TileBadChanTool" , m_tileBadChanTool);
- declareProperty("TileCondToolEmscale" , m_tileToolEmscale);
declareProperty("RndmSvc" ,m_rndmSvc, "Random Number Service used in TileCellBuildetFromHit");
// Noise Sigma
@@ -166,28 +159,28 @@ StatusCode TileCellBuilderFromHit::initialize() {
ATH_CHECK( m_eventInfoKey.initialize() );
ATH_CHECK( m_hitContainerKey.initialize() );
- CHECK( detStore()->retrieve(m_tileMgr) );
- CHECK( detStore()->retrieve(m_tileID) );
- CHECK( detStore()->retrieve(m_tileTBID) );
- CHECK( detStore()->retrieve(m_tileHWID) );
- CHECK( detStore()->retrieve(m_tileInfo, m_infoName) );
+ ATH_CHECK( detStore()->retrieve(m_tileMgr) );
+ ATH_CHECK( detStore()->retrieve(m_tileID) );
+ ATH_CHECK( detStore()->retrieve(m_tileTBID) );
+ ATH_CHECK( detStore()->retrieve(m_tileHWID) );
+ ATH_CHECK( detStore()->retrieve(m_tileInfo, m_infoName) );
//=== get TileBadChanTool
- CHECK( m_tileBadChanTool.retrieve() );
+ ATH_CHECK( m_tileBadChanTool.retrieve() );
//=== get TileCondToolEmscale
- CHECK( m_tileToolEmscale.retrieve() );
+ ATH_CHECK( m_tileToolEmscale.retrieve() );
//---- retrieve the noise tool ----------------
if (m_useNoiseTool) {
ATH_MSG_INFO( "Reading electronic noise from DB" );
- CHECK( m_noiseTool.retrieve() );
+ ATH_CHECK( m_noiseTool.retrieve() );
} else {
ATH_MSG_INFO( "Noise Sigma " << m_noiseSigma << " MeV is selected!" );
m_noiseTool.disable();
}
- CHECK( m_rndmSvc.retrieve());
+ ATH_CHECK( m_rndmSvc.retrieve());
m_pHRengine = m_rndmSvc->GetEngine("Tile_DigitsMaker");
ATH_MSG_INFO( "max time thr " << m_maxTime << " ns" );
diff --git a/TileCalorimeter/TileRecUtils/src/TileCellNoiseFilter.cxx b/TileCalorimeter/TileRecUtils/src/TileCellNoiseFilter.cxx
index 7510adc1be3eb1a90e46186f7e8e19b29f9540dc..b02a9e3ee6e6b71942a9f3af077243b4e061694e 100644
--- a/TileCalorimeter/TileRecUtils/src/TileCellNoiseFilter.cxx
+++ b/TileCalorimeter/TileRecUtils/src/TileCellNoiseFilter.cxx
@@ -1,27 +1,23 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
*/
-// Atlas includes
-#include "AthenaKernel/errorcheck.h"
-#include "Identifier/Identifier.h"
-#include "Identifier/IdentifierHash.h"
-
-// Calo includes
-#include "CaloEvent/CaloCell.h"
-#include "CaloEvent/CaloCellContainer.h"
-#include "CaloDetDescr/CaloDetDescrElement.h"
-
// Tile includes
#include "CaloIdentifier/TileID.h"
#include "TileIdentifier/TileHWID.h"
#include "TileEvent/TileCell.h"
#include "TileCalibBlobObjs/TileCalibUtils.h"
#include "TileRecUtils/TileCellNoiseFilter.h"
-#include "TileConditions/TileCondToolEmscale.h"
-#include "TileConditions/TileCondToolNoiseSample.h"
+// Calo includes
+#include "CaloEvent/CaloCell.h"
+#include "CaloEvent/CaloCellContainer.h"
+#include "CaloDetDescr/CaloDetDescrElement.h"
+// Atlas includes
+#include "AthenaKernel/errorcheck.h"
+#include "Identifier/Identifier.h"
+#include "Identifier/IdentifierHash.h"
#include <cmath>
#include <algorithm>
@@ -37,23 +33,18 @@ const InterfaceID& TileCellNoiseFilter::interfaceID() {
// constructor
TileCellNoiseFilter::TileCellNoiseFilter(const std::string& type,
const std::string& name, const IInterface* parent)
- : AthAlgTool(type, name, parent)
+ : base_class(type, name, parent)
, m_tileID(0)
, m_tileHWID(0)
- , m_tileToolEmscale("TileCondToolEmscale")
- , m_tileToolNoiseSample("TileCondToolNoiseSample")
, m_noiseTool("CaloNoiseTool")
- , m_tileBadChanTool("TileBadChanTool")
, m_truncationThresholdOnAbsEinSigma(4.0) // 4 sigma of ADC HF noise by default
, m_minimumNumberOfTruncatedChannels(0.6) // at least 60% of channels should be below threshold
, m_useTwoGaussNoise(false) // do not use 2G - has no sense for ADC HF noise for the moment
, m_useTileNoiseDB(true) // Tile DB with ADC HF noise by defaul
{
- declareInterface<ICaloCellMakerTool>(this);
+
declareInterface<TileCellNoiseFilter>(this);
- declareProperty("TileCondToolEmscale", m_tileToolEmscale);
- declareProperty("TileCondToolNoiseSample", m_tileToolNoiseSample);
declareProperty("CaloNoiseTool", m_noiseTool);
declareProperty("UseTwoGaussNoise", m_useTwoGaussNoise);
@@ -68,24 +59,24 @@ TileCellNoiseFilter::TileCellNoiseFilter(const std::string& type,
StatusCode TileCellNoiseFilter::initialize() {
ATH_MSG_INFO("Initializing...");
- CHECK( detStore()->retrieve(m_tileID));
- CHECK( detStore()->retrieve(m_tileHWID));
+ ATH_CHECK( detStore()->retrieve(m_tileID));
+ ATH_CHECK( detStore()->retrieve(m_tileHWID));
//=== get TileCondToolEmscale
- CHECK( m_tileToolEmscale.retrieve() );
+ ATH_CHECK( m_tileToolEmscale.retrieve() );
if (m_useTileNoiseDB) {
//=== get TileCondToolNoiseSample
- CHECK( m_tileToolNoiseSample.retrieve());
+ ATH_CHECK( m_tileToolNoiseSample.retrieve());
//=== get TileBadChanTool
- CHECK( m_tileBadChanTool.retrieve() );
+ ATH_CHECK( m_tileBadChanTool.retrieve() );
m_noiseTool.disable();
} else {
//=== CaloNoiseTool
- CHECK( m_noiseTool.retrieve());
+ ATH_CHECK( m_noiseTool.retrieve());
m_tileToolNoiseSample.disable();
m_tileBadChanTool.disable();
diff --git a/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilder.cxx b/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilder.cxx
index fbc438b04a6ad7f62557f06f0f74f25ddc3888c6..5b386385faa92a65a367b019627678d83f544f9b 100644
--- a/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilder.cxx
+++ b/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilder.cxx
@@ -5,7 +5,6 @@
// Tile includes
#include "TileRecUtils/TileRawChannelBuilder.h"
#include "TileRecUtils/TileBeamInfoProvider.h"
-#include "TileRecUtils/ITileRawChannelTool.h"
#include "TileEvent/TileDigits.h"
#include "TileEvent/TileRawChannel.h"
#include "TileIdentifier/TileHWID.h"
@@ -62,7 +61,6 @@ TileRawChannelBuilder::TileRawChannelBuilder(const std::string& type
, m_tileHWID(0)
, m_tileInfo(0)
, m_beamInfo("TileBeamInfoProvider/TileBeamInfoProvider")
- , m_noiseFilterTools() // "TileRawChannelNoiseFilter/TileRawChannelNoiseFilter")
, m_trigType(0)
, m_idophys(false)
, m_idolas(false)
@@ -89,7 +87,6 @@ TileRawChannelBuilder::TileRawChannelBuilder(const std::string& type
declareProperty("TimeMaxForAmpCorrection", m_timeMaxThresh = 25.0);
declareProperty("RunType", m_runType = 0);
declareProperty("BeamInfo", m_beamInfo);
- declareProperty("NoiseFilterTools", m_noiseFilterTools);
declareProperty("DataPoolSize", m_dataPoollSize = -1);
declareProperty("UseDSPCorrection", m_useDSP = true);
@@ -122,15 +119,15 @@ StatusCode TileRawChannelBuilder::initialize() {
m_RChSumL = m_RChSumH = 0.0;
// retrieve TileID helpers and TileIfno from det store
- CHECK( detStore()->retrieve(m_tileID, "TileID") );
- CHECK( detStore()->retrieve(m_tileHWID, "TileHWID") );
+ ATH_CHECK( detStore()->retrieve(m_tileID, "TileID") );
+ ATH_CHECK( detStore()->retrieve(m_tileHWID, "TileHWID") );
- CHECK( detStore()->retrieve(m_tileInfo, "TileInfo") );
+ ATH_CHECK( detStore()->retrieve(m_tileInfo, "TileInfo") );
- CHECK( m_beamInfo.retrieve() );
+ ATH_CHECK( m_beamInfo.retrieve() );
// access tools and store them
- CHECK( m_noiseFilterTools.retrieve() );
+ ATH_CHECK( m_noiseFilterTools.retrieve() );
ATH_MSG_DEBUG( "Successfully retrieve NoiseFilterTools: " << m_noiseFilterTools );
if(m_calibrateEnergy){
@@ -168,7 +165,7 @@ StatusCode TileRawChannelBuilder::initialize() {
if (m_dataPoollSize < 0) m_dataPoollSize = m_tileHWID->channel_hash_max();
ServiceHandle<TileCablingSvc> cablingSvc("TileCablingSvc", name());
- CHECK( cablingSvc.retrieve());
+ ATH_CHECK( cablingSvc.retrieve());
const TileCablingService* cabling = cablingSvc->cablingService();
if (!cabling) {
diff --git a/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilderFitFilterCool.cxx b/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilderFitFilterCool.cxx
index d6c36a67a1aa1ef7e473729e09704f55daca808f..521463a27ebdc793aeb3b836c8afe8866e361b0f 100644
--- a/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilderFitFilterCool.cxx
+++ b/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilderFitFilterCool.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
*/
#include "TileEvent/TileRawChannel.h"
@@ -49,11 +49,6 @@ TileRawChannelBuilderFitFilterCool::TileRawChannelBuilderFitFilterCool(const std
, m_minTau(0)
, m_maxTau(0.0)
, m_pulseShapes(0)
- , m_tileToolPulseShape("TileCondToolPulseShape")
- , m_tileToolLeak100Shape("TileCondToolLeak100Shape")
- , m_tileToolLeak5p2Shape("TileCondToolLeak5p2Shape")
- , m_tileToolPulse5p2Shape("TileCondToolPulse5p2Shape")
- , m_tileToolNoiseSample("TileCondToolNoiseSample")
, m_shapes(nullptr)
{
//declare interfaces
@@ -63,22 +58,17 @@ TileRawChannelBuilderFitFilterCool::TileRawChannelBuilderFitFilterCool(const std
m_rawChannelContainerKey = "TileRawChannelFitCool";
//declare properties
- declareProperty("FrameLength",m_frameLength = 9);
- declareProperty("MaxIterate",m_maxIterate = 9);
- declareProperty("NoiseLowGain",m_noiseLow = 0.6);
- declareProperty("NoiseHighGain",m_noiseHigh = 1.5);
- declareProperty("RMSChannelNoise",m_channelNoiseRMS = 3);
- declareProperty("ExtraSamplesLeft",m_extraSamplesLeft=0); // increase window on left side
- declareProperty("ExtraSamplesRight",m_extraSamplesRight=0); // increase window on right side
- declareProperty("SaturatedSampleError",m_saturatedSampleError = 6.0);
- declareProperty("ZeroSampleError",m_zeroSampleError = 100.0);
- declareProperty("NoiseThresholdRMS",m_noiseThresholdRMS = 3.0);
- declareProperty("MaxTimeFromPeak",m_maxTimeFromPeak = 250.0);
- declareProperty("TileCondToolPulseShape" , m_tileToolPulseShape);
- declareProperty("TileCondToolLeak100Shape" , m_tileToolLeak100Shape);
- declareProperty("TileCondToolLeak5p2Shape" , m_tileToolLeak5p2Shape);
- declareProperty("TileCondToolPulse5p2Shape" , m_tileToolPulse5p2Shape);
- declareProperty("TileCondToolNoiseSample", m_tileToolNoiseSample);
+ declareProperty("FrameLength", m_frameLength = 9);
+ declareProperty("MaxIterate", m_maxIterate = 9);
+ declareProperty("NoiseLowGain", m_noiseLow = 0.6);
+ declareProperty("NoiseHighGain", m_noiseHigh = 1.5);
+ declareProperty("RMSChannelNoise", m_channelNoiseRMS = 3);
+ declareProperty("ExtraSamplesLeft", m_extraSamplesLeft=0); // increase window on left side
+ declareProperty("ExtraSamplesRight", m_extraSamplesRight=0); // increase window on right side
+ declareProperty("SaturatedSampleError", m_saturatedSampleError = 6.0);
+ declareProperty("ZeroSampleError", m_zeroSampleError = 100.0);
+ declareProperty("NoiseThresholdRMS", m_noiseThresholdRMS = 3.0);
+ declareProperty("MaxTimeFromPeak", m_maxTimeFromPeak = 250.0);
}
/**
@@ -98,7 +88,7 @@ StatusCode TileRawChannelBuilderFitFilterCool::initialize() {
m_rChType = TileFragHash::FitFilterCool;
// init in superclass
- CHECK( TileRawChannelBuilder::initialize() );
+ ATH_CHECK( TileRawChannelBuilder::initialize() );
// Get pulse shapes from TileInfo
m_pulseShapes = m_tileInfo->getPulseShapes();
@@ -129,12 +119,12 @@ StatusCode TileRawChannelBuilderFitFilterCool::initialize() {
<< " ypmax=" << m_pulseShapes->m_ylphys[MAX_LO_PULSE_PHYS - 1] );
//=== get TileCondToolPulseShape
- CHECK( m_tileToolPulseShape.retrieve() );
+ ATH_CHECK( m_tileToolPulseShape.retrieve() );
if (m_idocis) {
- CHECK( m_tileToolLeak100Shape.retrieve() );
- CHECK( m_tileToolLeak5p2Shape.retrieve() );
- CHECK( m_tileToolPulse5p2Shape.retrieve() );
+ ATH_CHECK( m_tileToolLeak100Shape.retrieve() );
+ ATH_CHECK( m_tileToolLeak5p2Shape.retrieve() );
+ ATH_CHECK( m_tileToolPulse5p2Shape.retrieve() );
} else {
m_tileToolLeak100Shape.disable();
m_tileToolLeak5p2Shape.disable();
@@ -142,11 +132,11 @@ StatusCode TileRawChannelBuilderFitFilterCool::initialize() {
}
//=== TileCondToolNoiseSample
- CHECK( m_tileToolNoiseSample.retrieve() );
+ ATH_CHECK( m_tileToolNoiseSample.retrieve() );
// Incident Service:
ServiceHandle<IIncidentSvc> incSvc("IncidentSvc", this->name());
- CHECK(incSvc.retrieve());
+ ATH_CHECK(incSvc.retrieve());
//start listening to "BeginRun"
incSvc->addListener(this, "BeginRun");
diff --git a/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilderMF.cxx b/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilderMF.cxx
index c6e850440ee353b1e1769d8269f40b56c969aa77..31cae932ecfe5015e552f9fa09cf61fcac7a8759 100644
--- a/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilderMF.cxx
+++ b/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilderMF.cxx
@@ -1,17 +1,9 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
*/
// small hack to enable datapool usage
#include "TileEvent/TileRawChannel.h"
-
-// Gaudi includes
-#include "GaudiKernel/Property.h"
-
-// Atlas includes
-#include "AthAllocators/DataPool.h"
-#include "AthenaKernel/errorcheck.h"
-
// Tile includes
#include "TileRecUtils/TileRawChannelBuilderMF.h"
#include "TileEvent/TileRawChannelContainer.h"
@@ -23,6 +15,13 @@
#include "TileConditions/TilePulseShapes.h"
#include "CLHEP/Matrix/Matrix.h"
+// Atlas includes
+#include "AthAllocators/DataPool.h"
+#include "AthenaKernel/errorcheck.h"
+
+// Gaudi includes
+#include "GaudiKernel/Property.h"
+
// lang include
#include <algorithm>
#include <cmath>
@@ -39,10 +38,6 @@
TileRawChannelBuilderMF::TileRawChannelBuilderMF(const std::string& type, const std::string& name,
const IInterface *parent)
: TileRawChannelBuilder(type, name, parent)
- , m_tileToolTiming("TileCondToolTiming")
- , m_tileCondToolOfc("TileCondToolOfc")
- , m_tileCondToolOfcOnFly("TileCondToolOfc")
- , m_tileToolNoiseSample("TileCondToolNoiseSample")
, m_nSamples(0)
, m_t0SamplePosition(0)
, m_maxTime(0.0)
@@ -56,10 +51,6 @@ TileRawChannelBuilderMF::TileRawChannelBuilderMF(const std::string& type, const
m_rawChannelContainerKey = "TileRawChannelMF";
//declare properties
- declareProperty("TileCondToolTiming", m_tileToolTiming);
- declareProperty("TileCondToolOfc", m_tileCondToolOfc, "TileCondToolOfc");
- declareProperty("TileCondToolOfcOnFly", m_tileCondToolOfcOnFly, "TileCondToolOfc");
- declareProperty("TileCondToolNoiseSample", m_tileToolNoiseSample);
declareProperty("AmplitudeCorrection", m_correctAmplitude = false);
declareProperty("PedestalMode", m_pedestalMode = 1);
declareProperty("DefaultPedestal", m_defaultPedestal = 0.0);
@@ -89,7 +80,7 @@ StatusCode TileRawChannelBuilderMF::initialize() {
memset(m_chPed, 0, sizeof(m_chPed));
// init in superclass
- CHECK(TileRawChannelBuilder::initialize());
+ ATH_CHECK(TileRawChannelBuilder::initialize());
// bits 12-15 - various options
if (m_correctAmplitude) m_bsflags |= 0x2000;
@@ -101,20 +92,20 @@ StatusCode TileRawChannelBuilderMF::initialize() {
m_maxTime = 25 * (m_nSamples - m_t0SamplePosition - 1);
m_minTime = -25 * m_t0SamplePosition;
- CHECK(m_tileCondToolOfcOnFly.retrieve());
+ ATH_CHECK(m_tileCondToolOfcOnFly.retrieve());
//=== get TileCondToolOfc
- CHECK(m_tileCondToolOfc.retrieve());
+ ATH_CHECK(m_tileCondToolOfc.retrieve());
if (m_bestPhase) {
//=== get TileToolTiming
- CHECK(m_tileToolTiming.retrieve());
+ ATH_CHECK(m_tileToolTiming.retrieve());
} else {
m_tileToolTiming.disable();
}
//=== get TileCondToolNoiseSample
- CHECK(m_tileToolNoiseSample.retrieve());
+ ATH_CHECK(m_tileToolNoiseSample.retrieve());
ATH_MSG_DEBUG("TileRawChannelBuilderMF::initialize() completed successfully");
diff --git a/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilderOpt2Filter.cxx b/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilderOpt2Filter.cxx
index a744b4e89528643d3e5f384c6c21b6ad52309fd0..534d4c4facbf2877723fd6db97d19371bad3f19d 100644
--- a/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilderOpt2Filter.cxx
+++ b/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilderOpt2Filter.cxx
@@ -15,22 +15,13 @@
//
//////////////////////////////////////////////////////////////////////
+// Tile includes
#include "TileEvent/TileRawChannel.h"
#include "TileCalibBlobObjs/TileCalibUtils.h"
-
-// Gaudi includes
-#include "GaudiKernel/Property.h"
-
-// Atlas includes
-#include "AthAllocators/DataPool.h"
-#include "AthenaKernel/errorcheck.h"
-
-// Tile includes
#include "TileRecUtils/TileRawChannelBuilderOpt2Filter.h"
#include "TileRecUtils/TileRawChannelBuilderOpt2FilterLookup.h"
#include "TileConditions/TileOptFilterWeights.h"
#include "TileConditions/TilePulseShapes.h"
-#include "CLHEP/Matrix/Matrix.h"
#include "TileEvent/TileRawChannelContainer.h"
#include "TileEvent/TileDigitsContainer.h"
#include "TileEvent/TileDigits.h"
@@ -39,6 +30,14 @@
#include "TileConditions/TileInfo.h"
#include "TileConditions/TileOptFilterWeights.h"
+// Atlas includes
+#include "AthAllocators/DataPool.h"
+#include "AthenaKernel/errorcheck.h"
+
+// Gaudi includes
+#include "GaudiKernel/Property.h"
+
+#include "CLHEP/Matrix/Matrix.h"
//using namespace std;
#include <algorithm>
@@ -56,9 +55,6 @@ const InterfaceID& TileRawChannelBuilderOpt2Filter::interfaceID() {
TileRawChannelBuilderOpt2Filter::TileRawChannelBuilderOpt2Filter(const std::string& type,
const std::string& name, const IInterface *parent)
: TileRawChannelBuilder(type, name, parent)
- , m_tileToolTiming("TileCondToolTiming")
- , m_tileCondToolOfc("TileCondToolOfc")
- , m_tileToolNoiseSample("TileCondToolNoiseSample")
, m_nSignal(0)
, m_nNegative(0)
, m_nCenter(0)
@@ -73,23 +69,20 @@ TileRawChannelBuilderOpt2Filter::TileRawChannelBuilderOpt2Filter(const std::stri
m_rawChannelContainerKey = "TileRawChannelOpt2";
//declare properties
- declareProperty("TileCondToolTiming", m_tileToolTiming);
- declareProperty("TileCondToolOfc", m_tileCondToolOfc ,"TileCondToolOfc");
- declareProperty("TileCondToolNoiseSample", m_tileToolNoiseSample,"TileCondToolNoiseSample");
- declareProperty("MaxIterations",m_maxIterations = 5);
- declareProperty("PedestalMode",m_pedestalMode = 17);
- declareProperty("TimeForConvergence",m_timeForConvergence = 0.5);
- declareProperty("ConfTB",m_confTB = false);
- declareProperty("OF2",m_of2 = true);
- declareProperty("Minus1Iteration",m_minus1Iter = false);
- declareProperty("AmplitudeCorrection",m_correctAmplitude = false);
+ declareProperty("MaxIterations", m_maxIterations = 5);
+ declareProperty("PedestalMode", m_pedestalMode = 17);
+ declareProperty("TimeForConvergence", m_timeForConvergence = 0.5);
+ declareProperty("ConfTB", m_confTB = false);
+ declareProperty("OF2", m_of2 = true);
+ declareProperty("Minus1Iteration", m_minus1Iter = false);
+ declareProperty("AmplitudeCorrection", m_correctAmplitude = false);
declareProperty("TimeCorrection", m_correctTimeNI = false);
- declareProperty("BestPhase",m_bestPhase = false);
- declareProperty("EmulateDSP",m_emulateDsp = false);
- declareProperty("NoiseThresholdHG",m_noiseThresholdHG = 5);
- declareProperty("NoiseThresholdLG",m_noiseThresholdLG = 3);
- declareProperty("MinTime",m_minTime = 0.0);
- declareProperty("MaxTime",m_maxTime = -1.0);
+ declareProperty("BestPhase", m_bestPhase = false);
+ declareProperty("EmulateDSP", m_emulateDsp = false);
+ declareProperty("NoiseThresholdHG", m_noiseThresholdHG = 5);
+ declareProperty("NoiseThresholdLG", m_noiseThresholdLG = 3);
+ declareProperty("MinTime", m_minTime = 0.0);
+ declareProperty("MaxTime", m_maxTime = -1.0);
}
@@ -104,7 +97,7 @@ StatusCode TileRawChannelBuilderOpt2Filter::initialize() {
m_rChType = TileFragHash::OptFilterOffline; // type for offline Opt Filter
// init in superclass
- CHECK( TileRawChannelBuilder::initialize() );
+ ATH_CHECK( TileRawChannelBuilder::initialize() );
if (m_maxIterations != 1) m_correctTimeNI = false;
@@ -157,14 +150,14 @@ StatusCode TileRawChannelBuilderOpt2Filter::initialize() {
m_nConst = 0;
//=== get TileCondToolOfc
- CHECK( m_tileCondToolOfc.retrieve() );
+ ATH_CHECK( m_tileCondToolOfc.retrieve() );
//=== get TileCondToolNoiseSample
- CHECK( m_tileToolNoiseSample.retrieve() );
+ ATH_CHECK( m_tileToolNoiseSample.retrieve() );
if (m_bestPhase) {
//=== get TileToolTiming
- CHECK( m_tileToolTiming.retrieve() );
+ ATH_CHECK( m_tileToolTiming.retrieve() );
} else {
m_tileToolTiming.disable();
}
diff --git a/TileCalorimeter/TileRecUtils/src/TileRawChannelMaker.cxx b/TileCalorimeter/TileRecUtils/src/TileRawChannelMaker.cxx
index a3f2d64598e1ea293703554cc973fe2a262d2a90..405b01c37757a93170ff6d6067cf9cdd826d81d2 100644
--- a/TileCalorimeter/TileRecUtils/src/TileRawChannelMaker.cxx
+++ b/TileCalorimeter/TileRecUtils/src/TileRawChannelMaker.cxx
@@ -4,7 +4,6 @@
// Tile includes
#include "TileRecUtils/TileRawChannelMaker.h"
-#include "TileRecUtils/TileRawChannelBuilder.h"
// Atlas includes
#include "AthenaKernel/errorcheck.h"
@@ -25,13 +24,9 @@
TileRawChannelMaker::TileRawChannelMaker(const std::string& name,
ISvcLocator* pSvcLocator)
: AthAlgorithm(name, pSvcLocator)
- , m_tileRawChannelBuilderList()
, m_fitOverflow(false)
- , m_tileRawChannelBuilderFitOverflow("TileRawChannelBuilder")
{
- declareProperty("TileRawChannelBuilder", m_tileRawChannelBuilderList, "List Of Tools");
declareProperty("FitOverflow", m_fitOverflow, "Fit or not overflows");
- declareProperty("TileRawChannelBuilderFitOverflow", m_tileRawChannelBuilderFitOverflow, "Tool to fit overflows");
m_overflowReplaceTimeCut = 50.0;
m_overflowReplacePedestalCut = 170.0;
@@ -50,7 +45,7 @@ TileRawChannelMaker::~TileRawChannelMaker() {
StatusCode TileRawChannelMaker::initialize() {
ATH_MSG_DEBUG( "starting to retrieve list " << m_tileRawChannelBuilderList);
- CHECK( m_tileRawChannelBuilderList.retrieve());
+ ATH_CHECK( m_tileRawChannelBuilderList.retrieve());
ATH_MSG_DEBUG( m_tileRawChannelBuilderList << "retrieved");
@@ -60,7 +55,7 @@ StatusCode TileRawChannelMaker::initialize() {
}
if (m_fitOverflow) {
- CHECK( m_tileRawChannelBuilderFitOverflow.retrieve() );
+ ATH_CHECK( m_tileRawChannelBuilderFitOverflow.retrieve() );
} else {
m_tileRawChannelBuilderFitOverflow.disable();
}
@@ -91,7 +86,7 @@ StatusCode TileRawChannelMaker::execute() {
// create RawChannel Containers for all sub-algs
for (ToolHandle<TileRawChannelBuilder>& rawChannelBuilder : m_tileRawChannelBuilderList) {
- CHECK( rawChannelBuilder->createContainer() );
+ ATH_CHECK( rawChannelBuilder->createContainer() );
}
//make sure that we clean memory about errors in a drawer
@@ -122,7 +117,7 @@ StatusCode TileRawChannelMaker::execute() {
// commit RawChannel Containers for all sub-algs
for (ToolHandle<TileRawChannelBuilder>& rawChannelBuilder : m_tileRawChannelBuilderList) {
- CHECK( rawChannelBuilder->commitContainer() );
+ ATH_CHECK( rawChannelBuilder->commitContainer() );
}
ATH_MSG_DEBUG( "execute completed successfully" );
diff --git a/TileCalorimeter/TileRecUtils/src/TileRawChannelNoiseFilter.cxx b/TileCalorimeter/TileRecUtils/src/TileRawChannelNoiseFilter.cxx
index 08e6f180e79239164d3a1e31178a592480bc937b..26b613e27a3a042b7b40dd642f809f76805eb246 100644
--- a/TileCalorimeter/TileRecUtils/src/TileRawChannelNoiseFilter.cxx
+++ b/TileCalorimeter/TileRecUtils/src/TileRawChannelNoiseFilter.cxx
@@ -2,22 +2,19 @@
Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
*/
-// Atlas includes
-#include "AthenaKernel/errorcheck.h"
-#include "Identifier/Identifier.h"
-
// Tile includes
+#include "TileRecUtils/TileRawChannelNoiseFilter.h"
#include "TileIdentifier/TileHWID.h"
#include "TileEvent/TileRawChannel.h"
#include "TileEvent/TileRawChannelContainer.h"
#include "TileEvent/TileMutableRawChannelContainer.h"
#include "TileCalibBlobObjs/TileCalibUtils.h"
-#include "TileRecUtils/TileRawChannelNoiseFilter.h"
-#include "TileConditions/ITileBadChanTool.h"
-//#include "TileConditions/TileCondToolEmscale.h"
-#include "TileConditions/TileCondToolNoiseSample.h"
#include "TileRecUtils/TileBeamInfoProvider.h"
+// Atlas includes
+#include "AthenaKernel/errorcheck.h"
+#include "Identifier/Identifier.h"
+
//========================================================
// constructor
@@ -25,18 +22,12 @@ TileRawChannelNoiseFilter::TileRawChannelNoiseFilter(const std::string& type,
const std::string& name, const IInterface* parent)
: base_class(type, name, parent)
, m_tileHWID(0)
- , m_tileToolEmscale("TileCondToolEmscale")
- , m_tileToolNoiseSample("TileCondToolNoiseSample")
- , m_tileBadChanTool("TileBadChanTool")
, m_beamInfo( "TileBeamInfoProvider/TileBeamInfoProvider")
, m_truncationThresholdOnAbsEinSigma(3.0) // 3 sigma of ADC HF noise by default
, m_minimumNumberOfTruncatedChannels(0.6) // at least 60% of channels should be below threshold
, m_useTwoGaussNoise(false) // do not use 2G - has no sense for ADC HF noise for the moment
, m_useGapCells(false) // use gap cells for noise filter as all normal cells
{
- declareProperty("TileCondToolEmscale", m_tileToolEmscale);
- declareProperty("TileCondToolNoiseSample", m_tileToolNoiseSample);
- declareProperty("TileBadChanTool", m_tileBadChanTool);
declareProperty("BeamInfo", m_beamInfo);
declareProperty("TruncationThresholdOnAbsEinSigma", m_truncationThresholdOnAbsEinSigma);
@@ -62,19 +53,19 @@ StatusCode TileRawChannelNoiseFilter::initialize() {
<< ((m_useGapCells)?"true":"false") << endmsg;
}
- CHECK( detStore()->retrieve(m_tileHWID) );
+ ATH_CHECK( detStore()->retrieve(m_tileHWID) );
//=== get TileCondToolEmscale
- CHECK( m_tileToolEmscale.retrieve() );
+ ATH_CHECK( m_tileToolEmscale.retrieve() );
//=== get TileCondToolNoiseSample
- CHECK( m_tileToolNoiseSample.retrieve() );
+ ATH_CHECK( m_tileToolNoiseSample.retrieve() );
//=== get TileBadChanTool
- CHECK( m_tileBadChanTool.retrieve() );
+ ATH_CHECK( m_tileBadChanTool.retrieve() );
//=== get TileBeamInfo
- CHECK( m_beamInfo.retrieve() );
+ ATH_CHECK( m_beamInfo.retrieve() );
return StatusCode::SUCCESS;
}
diff --git a/TileCalorimeter/TileRecUtils/src/TileRawChannelOF1Corrector.cxx b/TileCalorimeter/TileRecUtils/src/TileRawChannelOF1Corrector.cxx
index fd917d997ee03077a38705a1e4c8518682be069b..a17fcbb35e7e3faadbd78383a807c3bf67d0c911 100644
--- a/TileCalorimeter/TileRecUtils/src/TileRawChannelOF1Corrector.cxx
+++ b/TileCalorimeter/TileRecUtils/src/TileRawChannelOF1Corrector.cxx
@@ -9,10 +9,6 @@
#include "TileCalibBlobObjs/TileCalibUtils.h"
#include "TileIdentifier/TileRawChannelUnit.h"
#include "TileIdentifier/TileHWID.h"
-#include "TileConditions/TileCondToolNoiseSample.h"
-#include "TileConditions/TileCondToolOfc.h"
-#include "TileConditions/TileCondToolTiming.h"
-#include "TileConditions/TileCondToolEmscale.h"
#include "TileConditions/TileCondToolDspThreshold.h"
// Atlas includes
@@ -25,18 +21,7 @@ TileRawChannelOF1Corrector::TileRawChannelOF1Corrector(const std::string& type,
const std::string& name, const IInterface* parent)
: base_class(type, name, parent)
, m_tileHWID(0)
- , m_tileToolNoiseSample("TileCondToolNoiseSample")
- , m_tileCondToolOfc("TileCondToolOfcCool/TileCondToolOfcCoolOF1")
- , m_tileToolTiming("TileCondToolTiming/TileCondToolOnlineTiming")
- , m_tileToolEms("TileCondToolEmscale")
- , m_tileDspThreshold("TileCondToolDspThreshold")
{
- declareProperty("TileCondToolNoiseSample", m_tileToolNoiseSample);
- declareProperty("TileCondToolOfc", m_tileCondToolOfc);
- declareProperty("TileCondToolTiming", m_tileToolTiming);
- declareProperty("TileCondToolEmscale", m_tileToolEms);
- declareProperty("TileCondToolDspThreshold", m_tileDspThreshold);
-
declareProperty("ZeroAmplitudeWithoutDigits", m_zeroAmplitudeWithoutDigits = true);
declareProperty("CorrectPedestalDifference", m_correctPedestalDifference = true);
}
@@ -47,18 +32,18 @@ StatusCode TileRawChannelOF1Corrector::initialize() {
ATH_MSG_INFO("Initializing...");
- CHECK( detStore()->retrieve(m_tileHWID) );
+ ATH_CHECK( detStore()->retrieve(m_tileHWID) );
if (m_correctPedestalDifference) {
//=== get TileCondToolOfc
- CHECK( m_tileCondToolOfc.retrieve() );
+ ATH_CHECK( m_tileCondToolOfc.retrieve() );
//=== get TileCondToolNoiseSample
- CHECK( m_tileToolNoiseSample.retrieve() );
+ ATH_CHECK( m_tileToolNoiseSample.retrieve() );
//=== get TileToolTiming
- CHECK( m_tileToolTiming.retrieve() );
+ ATH_CHECK( m_tileToolTiming.retrieve() );
} else {
m_tileCondToolOfc.disable();
m_tileToolNoiseSample.disable();
@@ -67,10 +52,10 @@ StatusCode TileRawChannelOF1Corrector::initialize() {
//=== TileCondToolEmscale
if (m_zeroAmplitudeWithoutDigits) {
- CHECK( m_tileToolEms.retrieve() );
+ ATH_CHECK( m_tileToolEms.retrieve() );
//=== get TileToolTiming
- CHECK( m_tileDspThreshold.retrieve() );
+ ATH_CHECK( m_tileDspThreshold.retrieve() );
} else {
m_tileToolEms.disable();
m_tileDspThreshold.disable();
diff --git a/TileCalorimeter/TileSimAlgs/share/TileDigiCommon_jobOptions.py b/TileCalorimeter/TileSimAlgs/share/TileDigiCommon_jobOptions.py
index 7773e7d1ee8980b33575e4eafa375b57fb487231..d53cefa931468660bdf327b72de9c77e7de87d8c 100644
--- a/TileCalorimeter/TileSimAlgs/share/TileDigiCommon_jobOptions.py
+++ b/TileCalorimeter/TileSimAlgs/share/TileDigiCommon_jobOptions.py
@@ -137,41 +137,63 @@ if doTileDigitToRawChannel:
theTileRawChannelGetter_DigiHSTruth.TileDigitsContainer = "TileDigitsCnt_DigiHSTruth"
theTileRawChannelGetter_DigiHSTruth.TileRawChannelContainer = "TileRawChannelCnt_DigiHSTruth"
+ TileRChMaker = theTileRawChannelGetter.TileRChMaker()
+
+ TileRawChannelBuilderOptATLAS = None
+ if jobproperties.TileRecFlags.doTileOptATLAS():
+ TileRawChannelBuilderOptATLAS = TileRChMaker.TileRawChannelBuilder['TileRawChannelBuilderOptATLAS']
+
+ TileRawChannelBuilderOpt2Filter = None
+ if jobproperties.TileRecFlags.doTileOpt2():
+ TileRawChannelBuilderOpt2Filter = TileRChMaker.TileRawChannelBuilder['TileRawChannelBuilderOpt2Filter']
+
+ TileRawChannelBuilderMF = None
+ if jobproperties.TileRecFlags.doTileMF():
+ TileRawChannelBuilderMF = TileRChMaker.TileRawChannelBuilder['TileRawChannelBuilderMF']
+
# make sure that only one output container has default name "TileRawChannelCnt"
if jobproperties.Beam.beamType == 'collisions':
if OF2asDefault:
if jobproperties.TileRecFlags.doTileOptATLAS():
- ToolSvc.TileRawChannelBuilderOptATLAS.TileRawChannelContainer = jobproperties.TileRecFlags.TileRawChannelContainer()
+ TileRawChannelBuilderOptATLAS.TileRawChannelContainer = jobproperties.TileRecFlags.TileRawChannelContainer()
if jobproperties.TileRecFlags.doTileMF():
- ToolSvc.TileRawChannelBuilderMF.TileRawChannelContainer = "TileRawChannelMF"
+ TileRawChannelBuilderMF.TileRawChannelContainer = "TileRawChannelMF"
if jobproperties.TileRecFlags.doTileOpt2():
- ToolSvc.TileRawChannelBuilderOpt2Filter.TileRawChannelContainer = "TileRawChannelOpt2"
+ TileRawChannelBuilderOpt2Filter.TileRawChannelContainer = "TileRawChannelOpt2"
elif jobproperties.TileRecFlags.doTileMF():
- ToolSvc.TileRawChannelBuilderMF.TileRawChannelContainer = jobproperties.TileRecFlags.TileRawChannelContainer()
+ TileRawChannelBuilderMF.TileRawChannelContainer = jobproperties.TileRecFlags.TileRawChannelContainer()
elif jobproperties.TileRecFlags.doTileOpt2():
- ToolSvc.TileRawChannelBuilderOpt2Filter.TileRawChannelContainer = jobproperties.TileRecFlags.TileRawChannelContainer()
+ TileRawChannelBuilderOpt2Filter.TileRawChannelContainer = jobproperties.TileRecFlags.TileRawChannelContainer()
else:
if jobproperties.TileRecFlags.doTileMF():
- ToolSvc.TileRawChannelBuilderMF.TileRawChannelContainer = jobproperties.TileRecFlags.TileRawChannelContainer()
+ TileRawChannelBuilderMF.TileRawChannelContainer = jobproperties.TileRecFlags.TileRawChannelContainer()
if jobproperties.TileRecFlags.doTileOptATLAS():
- ToolSvc.TileRawChannelBuilderOptATLAS.TileRawChannelContainer = "TileRawChannelFixed"
+ TileRawChannelBuilderOptATLAS.TileRawChannelContainer = "TileRawChannelFixed"
if jobproperties.TileRecFlags.doTileOpt2():
- ToolSvc.TileRawChannelBuilderOpt2Filter.TileRawChannelContainer = "TileRawChannelOpt2"
+ TileRawChannelBuilderOpt2Filter.TileRawChannelContainer = "TileRawChannelOpt2"
elif jobproperties.TileRecFlags.doTileOptATLAS():
- ToolSvc.TileRawChannelBuilderOptATLAS.TileRawChannelContainer = jobproperties.TileRecFlags.TileRawChannelContainer()
+ TileRawChannelBuilderOptATLAS.TileRawChannelContainer = jobproperties.TileRecFlags.TileRawChannelContainer()
elif jobproperties.TileRecFlags.doTileOpt2():
- ToolSvc.TileRawChannelBuilderOpt2Filter.TileRawChannelContainer = jobproperties.TileRecFlags.TileRawChannelContainer()
+ TileRawChannelBuilderOpt2Filter.TileRawChannelContainer = jobproperties.TileRecFlags.TileRawChannelContainer()
else:
if jobproperties.TileRecFlags.doTileOpt2():
- ToolSvc.TileRawChannelBuilderOpt2Filter.TileRawChannelContainer = jobproperties.TileRecFlags.TileRawChannelContainer()
+ TileRawChannelBuilderOpt2Filter.TileRawChannelContainer = jobproperties.TileRecFlags.TileRawChannelContainer()
if jobproperties.TileRecFlags.doTileMF():
- ToolSvc.TileRawChannelBuilderMF.TileRawChannelContainer = "TileRawChannelMF"
+ TileRawChannelBuilderMF.TileRawChannelContainer = "TileRawChannelMF"
if jobproperties.TileRecFlags.doTileOptATLAS():
- ToolSvc.TileRawChannelBuilderOptATLAS.TileRawChannelContainer = "TileRawChannelFixed"
+ TileRawChannelBuilderOptATLAS.TileRawChannelContainer = "TileRawChannelFixed"
elif jobproperties.TileRecFlags.doTileOptATLAS():
- ToolSvc.TileRawChannelBuilderOptATLAS.TileRawChannelContainer = jobproperties.TileRecFlags.TileRawChannelContainer()
+ TileRawChannelBuilderOptATLAS.TileRawChannelContainer = jobproperties.TileRecFlags.TileRawChannelContainer()
elif jobproperties.TileRecFlags.doTileMF():
- ToolSvc.TileRawChannelBuilderMF.TileRawChannelContainer = jobproperties.TileRecFlags.TileRawChannelContainer()
+ TileRawChannelBuilderMF.TileRawChannelContainer = jobproperties.TileRecFlags.TileRawChannelContainer()
+
+
+ if jobproperties.TileRecFlags.doTileMF():
+ print TileRawChannelBuilderMF
+ if jobproperties.TileRecFlags.doTileOptATLAS():
+ print TileRawChannelBuilderOptATLAS
+ if jobproperties.TileRecFlags.doTileOpt2():
+ print TileRawChannelBuilderOpt2Filter
if not hasattr( ToolSvc, "TileBeamInfoProvider" ):
@@ -187,11 +209,5 @@ ToolSvc.TileBeamInfoProvider.TileRawChannelContainer=""; # disable checking of D
#
include( "TileSimAlgs/TileSamplingFraction_jobOptions.py" )
-if jobproperties.TileRecFlags.doTileMF():
- print ToolSvc.TileRawChannelBuilderMF
-if jobproperties.TileRecFlags.doTileOptATLAS():
- print ToolSvc.TileRawChannelBuilderOptATLAS
-if jobproperties.TileRecFlags.doTileOpt2():
- print ToolSvc.TileRawChannelBuilderOpt2Filter