From 5cd353603d9127848cac56e7a238864d24c455ac Mon Sep 17 00:00:00 2001
From: Siarhei Harkusha <Siarhei.Harkusha@cern.ch>
Date: Fri, 7 Dec 2018 12:37:35 +0100
Subject: [PATCH] TileSimAlgs: Use private Tile conditions tools
Former-commit-id: 5dab391b7814fb87e460bd4937da50fd5f0cecbe
---
.../TileSimAlgs/TileDigitsFromPulse.h | 8 +++--
.../TileSimAlgs/TileSimAlgs/TileDigitsMaker.h | 26 +++++++++++------
.../TileSimAlgs/TileHitToRawChannel.h | 5 ++--
.../TileSimAlgs/TileSimAlgs/TileHitToTTL1.h | 12 ++++----
.../TileSimAlgs/TileMuonReceiverDecision.h | 9 ++++--
.../TilePulseForTileMuonReceiver.h | 29 +++++++++++--------
.../TileSimAlgs/src/TileDigitsFromPulse.cxx | 9 +++---
.../TileSimAlgs/src/TileDigitsMaker.cxx | 14 +--------
.../TileSimAlgs/src/TileHitToRawChannel.cxx | 7 ++---
.../TileSimAlgs/src/TileHitToTTL1.cxx | 12 ++------
.../src/TileMuonReceiverDecision.cxx | 5 +---
.../src/TilePulseForTileMuonReceiver.cxx | 14 +--------
12 files changed, 69 insertions(+), 81 deletions(-)
diff --git a/TileCalorimeter/TileSimAlgs/TileSimAlgs/TileDigitsFromPulse.h b/TileCalorimeter/TileSimAlgs/TileSimAlgs/TileDigitsFromPulse.h
index 3d5f19008af..178f0544816 100644
--- a/TileCalorimeter/TileSimAlgs/TileSimAlgs/TileDigitsFromPulse.h
+++ b/TileCalorimeter/TileSimAlgs/TileSimAlgs/TileDigitsFromPulse.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
*/
//****************************************************************************
@@ -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
diff --git a/TileCalorimeter/TileSimAlgs/TileSimAlgs/TileDigitsMaker.h b/TileCalorimeter/TileSimAlgs/TileSimAlgs/TileDigitsMaker.h
index dbbdb3066eb..a2141e9a5b9 100644
--- a/TileCalorimeter/TileSimAlgs/TileSimAlgs/TileDigitsMaker.h
+++ b/TileCalorimeter/TileSimAlgs/TileSimAlgs/TileDigitsMaker.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
*/
//****************************************************************************
@@ -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)
};
diff --git a/TileCalorimeter/TileSimAlgs/TileSimAlgs/TileHitToRawChannel.h b/TileCalorimeter/TileSimAlgs/TileSimAlgs/TileHitToRawChannel.h
index 84ea5a60415..f8dda86c180 100644
--- a/TileCalorimeter/TileSimAlgs/TileSimAlgs/TileHitToRawChannel.h
+++ b/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"};
diff --git a/TileCalorimeter/TileSimAlgs/TileSimAlgs/TileHitToTTL1.h b/TileCalorimeter/TileSimAlgs/TileSimAlgs/TileHitToTTL1.h
index 0791fb1d92a..d40163eb4a7 100644
--- a/TileCalorimeter/TileSimAlgs/TileSimAlgs/TileHitToTTL1.h
+++ b/TileCalorimeter/TileSimAlgs/TileSimAlgs/TileHitToTTL1.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
*/
//****************************************************************************
@@ -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"};
};
diff --git a/TileCalorimeter/TileSimAlgs/TileSimAlgs/TileMuonReceiverDecision.h b/TileCalorimeter/TileSimAlgs/TileSimAlgs/TileMuonReceiverDecision.h
index d3cb4372d08..79e0a8954fe 100644
--- a/TileCalorimeter/TileSimAlgs/TileSimAlgs/TileMuonReceiverDecision.h
+++ b/TileCalorimeter/TileSimAlgs/TileSimAlgs/TileMuonReceiverDecision.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
*/
//****************************************************************************
@@ -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;
};
diff --git a/TileCalorimeter/TileSimAlgs/TileSimAlgs/TilePulseForTileMuonReceiver.h b/TileCalorimeter/TileSimAlgs/TileSimAlgs/TilePulseForTileMuonReceiver.h
index bba6100b5e3..4dd806693e0 100644
--- a/TileCalorimeter/TileSimAlgs/TileSimAlgs/TilePulseForTileMuonReceiver.h
+++ b/TileCalorimeter/TileSimAlgs/TileSimAlgs/TilePulseForTileMuonReceiver.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
*/
//****************************************************************************
@@ -39,6 +39,10 @@
#include "TileEvent/TileHitContainer.h"
#include "TileEvent/TileDigitsContainer.h"
#include "TileEvent/TileRawChannelContainer.h"
+#include "TileConditions/TileCondToolPulseShape.h"
+#include "TileConditions/TileCondToolEmscale.h"
+#include "TileConditions/TileCondToolNoiseSample.h"
+#include "TileConditions/ITileBadChanTool.h"
// Atlas includes
#include "AthenaBaseComps/AthAlgorithm.h"
@@ -60,14 +64,7 @@ class TileHWID;
class TileInfo;
class TileCablingService;
class TileEvent;
-
-class TileCondToolEmscale;
-class TileCondToolNoiseSample;
-class TileCondToolPulseShape;
-
class TileDQstatus;
-class ITileBadChanTool;
-
class TileBeamInfoProvider;
class TileRawChannelBuilderMF;
@@ -134,10 +131,18 @@ class TilePulseForTileMuonReceiver: public AthAlgorithm {
CLHEP::HepRandomEngine* m_pHRengine; //!< Random number generator engine to use
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)
ToolHandle<TileRawChannelBuilderMF> m_MuRcvBuildTool; //!< tool to set up the reconstruction algorithm
diff --git a/TileCalorimeter/TileSimAlgs/src/TileDigitsFromPulse.cxx b/TileCalorimeter/TileSimAlgs/src/TileDigitsFromPulse.cxx
index 4286b18534e..4dfc452aa43 100644
--- a/TileCalorimeter/TileSimAlgs/src/TileDigitsFromPulse.cxx
+++ b/TileCalorimeter/TileSimAlgs/src/TileDigitsFromPulse.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
*/
//*****************************************************************************
@@ -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);
diff --git a/TileCalorimeter/TileSimAlgs/src/TileDigitsMaker.cxx b/TileCalorimeter/TileSimAlgs/src/TileDigitsMaker.cxx
index 110e326fc01..cf2c253b760 100644
--- a/TileCalorimeter/TileSimAlgs/src/TileDigitsMaker.cxx
+++ b/TileCalorimeter/TileSimAlgs/src/TileDigitsMaker.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
*/
//****************************************************************************
@@ -23,11 +23,7 @@
#include "TileConditions/TileInfo.h"
#include "TileCalibBlobObjs/TileCalibUtils.h"
#include "TileConditions/TileCablingService.h"
-#include "TileConditions/TileCondToolEmscale.h"
-#include "TileConditions/TileCondToolNoiseSample.h"
#include "TileConditions/TilePulseShapes.h"
-#include "TileConditions/TileCondToolPulseShape.h"
-#include "TileConditions/ITileBadChanTool.h"
#include "TileEvent/TileRawChannelContainer.h"
#include "TileRecUtils/TileBeamInfoProvider.h"
@@ -93,10 +89,6 @@ TileDigitsMaker::TileDigitsMaker(std::string name, ISvcLocator* pSvcLocator)
m_timeStepLo(0.0),
m_pHRengine(0),
m_rndmSvc ("AtRndmGenSvc", name),
- m_tileToolEmscale("TileCondToolEmscale"),
- m_tileToolNoiseSample("TileCondToolNoiseSample"),
- m_tileToolPulseShape("TileCondToolPulseShape"),
- m_tileBadChanTool("TileBadChanTool"),
m_beamInfo("TileBeamInfoProvider/TileBeamInfoProvider")
{
declareProperty("FilterThreshold", m_filterThreshold = 100.0 * MeV, "Threshold on filtered digits (default - 100 MeV)");
@@ -105,12 +97,8 @@ TileDigitsMaker::TileDigitsMaker(std::string name, ISvcLocator* pSvcLocator)
declareProperty("IntegerDigits", m_integerDigits = true);
declareProperty("CalibrationRun", m_calibRun = false);
declareProperty("RndmSvc", m_rndmSvc, "Random Number Service used in TileDigitsMaker");
- declareProperty("TileCondToolEmscale", m_tileToolEmscale, "Service to calibrate all channels");
- declareProperty("TileCondToolNoiseSample", m_tileToolNoiseSample);
declareProperty("RndmEvtOverlay",m_rndmEvtOverlay = false,"Pileup and/or noise added by overlaying random events (default=false)");
- declareProperty("TileCondToolPulseShape",m_tileToolPulseShape);
declareProperty("UseCoolPulseShapes",m_useCoolPulseShapes = true,"Pulse shapes from database (default=true)");
- declareProperty("TileBadChanTool",m_tileBadChanTool);
declareProperty("MaskBadChannels",m_maskBadChannels = false,"Remove channels tagged bad (default=false)");
declareProperty("DoHSTruthReconstruction",m_doDigiTruth = true);
declareProperty("AllChannels", m_allChannels = -1, "Create all channels, use 0 or 1 or 2 (default=-1 - unset)");
diff --git a/TileCalorimeter/TileSimAlgs/src/TileHitToRawChannel.cxx b/TileCalorimeter/TileSimAlgs/src/TileHitToRawChannel.cxx
index 3f8c659ce76..0faa792c413 100644
--- a/TileCalorimeter/TileSimAlgs/src/TileHitToRawChannel.cxx
+++ b/TileCalorimeter/TileSimAlgs/src/TileHitToRawChannel.cxx
@@ -22,7 +22,6 @@
#include "TileCalibBlobObjs/TileCalibUtils.h"
#include "TileConditions/TileInfo.h"
#include "TileConditions/TileCablingService.h"
-#include "TileConditions/TileCondToolEmscale.h"
#include "TileEvent/TileHitContainer.h"
// Calo includes
@@ -61,15 +60,13 @@ TileHitToRawChannel::TileHitToRawChannel(std::string name, ISvcLocator* pSvcLoca
, m_ampMaxHi(0.0)
, m_atRndmGenSvc(0)
, m_pHRengine(0)
- , m_tileToolEmscale("TileCondToolEmscale")
{
m_rChUnit = TileRawChannelUnit::ADCcounts;
m_rChType = TileFragHash::Default;
declareProperty("TileInfoName", m_infoName = "TileInfo");
- declareProperty("DeltaT",m_deltaT = -1.0); // keep hits only within deltaT;
- declareProperty("calibrateEnergy",m_calibrateEnergy = false); // convert or not to pCb
- declareProperty("TileCondToolEmscale" , m_tileToolEmscale);
+ declareProperty("DeltaT", m_deltaT = -1.0); // keep hits only within deltaT;
+ declareProperty("calibrateEnergy", m_calibrateEnergy = false); // convert or not to pCb
}
TileHitToRawChannel::~TileHitToRawChannel() {
diff --git a/TileCalorimeter/TileSimAlgs/src/TileHitToTTL1.cxx b/TileCalorimeter/TileSimAlgs/src/TileHitToTTL1.cxx
index 381133e24d2..6d4dd7210bd 100644
--- a/TileCalorimeter/TileSimAlgs/src/TileHitToTTL1.cxx
+++ b/TileCalorimeter/TileSimAlgs/src/TileHitToTTL1.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
*/
//*****************************************************************************
@@ -28,8 +28,6 @@
#include "TileIdentifier/TileHWID.h"
#include "TileConditions/TileInfo.h"
#include "TileConditions/TileCablingService.h"
-#include "TileConditions/TileCondToolEmscale.h"
-#include "TileConditions/ITileBadChanTool.h"
#include "TileCalibBlobObjs/TileCalibUtils.h"
// Calo includes
@@ -78,18 +76,14 @@ TileHitToTTL1::TileHitToTTL1(std::string name, ISvcLocator* pSvcLocator)
, m_tileThresh(false)
, m_pHRengine(0)
, m_rndmSvc ("AtRndmGenSvc", name)
- , m_tileToolEmscale("TileCondToolEmscale")
- , m_tileBadChanTool("TileBadChanTool")
{
m_infoName = "TileInfo";
m_TileTTL1Type = "Standard";
declareProperty("TileInfoName", m_infoName);
- declareProperty("TileTTL1Type",m_TileTTL1Type);
+ declareProperty("TileTTL1Type", m_TileTTL1Type);
declareProperty("RndmSvc", m_rndmSvc, "Random Number Service used in TileHitToTTL1");
- declareProperty("TileCondToolEmscale" , m_tileToolEmscale);
- declareProperty("maskBadChannels",m_maskBadChannels = true);
- declareProperty("TileBadChanTool", m_tileBadChanTool);
+ declareProperty("maskBadChannels", m_maskBadChannels = true);
}
TileHitToTTL1::~TileHitToTTL1() {
diff --git a/TileCalorimeter/TileSimAlgs/src/TileMuonReceiverDecision.cxx b/TileCalorimeter/TileSimAlgs/src/TileMuonReceiverDecision.cxx
index 5a6187d6030..ac75cea888b 100644
--- a/TileCalorimeter/TileSimAlgs/src/TileMuonReceiverDecision.cxx
+++ b/TileCalorimeter/TileSimAlgs/src/TileMuonReceiverDecision.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
*/
//****************************************************************************
@@ -26,7 +26,6 @@
#include "TileIdentifier/TileHWID.h"
#include "TileCalibBlobObjs/TileCalibUtils.h"
#include "TileConditions/TileCablingService.h"
-#include "TileConditions/TileCondToolEmscale.h"
#include "TileConditions/TileInfo.h"
#include "TileEvent/TileMuonReceiverObj.h"
@@ -46,7 +45,6 @@ TileMuonReceiverDecision::TileMuonReceiverDecision(std::string name, ISvcLocator
m_tileHWID(0),
m_cablingService(0),
m_tileInfo(0),
- m_tileToolEmscale("TileCondToolEmscale"),
m_run2(true)
{
// declare properties...
@@ -55,7 +53,6 @@ TileMuonReceiverDecision::TileMuonReceiverDecision(std::string name, ISvcLocator
declareProperty( "MuonReceiverEneThreshCellD6High" , m_threshold_d6_hi = 600. , "Setting the highest trigger threshold for cell D6 in MeV (Def=600 MeV)");
declareProperty( "MuonReceiverEneThreshCellD6andD5High" , m_threshold_d5d6_hi = 600. , "Setting the highest trigger threshold for cell D5+D6 in MeV (Def=600 MeV)");
declareProperty( "SelectionCutForMatchedFilterQf" , m_selCutQf=0. , "Selection cut for the quality factor of the matched filters");
- declareProperty( "TileCondToolEmscale" , m_tileToolEmscale , "Service to calibrate all channels");
declareProperty( "TileInfoName" , m_infoName = "TileInfo" );
}
diff --git a/TileCalorimeter/TileSimAlgs/src/TilePulseForTileMuonReceiver.cxx b/TileCalorimeter/TileSimAlgs/src/TilePulseForTileMuonReceiver.cxx
index 7c7f960daef..0c108e46661 100644
--- a/TileCalorimeter/TileSimAlgs/src/TilePulseForTileMuonReceiver.cxx
+++ b/TileCalorimeter/TileSimAlgs/src/TilePulseForTileMuonReceiver.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
*/
//***************************************************************************************
@@ -34,11 +34,7 @@
#include "TileIdentifier/TileHWID.h"
#include "TileConditions/TileInfo.h"
#include "TileConditions/TileCablingService.h"
-#include "TileConditions/TileCondToolEmscale.h"
-#include "TileConditions/TileCondToolNoiseSample.h"
#include "TileConditions/TilePulseShapes.h"
-#include "TileConditions/TileCondToolPulseShape.h"
-#include "TileConditions/ITileBadChanTool.h"
#include "TileCalibBlobObjs/TileCalibUtils.h"
#include "TileRecUtils/TileRawChannelBuilder.h"
#include "TileRecUtils/TileRawChannelBuilderMF.h"
@@ -81,10 +77,6 @@ TilePulseForTileMuonReceiver::TilePulseForTileMuonReceiver(std::string name, ISv
, m_timeStep(0.0)
, m_pHRengine(0)
, m_rndmSvc("AtRndmGenSvc", name)
- , m_tileToolEmscale("TileCondToolEmscale")
- , m_tileToolNoiseSample("TileCondToolNoiseSample")
- , m_tileToolPulseShape("TileCondToolPulseShape")
- , m_tileBadChanTool("TileBadChanTool")
, m_beamInfo("TileBeamInfoProvider/TileBeamInfoProvider")
, m_MuRcvBuildTool("TileRawChannelBuilderMF")
, m_run2(true)
@@ -93,15 +85,11 @@ TilePulseForTileMuonReceiver::TilePulseForTileMuonReceiver(std::string name, ISv
declareProperty("TileInfoName" , m_infoName = "TileInfo");
declareProperty("IntegerDigits" , m_integerDigits = false, "Round digits (default=false)");
- declareProperty("TileBadChanTool" , m_tileBadChanTool);
- declareProperty("TileCondToolPulseShape" , m_tileToolPulseShape);
declareProperty("MaskBadChannels" , m_maskBadChannels = false, "Remove channels tagged bad (default=false)");
declareProperty("UseCoolPulseShapes" , m_useCoolPulseShapes = false, "Pulse shapes from database (default=false)");
- declareProperty("TileCondToolNoiseSample" , m_tileToolNoiseSample);
declareProperty("UseCoolNoise" , m_tileNoise = false, "Noise from database (default=false)");
declareProperty("UseCoolPedestal" , m_tilePedestal = false, "Pedestal from database (default=false)");
declareProperty("RndmSvc" , m_rndmSvc, "Random Number Service used in TilePulseForTileMuonReceiver");
- declareProperty("TileCondToolEmscale" , m_tileToolEmscale, "Service to calibrate all channels");
declareProperty("TileRawChannelBuilderMF" , m_MuRcvBuildTool, "The tool by default is the Matched Filter");
}
--
GitLab