diff --git a/LArCalorimeter/LArCellRec/CMakeLists.txt b/LArCalorimeter/LArCellRec/CMakeLists.txt
index df44d9aec1105b1836506e91339bc20ac7840ecd..d52e8eac72fbec51c06f85c4586cec0b5262559d 100644
--- a/LArCalorimeter/LArCellRec/CMakeLists.txt
+++ b/LArCalorimeter/LArCellRec/CMakeLists.txt
@@ -35,7 +35,7 @@ atlas_depends_on_subdirs( PUBLIC
Event/xAOD/xAODTrigL1Calo
Generators/GeneratorObjects
LArCalorimeter/LArRecEvent
- LArCalorimeter/LArTools
+ LArCalorimeter/LArCabling
Trigger/TrigT1/TrigT1CaloCalibConditions
Trigger/TrigT1/TrigT1CaloCondSvc )
@@ -49,7 +49,7 @@ atlas_add_component( LArCellRec
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${HEPMC_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} ${HEPMC_LIBRARIES} CaloConditions CaloDetDescrLib CaloEvent CaloIdentifier CaloRecLib CaloUtilsLib AthAllocators AthenaBaseComps AthenaKernel CxxUtils StoreGateLib SGtests AtlasDetDescr Identifier GaudiKernel LArIdentifier LArRawEvent LArRecConditions LArSimEvent CaloTriggerToolLib AthenaPoolUtilities xAODEventInfo xAODTrigL1Calo GeneratorObjects LArRecEvent LArToolsLib TrigT1CaloCalibConditions )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} ${HEPMC_LIBRARIES} CaloConditions CaloDetDescrLib CaloEvent CaloIdentifier CaloRecLib CaloUtilsLib AthAllocators AthenaBaseComps AthenaKernel CxxUtils StoreGateLib SGtests AtlasDetDescr Identifier GaudiKernel LArIdentifier LArRawEvent LArRecConditions LArSimEvent CaloTriggerToolLib AthenaPoolUtilities xAODEventInfo xAODTrigL1Calo GeneratorObjects LArRecEvent LArCablingLib TrigT1CaloCalibConditions )
# Install files from the package:
atlas_install_headers( LArCellRec )
diff --git a/LArCalorimeter/LArCellRec/cmt/requirements b/LArCalorimeter/LArCellRec/cmt/requirements
index dbc66c1e76f5d988ae8cad1f4a01d7739f675f46..399c219734c4986aa13efbb0a42f3c8ebc569fd1 100755
--- a/LArCalorimeter/LArCellRec/cmt/requirements
+++ b/LArCalorimeter/LArCellRec/cmt/requirements
@@ -45,7 +45,7 @@ use GeneratorObjects GeneratorObjects-* Generators
use CaloTriggerTool CaloTriggerTool-* Calorimeter
use LArRecEvent LArRecEvent-* LArCalorimeter
#use LArRecUtils LArRecUtils-* LArCalorimeter
-use LArTools LArTools-* LArCalorimeter
+use LArCabling LArCabling-* LArCalorimeter
# for deadOTX correction using L1 energies (These packages are in AtlasConditions and AtlasEvent)
use TrigT1CaloCalibConditions TrigT1CaloCalibConditions-* Trigger/TrigT1
# use TrigT1CaloEvent TrigT1CaloEvent-* Trigger/TrigT1
diff --git a/LArCalorimeter/LArCellRec/src/LArBadFebMaskingTool.cxx b/LArCalorimeter/LArCellRec/src/LArBadFebMaskingTool.cxx
index 1a404523c3933845c2a059fd747f412e796bc7fd..c85a5887f87662e9902380965e975b94684d3deb 100755
--- a/LArCalorimeter/LArCellRec/src/LArBadFebMaskingTool.cxx
+++ b/LArCalorimeter/LArCellRec/src/LArBadFebMaskingTool.cxx
@@ -32,7 +32,7 @@ PURPOSE:
#include "LArIdentifier/LArOnlineID.h"
#include "LArRecConditions/ILArBadChanTool.h"
#include "LArRecConditions/LArBadFeb.h"
-#include "LArTools/LArCablingService.h"
+#include "LArCabling/LArCablingService.h"
#include "LArRecEvent/LArEventBitInfo.h"
#include "xAODEventInfo/EventInfo.h"
@@ -51,8 +51,12 @@ LArBadFebMaskingTool::LArBadFebMaskingTool(
m_maskScaOutOfRange(true),m_maskGainMismatch(true),m_maskTypeMismatch(true),m_maskNumOfSamples(true),
m_maskEmptyDataBlock(true),m_maskDspBlockSize(true),m_maskCheckSum(true),m_maskMissingHeader(true),
m_maskBadGain(true),
- m_larFebErrorSummaryKey("LArFebErrorSummary")
-
+ m_larFebErrorSummaryKey("LArFebErrorSummary"),
+ m_errorToMask(0),
+ m_calo_id(nullptr),
+ m_onlineID(nullptr),
+ m_evt(0),
+ m_mask(0)
{
declareInterface<ICaloCellMakerTool>(this);
diff --git a/LArCalorimeter/LArCellRec/src/LArCellBuilderFromLArHitTool.cxx b/LArCalorimeter/LArCellRec/src/LArCellBuilderFromLArHitTool.cxx
index 842345901aeb50e3548b34c5abaefbdf775a52ac..cfe34872e55a2f6bbb7d05454f5be6da80338b9a 100755
--- a/LArCalorimeter/LArCellRec/src/LArCellBuilderFromLArHitTool.cxx
+++ b/LArCalorimeter/LArCellRec/src/LArCellBuilderFromLArHitTool.cxx
@@ -52,20 +52,33 @@ LArCellBuilderFromLArHitTool::LArCellBuilderFromLArHitTool(
const std::string& name,
const IInterface* parent)
:AthAlgTool(type, name, parent),
- m_priority(1000),
- m_eHitThreshold(-999999.),
- m_ThresholdOnE(-999999.),
- m_ThresholdOnAbsE(-999999.),
- m_ThresholdOnEinSigma(-999999.),
- m_ThresholdOnAbsEinSigma(-999999.),
- m_Windows(false),
- m_WindowsEtaSize(0.4),
- m_WindowsPhiSize(0.5),
- m_WithNoise(true),
- m_WithElecNoise(true),
- m_WithPileUpNoise(false),
- m_NoiseToolName("CaloNoiseTool/calonoisetool"),
- m_mcEventName("GEN_EVENT")
+ m_priority(1000),
+ m_caloNum(),
+ m_calo_dd_man(nullptr),
+ m_caloCID(nullptr),
+ m_atlas_id(nullptr),
+ m_emID(nullptr),
+ m_hecID(nullptr),
+ m_fcalID(nullptr),
+ m_applyHitEnergyThreshold(false),
+ m_eHitThreshold(-999999.),
+ m_ThresholdOnE(-999999.),
+ m_ThresholdOnAbsE(-999999.),
+ m_ThresholdOnEinSigma(-999999.),
+ m_ThresholdOnAbsEinSigma(-999999.),
+ m_ThresholdSelected(0),
+ m_ThresholdSelectedNotInSigma(0),
+ m_Windows(false),
+ m_WindowsEtaSize(0.4),
+ m_WindowsPhiSize(0.5),
+ m_AtRndmGenSvc(nullptr),
+ m_WithNoise(true),
+ m_WithElecNoise(true),
+ m_WithPileUpNoise(false),
+ m_NoiseToolName("CaloNoiseTool/calonoisetool"),
+ m_noisetool(nullptr),
+ m_WithMap(false),
+ m_mcEventName("GEN_EVENT")
{
declareInterface<ICaloCellMakerTool>(this);
diff --git a/LArCalorimeter/LArCellRec/src/LArCellBuilderFromLArRawChannelTool.cxx b/LArCalorimeter/LArCellRec/src/LArCellBuilderFromLArRawChannelTool.cxx
index eeb4d83c72505d1abaf2b443fe1b9a1469684f2c..f1ce3a9841c6317403dd9bee8a28242f507e3d3a 100755
--- a/LArCalorimeter/LArCellRec/src/LArCellBuilderFromLArRawChannelTool.cxx
+++ b/LArCalorimeter/LArCellRec/src/LArCellBuilderFromLArRawChannelTool.cxx
@@ -13,7 +13,7 @@
#include "LArRecEvent/LArCell.h"
#include "LArCellRec/LArCellBuilderFromLArRawChannelTool.h"
-#include "LArTools/LArCablingService.h"
+#include "LArCabling/LArCablingService.h"
#include "LArRecEvent/LArCell.h"
#include "CaloEvent/CaloCellContainer.h"
#include "CaloIdentifier/CaloCell_ID.h"
@@ -37,9 +37,11 @@ LArCellBuilderFromLArRawChannelTool::LArCellBuilderFromLArRawChannelTool(
m_addDeadOTX(true),
m_initialDataPoolSize(-1),
m_nTotalCells(0),
+ m_caloDDM(nullptr),
m_cablingSvc("LArCablingService"),
+ m_onlineID(nullptr),
+ m_caloCID(nullptr),
m_badChannelTool("LArBadChanTool"),
-
m_nDeadFEBs(0)
{
declareInterface<ICaloCellMakerTool>(this);
@@ -215,7 +217,7 @@ StatusCode LArCellBuilderFromLArRawChannelTool::fillCompleteCellCont(const LArRa
LArCell* larcell=getCell(*itrRawChannel,hashid,pool);
if (larcell) {
if ((*theCellContainer)[hashid]) {
- msg(MSG::ERROR) << "Channel added twice! Data corruption? hash=" << hashid
+ msg(MSG::WARNING) << "Channel added twice! Data corruption? hash=" << hashid
<< " online ID=0x" << std::hex << itrRawChannel->channelID().get_compact()
<< " " << m_onlineID->channel_name(itrRawChannel->channelID()) << endreq;
}
diff --git a/LArCalorimeter/LArCellRec/src/LArCellDeadOTXCorr.cxx b/LArCalorimeter/LArCellRec/src/LArCellDeadOTXCorr.cxx
index 043f16e360fe56abc8ab21f1d2fee3d0cdf52f8e..6c31c7d3c4c7be8633ecfadcafd79fe4779afe3d 100644
--- a/LArCalorimeter/LArCellRec/src/LArCellDeadOTXCorr.cxx
+++ b/LArCalorimeter/LArCellRec/src/LArCellDeadOTXCorr.cxx
@@ -55,7 +55,7 @@
#include "LArRawEvent/LArFebErrorSummary.h"
#include "LArIdentifier/LArOnlineID.h"
#include "LArRecConditions/ILArBadChanTool.h"
-#include "LArTools/LArCablingService.h"
+#include "LArCabling/LArCablingService.h"
#include "CaloTriggerTool/CaloTriggerTowerService.h"
// #include "TrigT1CaloCalibTools/L1CaloTTIdTools.h"
//#include "TrigT1CaloEvent/TriggerTowerCollection.h"
@@ -123,7 +123,14 @@ LArCellDeadOTXCorr::LArCellDeadOTXCorr(
const std::string& type,
const std::string& name,
const IInterface* parent)
-:AthAlgTool(type, name, parent)
+ : AthAlgTool(type, name, parent),
+ m_caloMgr(nullptr),
+ m_lvl1Helper(nullptr),
+ m_calo_id(nullptr),
+ m_onlineID(nullptr),
+ m_TT_ID(nullptr),
+ m_l1CondSvc(nullptr),
+ m_ttSvc(nullptr)
{
declareInterface<ICaloCellMakerTool>(this);
declareProperty("triggerTowerLocation", m_TTLocation = "xAODTriggerTowers");
diff --git a/LArCalorimeter/LArCellRec/src/LArCellEmMiscalib.cxx b/LArCalorimeter/LArCellRec/src/LArCellEmMiscalib.cxx
index 60311a0064dc87d847e5ed1370f7234e3c0b0efd..3da0c78d10211602152c3b59ac8a2680e0a9414e 100755
--- a/LArCalorimeter/LArCellRec/src/LArCellEmMiscalib.cxx
+++ b/LArCalorimeter/LArCellRec/src/LArCellEmMiscalib.cxx
@@ -44,10 +44,14 @@ LArCellEmMiscalib::LArCellEmMiscalib(
const std::string& name,
const IInterface* parent)
: CaloCellCorrection(type, name, parent),
+ m_larem_id(nullptr),
+ m_AtRndmGenSvc(nullptr),
+ m_engine(nullptr),
m_seed(1234),
m_sigmaPerRegion(0.005),
m_sigmaPerCell(0.007),
- m_undo(false)
+ m_undo(false),
+ m_ncellem(0)
{
declareInterface<CaloCellCorrection>(this);
declareProperty("Seed", m_seed, "seed : should always be the same");
diff --git a/LArCalorimeter/LArCellRec/src/LArCellGainPathology.cxx b/LArCalorimeter/LArCellRec/src/LArCellGainPathology.cxx
index f8a942542d951d96efc5525c8c63efe14fe18178..a7bff89499ebc2e71909da7d5ab9a37fe86da985 100755
--- a/LArCalorimeter/LArCellRec/src/LArCellGainPathology.cxx
+++ b/LArCalorimeter/LArCellRec/src/LArCellGainPathology.cxx
@@ -30,7 +30,7 @@ PURPOSE:
#include "CaloIdentifier/CaloCell_ID.h"
#include "LArRawEvent/LArFebErrorSummary.h"
#include "LArIdentifier/LArOnlineID.h"
-#include "LArTools/LArCablingService.h"
+#include "LArCabling/LArCablingService.h"
/////////////////////////////////////////////////////////////////////
@@ -41,8 +41,9 @@ LArCellGainPathology::LArCellGainPathology(
const std::string& type,
const std::string& name,
const IInterface* parent)
- :AthAlgTool(type, name, parent)
-
+ : AthAlgTool(type, name, parent),
+ m_calo_id(nullptr),
+ m_onlineID(nullptr)
{
declareInterface<ICaloCellMakerTool>(this);
diff --git a/LArCalorimeter/LArCellRec/src/LArCellMaskingTool.cxx b/LArCalorimeter/LArCellRec/src/LArCellMaskingTool.cxx
index 5b70fc2bd0e284849dd980057580ab9eb8a1d9e3..98c83b8982aeae9bd7744047c0ec32c19aa24be4 100644
--- a/LArCalorimeter/LArCellRec/src/LArCellMaskingTool.cxx
+++ b/LArCalorimeter/LArCellRec/src/LArCellMaskingTool.cxx
@@ -18,7 +18,7 @@ PACKAGE: offline/Calorimeter/CaloRec
#include "CaloEvent/CaloCellContainer.h"
-#include "LArTools/LArCablingService.h"
+#include "LArCabling/LArCablingService.h"
/////////////////////////////////////////////////////////////////////
@@ -29,7 +29,10 @@ LArCellMaskingTool::LArCellMaskingTool(
const std::string& type,
const std::string& name,
const IInterface* parent)
- :AthAlgTool(type, name, parent)
+ : AthAlgTool(type, name, parent),
+ m_onlineID(nullptr),
+ m_offlineID(nullptr),
+ m_larCablingSvc(nullptr)
{
declareInterface<ICaloCellMakerTool>(this);
//List of strings to determine detector parts to be masked.
diff --git a/LArCalorimeter/LArCellRec/src/LArCellMerger.cxx b/LArCalorimeter/LArCellRec/src/LArCellMerger.cxx
index 7305d479adeef5d105099f9386e1770d57ee31ed..087c375a3a19f40ad9822d1ebe07f6e7f28e82dd 100755
--- a/LArCalorimeter/LArCellRec/src/LArCellMerger.cxx
+++ b/LArCalorimeter/LArCellRec/src/LArCellMerger.cxx
@@ -23,7 +23,7 @@ PURPOSE:
#include "Identifier/IdentifierHash.h"
#include "CaloIdentifier/CaloIdManager.h"
#include "CaloIdentifier/CaloCell_ID.h"
-#include "LArTools/LArCablingService.h"
+#include "LArCabling/LArCablingService.h"
/////////////////////////////////////////////////////////////////////
@@ -36,6 +36,7 @@ LArCellMerger::LArCellMerger(
const IInterface* parent)
:AthAlgTool(type, name, parent),
m_rawChannelContainerName("LArRawChannels_digits"),
+ m_calo_id(nullptr),
m_evt(0),
m_ncell(0)
{
diff --git a/LArCalorimeter/LArCellRec/src/LArNoisyROAlg.cxx b/LArCalorimeter/LArCellRec/src/LArNoisyROAlg.cxx
index 8c40a7c882018613bb92b065bd1467e67d30fbda..0e816ef460d1938f1ae4638fbd91cab211171cc5 100644
--- a/LArCalorimeter/LArCellRec/src/LArNoisyROAlg.cxx
+++ b/LArCalorimeter/LArCellRec/src/LArNoisyROAlg.cxx
@@ -11,7 +11,7 @@
#include "CaloIdentifier/CaloIdManager.h"
#include "CaloIdentifier/CaloCell_ID.h"
#include "LArIdentifier/LArOnlineID.h"
-#include "LArTools/LArCablingService.h"
+#include "LArCabling/LArCablingService.h"
#include "GeoModelInterfaces/IGeoModelSvc.h"
#include "LArRecEvent/LArNoisyROSummary.h"
#include "LArRecEvent/LArEventBitInfo.h"
diff --git a/LArCalorimeter/LArCellRec/src/LArNoisyROTool.cxx b/LArCalorimeter/LArCellRec/src/LArNoisyROTool.cxx
index 3628347e52779a8b5f1dfd6d9881a67f74b4b4c2..93eff9db6aa984ab0dd07b2f5b8214520aa3680d 100644
--- a/LArCalorimeter/LArCellRec/src/LArNoisyROTool.cxx
+++ b/LArCalorimeter/LArCellRec/src/LArNoisyROTool.cxx
@@ -18,7 +18,7 @@
#include "LArRecEvent/LArNoisyROSummary.h"
#include "CaloIdentifier/CaloCell_ID.h"
#include "LArIdentifier/LArOnlineID.h"
-#include "LArTools/LArCablingService.h"
+#include "LArCabling/LArCablingService.h"
#include "LArRecEvent/LArNoisyROSummary.h"
LArNoisyROTool::LArNoisyROTool( const std::string& type,
@@ -209,6 +209,15 @@ std::unique_ptr<LArNoisyROSummary> LArNoisyROTool::process(const CaloCellContain
if (m_printSummary) m_badFEB_counters[it->first]++;
//BadFEBCount++;
}
+ // Tight MNBs
+ if ( it->second.badChannels() > m_MNBTightCut ){
+ noisyRO->add_MNBTight_feb(HWIdentifier(it->first));
+ }
+
+ // Loose MNBs
+ if ( it->second.badChannels() > m_MNBLooseCut ){
+ noisyRO->add_MNBLoose_feb(HWIdentifier(it->first));
+ }
const unsigned int* PAcounters = it->second.PAcounters();
for ( size_t i = 0; i < 32; i++ ) {