Merge branch 'master' into METTrig-test-1

Former-commit-id: f776e6dc

TileCalorimeter/TileConditions/src/TileCondToolOfc.cxx

@@ -2,40 +2,28 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
-// Athena includes
-#include "AthenaKernel/errorcheck.h"
-
 // Tile includes
 #include "TileConditions/TileCondToolOfc.h"
 #include "TileConditions/TileCablingService.h"
 #include "TileConditions/TileCablingSvc.h"
 
+// Athena includes
+#include "AthenaKernel/errorcheck.h"
 
-//
-//____________________________________________________________________
-const InterfaceID& TileCondToolOfc::interfaceID() {
-  return ITileCondToolOfc::interfaceID();
-}
 
 //
 //____________________________________________________________________
 TileCondToolOfc::TileCondToolOfc(const std::string& type, const std::string& name,
-    const IInterface* parent)
-    : AthAlgTool(type, name, parent)
-    , m_tileToolPulseShape("TileCondToolPulseShape")
-    , m_tileToolAutoCr("TileCondToolAutoCr")
-//  , m_tileToolNoiseSample("TileCondToolNoiseSample")
+                                 const IInterface* parent)
+    : base_class(type, name, parent)
     , m_tileInfo(0)
     , m_maxChannels(0)
     , m_maxGains(0)
     , m_drawerCacheSize(0)
 {
-  declareInterface<ITileCondToolOfc>(this);
   declareProperty("nSamples", m_nSamples = 7, "number of samples used in the run");
   declareProperty("OptFilterDeltaCorrelation", m_deltaCorrelation = false
                   , "true=> use delta correlation; false=>use calculation obtained from data");
-  declareProperty("TileCondToolPulseShape", m_tileToolPulseShape);
-  declareProperty("TileCondToolAutoCr", m_tileToolAutoCr);
   declareProperty("CacheSize", m_cache = 0, ">0 create cache; ==0 calculate on-fly");
 
   m_t0Sample = (m_nSamples - 1) / 2;
@@ -54,16 +42,16 @@ StatusCode TileCondToolOfc::initialize() {
   ATH_MSG_INFO( "In initialize()" );
 
   //=== Get TileCondToolPulseShape
-  CHECK( m_tileToolPulseShape.retrieve() );
+  ATH_CHECK( m_tileToolPulseShape.retrieve() );
 
   if (!m_deltaCorrelation) {
-    CHECK(m_tileToolAutoCr.retrieve());
+    ATH_CHECK(m_tileToolAutoCr.retrieve());
   } else {
     m_tileToolAutoCr.disable();
   }
 
   //==== TileInfo
-  CHECK( detStore()->retrieve(m_tileInfo, "TileInfo") );
+  ATH_CHECK( detStore()->retrieve(m_tileInfo, "TileInfo") );
 
   if (m_nSamples != m_tileInfo->NdigitSamples()) {
     ATH_MSG_WARNING( "Changing number of samples from " << m_nSamples
@@ -89,7 +77,7 @@ StatusCode TileCondToolOfc::initialize() {
 
   //=== Initialize max values
   ServiceHandle<TileCablingSvc> cablingSvc("TileCablingSvc", name());
-  CHECK( cablingSvc.retrieve());
+  ATH_CHECK( cablingSvc.retrieve());
 
   const TileCablingService* cabling = cablingSvc->cablingService();
   if (!cabling) {

TileCalorimeter/TileSimAlgs/TileSimAlgs/TileDigitsFromPulse.h

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 //****************************************************************************
@@ -49,6 +49,9 @@
 #ifndef TILESIMALGS_TILEDIGITSFROMPULSE_H
 #define TILESIMALGS_TILEDIGITSFROMPULSE_H
 
+// Tile includes
+#include "TileConditions/TileCondToolNoiseSample.h"
+
 #include "AthenaBaseComps/AthAlgorithm.h"
 #include "CLHEP/Random/RandomEngine.h"
 #include "GaudiKernel/ServiceHandle.h"
@@ -95,7 +98,8 @@ private:
     TileRawChannelUnit::UNIT m_rChUnit; //!< Units used for the TileRawChannels (ADC, pCb, etc.)(see TileInfo.h)
     TileFragHash::TYPE m_rChType; //!< Type of TileRawChannels (Digitizar, OF1, OF2, Fit, etc.)(see TileFragHash.h)
     
-    ToolHandle<TileCondToolNoiseSample> m_tileToolNoiseSample;
+    ToolHandle<TileCondToolNoiseSample> m_tileToolNoiseSample{this,
+        "TileCondToolNoiseSample", "TileCondToolNoiseSample", "Tile sample noise tool"};
     
     CLHEP::HepRandomEngine * m_pHRengine; //!< Random number generator engine to use
     ServiceHandle <IAtRndmGenSvc> m_rndmSvc;  //!< Random number service to use

TileCalorimeter/TileSimAlgs/TileSimAlgs/TileDigitsMaker.h

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 //****************************************************************************
@@ -30,6 +30,10 @@
 // Tile includes
 #include "TileEvent/TileHitContainer.h"
 #include "TileEvent/TileDigitsContainer.h"
+#include "TileConditions/TileCondToolPulseShape.h"
+#include "TileConditions/TileCondToolEmscale.h"
+#include "TileConditions/TileCondToolNoiseSample.h"
+#include "TileConditions/ITileBadChanTool.h"
 
 // Atlas includes
 #include "AthenaBaseComps/AthAlgorithm.h"
@@ -52,10 +56,6 @@ class TileHWID;
 class TileInfo;
 class HWIdentifier;
 class TileCablingService;
-class TileCondToolEmscale;
-class TileCondToolNoiseSample;
-class TileCondToolPulseShape;
-class ITileBadChanTool;
 class TileBeamInfoProvider;
 class TileDQstatus;
 
@@ -156,10 +156,18 @@ class TileDigitsMaker: public AthAlgorithm {
 
     ServiceHandle<IAtRndmGenSvc> m_rndmSvc;  //!< Random number service to use
 
-    ToolHandle<TileCondToolEmscale> m_tileToolEmscale; //!< main Tile Calibration tool
-    ToolHandle<TileCondToolNoiseSample> m_tileToolNoiseSample; //!< tool which provided noise values
-    ToolHandle<TileCondToolPulseShape> m_tileToolPulseShape; //!< tool which provides pulse shapes
-    ToolHandle<ITileBadChanTool> m_tileBadChanTool; //!< tool which provides status of every channel
+    ToolHandle<TileCondToolNoiseSample> m_tileToolNoiseSample{this,
+        "TileCondToolNoiseSample", "TileCondToolNoiseSample", "Tile sample noise tool"};
+
+    ToolHandle<TileCondToolEmscale> m_tileToolEmscale{this,
+        "TileCondToolEmscale", "TileCondToolEmscale", "Tile EM scale calibration tool"};
+
+    ToolHandle<TileCondToolPulseShape> m_tileToolPulseShape{this,
+        "TileCondToolPulseShape", "TileCondToolPulseShape", "Tile pulse shape tool"};
+
+    ToolHandle<ITileBadChanTool> m_tileBadChanTool{this,
+        "TileBadChanTool", "TileBadChanTool", "Tile bad channel tool"};
+
     ToolHandle<TileBeamInfoProvider> m_beamInfo;     //!< tool which provides DQstatus (for overlay)
 
 };

TileCalorimeter/TileSimAlgs/TileSimAlgs/TileHitToRawChannel.h

@@ -38,6 +38,7 @@
 #include "AthenaBaseComps/AthAlgorithm.h"
 #include "StoreGate/ReadHandleKey.h"
 #include "StoreGate/WriteHandleKey.h"
+#include "TileConditions/TileCondToolEmscale.h"
 
 // Gaudi includes
 #include "GaudiKernel/ToolHandle.h"
@@ -57,7 +58,6 @@ class TileHWID;
 class TileInfo;
 class HWIdentifier;
 class TileCablingService;
-class TileCondToolEmscale;
 
 
 /**
@@ -114,7 +114,8 @@ class TileHitToRawChannel: public AthAlgorithm {
     IAtRndmGenSvc * m_atRndmGenSvc; //!< Random number generator engine to use
     CLHEP::HepRandomEngine * m_pHRengine;  //!< Random number service to use
 
-    ToolHandle<TileCondToolEmscale> m_tileToolEmscale; //!< main Tile Calibration tool
+    ToolHandle<TileCondToolEmscale> m_tileToolEmscale{this,
+        "TileCondToolEmscale", "TileCondToolEmscale", "Tile EM scale calibration tool"};
 
     ToolHandle<TileCondToolNoiseSample> m_tileToolNoiseSample{this,
         "TileCondToolNoiseSample", "TileCondToolNoiseSample", "Tile sample noise tool"};

TileCalorimeter/TileSimAlgs/TileSimAlgs/TileHitToTTL1.h

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 //****************************************************************************
@@ -30,6 +30,8 @@
 // Tile includes
 #include "TileEvent/TileHitContainer.h"
 #include "TileEvent/TileTTL1Container.h"
+#include "TileConditions/TileCondToolEmscale.h"
+#include "TileConditions/ITileBadChanTool.h"
 
 // Atlas includes
 #include "AthenaBaseComps/AthAlgorithm.h"
@@ -51,8 +53,6 @@ class TileHWID;
 class TileInfo;
 class CaloLVL1_ID;
 class TileCablingService;
-class TileCondToolEmscale;
-class ITileBadChanTool;
 
 /**
  @class TileHitToTTL1
@@ -122,10 +122,12 @@ class TileHitToTTL1: public AthAlgorithm {
 
     ServiceHandle<IAtRndmGenSvc> m_rndmSvc; //!< Random number generator engine to use
 
-    ToolHandle<TileCondToolEmscale> m_tileToolEmscale; //!< main Tile Calibration tool
+    ToolHandle<TileCondToolEmscale> m_tileToolEmscale{this,
+        "TileCondToolEmscale", "TileCondToolEmscale", "Tile EM scale calibration tool"};
 
     bool m_maskBadChannels;      //!< if true then bad channels are masked
-    ToolHandle<ITileBadChanTool> m_tileBadChanTool; //!< Tile Bad Channel tool
+    ToolHandle<ITileBadChanTool> m_tileBadChanTool{this,
+        "TileBadChanTool", "TileBadChanTool", "Tile bad channel tool"};
 
 };
 

TileCalorimeter/TileSimAlgs/TileSimAlgs/TileMuonReceiverDecision.h

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 //****************************************************************************
@@ -33,6 +33,7 @@
 // Tile includes
 #include "TileEvent/TileRawChannelContainer.h"
 #include "TileEvent/TileContainer.h"
+#include "TileConditions/TileCondToolEmscale.h"
 
 // Atlas includes
 #include "AthenaBaseComps/AthAlgorithm.h"
@@ -49,7 +50,7 @@ class TileID;
 class TileHWID;
 class TileInfo;
 class TileCablingService;
-class TileCondToolEmscale;
+
 
 class TileMuonReceiverDecision: public AthAlgorithm {
 
@@ -88,7 +89,9 @@ class TileMuonReceiverDecision: public AthAlgorithm {
   float m_threshold_d5d6_hi;
   float m_selCutQf;
 
-  ToolHandle<TileCondToolEmscale> m_tileToolEmscale;         //!< main Tile Calibration tool
+  ToolHandle<TileCondToolEmscale> m_tileToolEmscale{this,
+      "TileCondToolEmscale", "TileCondToolEmscale", "Tile EM scale calibration tool"};
+
 
   bool m_run2;
 };

TileCalorimeter/TileSimAlgs/src/TileDigitsFromPulse.cxx

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 //*****************************************************************************
@@ -60,7 +60,6 @@ TileDigitsFromPulse::TileDigitsFromPulse(std::string name, ISvcLocator* pSvcLoca
   AthAlgorithm(name, pSvcLocator),
   m_tileHWID(0),
   m_tileInfo(0),
-  m_tileToolNoiseSample("TileCondToolNoiseSample"),
   m_pHRengine(0),
   m_rndmSvc("AtRndmGenSvc", name)
 
@@ -142,8 +141,10 @@ TileDigitsFromPulse::~TileDigitsFromPulse() {
 StatusCode TileDigitsFromPulse::initialize() {
 	ATH_MSG_DEBUG("in initialize()");
 
-	CHECK(detStore()->retrieve(m_tileHWID, "TileHWID"));
-	CHECK(detStore()->retrieve(m_tileInfo, "TileInfo"));
+	ATH_CHECK(detStore()->retrieve(m_tileHWID, "TileHWID"));
+	ATH_CHECK(detStore()->retrieve(m_tileInfo, "TileInfo"));
+
+        ATH_CHECK(m_tileToolNoiseSample.retrieve());
 
 	ATH_MSG_INFO("output container: " << m_outputContainer);