diff --git a/TestBeam/TBMonitoring/CMakeLists.txt b/TestBeam/TBMonitoring/CMakeLists.txt
index 4dbf0765a6c8cafb4d017986ff4149d66b8e0a56..7027cc6d3a0ce4043354f39f13aeefcf4caef84e 100644
--- a/TestBeam/TBMonitoring/CMakeLists.txt
+++ b/TestBeam/TBMonitoring/CMakeLists.txt
@@ -16,11 +16,12 @@ atlas_depends_on_subdirs( PUBLIC
TestBeam/TBEvent
TestBeam/TBUtils
PRIVATE
+ Control/AthenaKernel
Calorimeter/CaloEvent
Calorimeter/CaloUtils
Event/EventInfo
LArCalorimeter/LArIdentifier
- LArCalorimeter/LArTools )
+ LArCalorimeter/LArCabling )
# External dependencies:
find_package( AIDA )
@@ -33,13 +34,13 @@ atlas_add_library( TBMonitoringLib
INCLUDE_DIRS ${AIDA_INCLUDE_DIRS}
PRIVATE_INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
PRIVATE_DEFINITIONS ${CLHEP_DEFINITIONS}
- LINK_LIBRARIES CaloGeoHelpers CaloIdentifier Identifier GaudiKernel TBEvent AthenaMonitoringLib StoreGateLib SGtests CaloUtilsLib LArToolsLib
- PRIVATE_LINK_LIBRARIES ${CLHEP_LIBRARIES} CaloEvent EventInfo LArIdentifier )
+ LINK_LIBRARIES CaloGeoHelpers CaloIdentifier Identifier GaudiKernel TBEvent AthenaMonitoringLib StoreGateLib SGtests CaloUtilsLib LArCablingLib
+ PRIVATE_LINK_LIBRARIES ${CLHEP_LIBRARIES} AthenaKernel CaloEvent EventInfo LArIdentifier )
atlas_add_component( TBMonitoring
src/components/*.cxx
INCLUDE_DIRS ${AIDA_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${CLHEP_LIBRARIES} CaloGeoHelpers CaloIdentifier AthenaMonitoringLib StoreGateLib SGtests Identifier GaudiKernel TBEvent CaloEvent CaloUtilsLib EventInfo LArIdentifier LArToolsLib TBMonitoringLib )
+ LINK_LIBRARIES ${CLHEP_LIBRARIES} CaloGeoHelpers CaloIdentifier AthenaMonitoringLib StoreGateLib SGtests Identifier GaudiKernel TBEvent AthenaKernel CaloEvent CaloUtilsLib EventInfo LArIdentifier LArCablingLib TBMonitoringLib )
# Install files from the package:
atlas_install_joboptions( share/*.txt share/*.py )
diff --git a/TestBeam/TBMonitoring/TBMonitoring/TBADCRawMonTool.h b/TestBeam/TBMonitoring/TBMonitoring/TBADCRawMonTool.h
index 2d3cccc4718b90995854f1825150103c2d53df7a..c81d8d5186b118ef287c12b0f9f8c1d96a741c7c 100755
--- a/TestBeam/TBMonitoring/TBMonitoring/TBADCRawMonTool.h
+++ b/TestBeam/TBMonitoring/TBMonitoring/TBADCRawMonTool.h
@@ -49,7 +49,7 @@ class TBADCRawMonTool: public MonitorToolBase
private:
- std::string m_path;
+ //std::string m_path;
//Declared properties
bool m_monitor_adc;
diff --git a/TestBeam/TBMonitoring/TBMonitoring/TBBPCAlignmentMonTool.h b/TestBeam/TBMonitoring/TBMonitoring/TBBPCAlignmentMonTool.h
index 7ef0d541bad44569352c1ae03e084dcaab14c878..82fc16b904b29c076ffd482be77509baecd1b1f3 100755
--- a/TestBeam/TBMonitoring/TBMonitoring/TBBPCAlignmentMonTool.h
+++ b/TestBeam/TBMonitoring/TBMonitoring/TBBPCAlignmentMonTool.h
@@ -40,7 +40,8 @@ class TBBPCAlignmentMonTool: public MonitorToolBase
StatusCode getnewcalib();
// private members
- std::string m_path, m_SGkeybpc, m_SGkeytrack;
+ //std::string m_path;
+ std::string m_SGkeybpc, m_SGkeytrack;
std::vector<std::string> m_bpc_names;
std::vector<float> xmean;
std::vector<float> xrms;
diff --git a/TestBeam/TBMonitoring/TBMonitoring/TBBPCMonTool.h b/TestBeam/TBMonitoring/TBMonitoring/TBBPCMonTool.h
index 3b22184d897c3602b1c7e4a9658b8cd897e9b2c6..7583a0bdaa6c2d538ed134c4d2898ce7be0ebb90 100755
--- a/TestBeam/TBMonitoring/TBMonitoring/TBBPCMonTool.h
+++ b/TestBeam/TBMonitoring/TBMonitoring/TBBPCMonTool.h
@@ -50,7 +50,8 @@ class TBBPCMonTool: public MonitorToolBase
//StatusCode execute();
private:
- std::string m_path,m_SGkeybpc,m_SGkeybpcraw;
+ //std::string m_path;
+ std::string m_SGkeybpc,m_SGkeybpcraw;
std::vector<std::string> m_bpc_names;
std::vector<short> m_bpc_map;
diff --git a/TestBeam/TBMonitoring/TBMonitoring/TBCaloResponseMonTool.h b/TestBeam/TBMonitoring/TBMonitoring/TBCaloResponseMonTool.h
index 4e8d76d4b22c3c5fc8a64b0c76d5b417a49d5bf4..7e52956fa7ac10b2c25d4292d7be4de19cd10589 100755
--- a/TestBeam/TBMonitoring/TBMonitoring/TBCaloResponseMonTool.h
+++ b/TestBeam/TBMonitoring/TBMonitoring/TBCaloResponseMonTool.h
@@ -95,8 +95,6 @@ class TBCaloResponseMonTool: public MonitorToolBase
protected:
- StoreGateSvc* m_storeGate;
-
/*! \brief properties */
// in base class !!! std::string m_path;
std::string m_bpcContainerName;
diff --git a/TestBeam/TBMonitoring/TBMonitoring/TBMWPCMonTool.h b/TestBeam/TBMonitoring/TBMonitoring/TBMWPCMonTool.h
index 3a2c564b233ef4446ef3ec09d969d30674fac0f1..9576176cfb3da1a7cb6a421ae439fecc33518a70 100755
--- a/TestBeam/TBMonitoring/TBMonitoring/TBMWPCMonTool.h
+++ b/TestBeam/TBMonitoring/TBMonitoring/TBMWPCMonTool.h
@@ -48,7 +48,7 @@ class TBMWPCMonTool: public MonitorToolBase
void FillRandomDetect();
private:
- std::string m_path;
+ //std::string m_path;
//Declared properties
bool m_monitor_mwpcraw;
diff --git a/TestBeam/TBMonitoring/TBMonitoring/TBPhaseMonTool.h b/TestBeam/TBMonitoring/TBMonitoring/TBPhaseMonTool.h
index 315929acd4ab60607f42d5d8a1983a67f2fd75de..f788280b9cdcb737319ee837e40b88ef885de9be 100755
--- a/TestBeam/TBMonitoring/TBMonitoring/TBPhaseMonTool.h
+++ b/TestBeam/TBMonitoring/TBMonitoring/TBPhaseMonTool.h
@@ -22,6 +22,7 @@
#include "CaloIdentifier/CaloCell_ID.h"
#include "Identifier/HWIdentifier.h"
+#include "GaudiKernel/ServiceHandle.h"
#include "AIDA/IHistogram1D.h"
#include "AIDA/IHistogram2D.h"
@@ -57,10 +58,7 @@ class TBPhaseMonTool: public MonitorToolBase
protected:
- StoreGateSvc* m_eventStore;
- StoreGateSvc* m_detectorStore;
- IToolSvc* m_toolSvc;
- LArCablingService* m_cablingService;
+ ServiceHandle<LArCablingService> m_cablingService;
const LArOnlineID* m_onlineHelper;
/*! \brief properties */
diff --git a/TestBeam/TBMonitoring/TBMonitoring/TBScintillatorMonTool.h b/TestBeam/TBMonitoring/TBMonitoring/TBScintillatorMonTool.h
index 2fd17f88f4d069a22caeda155b417e29464130da..46fb3fa26745a8e0e885df919388f7c685fd73b7 100755
--- a/TestBeam/TBMonitoring/TBMonitoring/TBScintillatorMonTool.h
+++ b/TestBeam/TBMonitoring/TBMonitoring/TBScintillatorMonTool.h
@@ -50,7 +50,8 @@ class TBScintillatorMonTool: public MonitorToolBase
//StatusCode execute();
private:
- std::string m_path,m_SGkeyscint;
+ //std::string m_path;
+ std::string m_SGkeyscint;
std::vector<std::string> m_scint_names;
std::vector<short> m_scint_map;
std::string m_histoPath;
diff --git a/TestBeam/TBMonitoring/TBMonitoring/TBTDCRawMonTool.h b/TestBeam/TBMonitoring/TBMonitoring/TBTDCRawMonTool.h
index 9bc01fbfa39c16c9a98dfda51ce6cd0123aecaf3..c3acd8a92ce016de3f1ebb5fbf16f225bcffaa4f 100755
--- a/TestBeam/TBMonitoring/TBMonitoring/TBTDCRawMonTool.h
+++ b/TestBeam/TBMonitoring/TBMonitoring/TBTDCRawMonTool.h
@@ -45,7 +45,7 @@ class TBTDCRawMonTool: public MonitorToolBase
void FillRandomDetect();
private:
- std::string m_path;
+ //std::string m_path;
//Declared properties
bool m_monitor_tdc;
diff --git a/TestBeam/TBMonitoring/TBMonitoring/TBTailCatcherRawMonTool.h b/TestBeam/TBMonitoring/TBMonitoring/TBTailCatcherRawMonTool.h
index 2b968386e40b195d733596014cd0e472764d3c6b..4520e71648e95fc6bb26a54596c8d31f02dc384e 100755
--- a/TestBeam/TBMonitoring/TBMonitoring/TBTailCatcherRawMonTool.h
+++ b/TestBeam/TBMonitoring/TBMonitoring/TBTailCatcherRawMonTool.h
@@ -45,7 +45,7 @@ class TBTailCatcherRawMonTool: public MonitorToolBase
void FillRandomDetect();
private:
- std::string m_path;
+ //std::string m_path;
//Declared properties
bool m_monitor_tailcatcher_raw;
diff --git a/TestBeam/TBMonitoring/TBMonitoring/TBTrackingMonTool.h b/TestBeam/TBMonitoring/TBMonitoring/TBTrackingMonTool.h
index 132960f15271a94450f328e507ee8e5e3179af3e..d95703a59dd2615a7476a7cf61e33d704deafe60 100755
--- a/TestBeam/TBMonitoring/TBMonitoring/TBTrackingMonTool.h
+++ b/TestBeam/TBMonitoring/TBMonitoring/TBTrackingMonTool.h
@@ -42,7 +42,7 @@ class TBTrackingMonTool: public MonitorToolBase
void FillRandomDetect();
private:
- std::string m_path;
+ //std::string m_path;
//Declared properties
bool m_monitor_track;
diff --git a/TestBeam/TBMonitoring/TBMonitoring/TBTriggerPatternUnitMonTool.h b/TestBeam/TBMonitoring/TBMonitoring/TBTriggerPatternUnitMonTool.h
index 5f68cd4753d9bd660a2a4935be7292d1838d7265..b6efcb5a3f0c9cc880aee4d766f6d7b93478f768 100755
--- a/TestBeam/TBMonitoring/TBMonitoring/TBTriggerPatternUnitMonTool.h
+++ b/TestBeam/TBMonitoring/TBMonitoring/TBTriggerPatternUnitMonTool.h
@@ -46,7 +46,8 @@ class TBTriggerPatternUnitMonTool: public MonitorToolBase
//StatusCode execute();
private:
- std::string m_path,m_SGkey;
+ //std::string m_path;
+ std::string m_SGkey;
bool m_monitor_triggpat;
diff --git a/TestBeam/TBMonitoring/cmt/requirements b/TestBeam/TBMonitoring/cmt/requirements
index 624423db44d4c5d15e723df8c66ac75230b4cf60..aeeaeb959968bb4b4fa2b7a10decbac6cb1f3fc6 100755
--- a/TestBeam/TBMonitoring/cmt/requirements
+++ b/TestBeam/TBMonitoring/cmt/requirements
@@ -13,11 +13,12 @@ use TBUtils TBUtils-* TestBeam
use CaloGeoHelpers CaloGeoHelpers-* Calorimeter
private
use AtlasCLHEP AtlasCLHEP-* External
+use AthenaKernel AthenaKernel-* Control
use CaloEvent CaloEvent-* Calorimeter
use CaloUtils CaloUtils-* Calorimeter
use EventInfo EventInfo-* Event
use LArIdentifier LArIdentifier-* LArCalorimeter
-use LArTools LArTools-* LArCalorimeter
+use LArCabling LArCabling-* LArCalorimeter
end_private
apply_pattern declare_joboptions files="*.txt *.py"
diff --git a/TestBeam/TBMonitoring/src/TBADCRawMonTool.cxx b/TestBeam/TBMonitoring/src/TBADCRawMonTool.cxx
index b99247f0b9c9a8942bf74ce52dcb9789aeb5ee7b..26fe1b4ef8d8fe5406e8a58d81e3dfdeb2040f3e 100755
--- a/TestBeam/TBMonitoring/src/TBADCRawMonTool.cxx
+++ b/TestBeam/TBMonitoring/src/TBADCRawMonTool.cxx
@@ -19,11 +19,15 @@
TBADCRawMonTool::TBADCRawMonTool(const std::string & type,
const std::string & name,
const IInterface* parent)
- : MonitorToolBase(type, name, parent)
+ : MonitorToolBase(type, name, parent),
+ m_isBooked(false),
+ m_histo_adc(nullptr),
+ m_adcNum(0)
/*---------------------------------------------------------*/
{
declareInterface<IMonitorToolBase>(this);
- declareProperty("histoPathBase",m_path = "/stat");
+ //declareProperty("histoPathBase",m_path = "/stat");
+ m_path = "/stat";
//ADC histogram properties
declareProperty("ADCNames",m_adcNames);
diff --git a/TestBeam/TBMonitoring/src/TBBPCAlignmentMonTool.cxx b/TestBeam/TBMonitoring/src/TBBPCAlignmentMonTool.cxx
index 1f727c4499070e372bb1331ea65aded6418e2b60..a1cc3c1e0aa5990f1d9580e017602d3be97e8121 100755
--- a/TestBeam/TBMonitoring/src/TBBPCAlignmentMonTool.cxx
+++ b/TestBeam/TBMonitoring/src/TBBPCAlignmentMonTool.cxx
@@ -29,10 +29,24 @@
TBBPCAlignmentMonTool::TBBPCAlignmentMonTool(const std::string & type,
const std::string & name,
const IInterface* parent)
- : MonitorToolBase(type, name, parent)
+ : MonitorToolBase(type, name, parent),
+ m_runnumber(0),
+ m_bpcnum(0),
+ m_isBooked(false),
+ m_chi2x(0),
+ m_chi2y(0),
+ m_Qx(0),
+ m_Qy(0),
+ m_histo_bpcX_res(nullptr),
+ m_histo_bpcY_res(nullptr),
+ m_histo_chi2x(nullptr),
+ m_histo_chi2y(nullptr),
+ m_histo_Qx(nullptr),
+ m_histo_Qy(nullptr)
{
declareInterface<IMonitorToolBase>(this);
- declareProperty("histoPathBase",m_path = "/stat/BeamDetectors/BPC/Alignment/");
+ //declareProperty("histoPathBase",m_path = "/stat/BeamDetectors/BPC/Alignment/");
+ m_path = "/stat/BeamDetectors/BPC/Alignment/";
declareProperty("MonitorBPCCalib",m_monitor_bpccalib=true);
declareProperty("SGTrackkey", m_SGkeytrack = "BPCTrack");
declareProperty("SGBPCkey", m_SGkeybpc = "BPCCont");
@@ -127,7 +141,6 @@ StatusCode TBBPCAlignmentMonTool::fillHists()
// get run number
unsigned int thisrun=0;
- EventID *thisEvent; //EventID is a part of EventInfo
const EventInfo* thisEventInfo;
StatusCode sc1 = evtStore()->retrieve(thisEventInfo);
if (sc1!=StatusCode::SUCCESS){
@@ -137,8 +150,7 @@ StatusCode TBBPCAlignmentMonTool::fillHists()
}
else
{
- thisEvent=thisEventInfo->event_ID();
- thisrun = thisEvent->run_number();
+ thisrun = thisEventInfo->event_ID()->run_number();
}
diff --git a/TestBeam/TBMonitoring/src/TBBPCMonTool.cxx b/TestBeam/TBMonitoring/src/TBBPCMonTool.cxx
index 28dfff56c0e1a5ebfc7193df589a031e60db9e93..71387897f1c69bc2684ab0bf07cd5f65ac90f3e3 100755
--- a/TestBeam/TBMonitoring/src/TBBPCMonTool.cxx
+++ b/TestBeam/TBMonitoring/src/TBBPCMonTool.cxx
@@ -29,11 +29,14 @@
TBBPCMonTool::TBBPCMonTool(const std::string & type,
const std::string & name,
const IInterface* parent)
- : MonitorToolBase(type, name, parent)
+ : MonitorToolBase(type, name, parent),
+ m_isBooked(false),
+ m_bpcnum(0)
/*---------------------------------------------------------*/
{
declareInterface<IMonitorToolBase>(this);
- declareProperty("histoPathBase",m_path = "/stat");
+ //declareProperty("histoPathBase",m_path = "/stat");
+ m_path = "/stat";
declareProperty("histoPath",m_histoPath = "/BeamDetectors/BPC/");
declareProperty("SGBPCkey",m_SGkeybpc = "BPCCont");
@@ -204,14 +207,12 @@ StatusCode TBBPCMonTool::mybookHists()
//Get Run number
std::stringstream rn_stream;
- EventID *thisEvent; //EventID is a part of EventInfo
const EventInfo* thisEventInfo;
StatusCode sc=evtStore()->retrieve(thisEventInfo);
if (sc!=StatusCode::SUCCESS)
ATH_MSG_WARNING ( "No EventInfo object found! Can't read run number!" );
- else
- {thisEvent=thisEventInfo->event_ID();
- rn_stream << "Run " << thisEvent->run_number() << " ";
+ else {
+ rn_stream << "Run " << thisEventInfo->event_ID()->run_number() << " ";
}
const std::string runnumber=rn_stream.str();
diff --git a/TestBeam/TBMonitoring/src/TBBeamQualityDoubleHitsMonTool.cxx b/TestBeam/TBMonitoring/src/TBBeamQualityDoubleHitsMonTool.cxx
index 78af5f799baf642288e965e552edf655eb99bd80..a9894f709db063b469206e1687518e8dc1103843 100755
--- a/TestBeam/TBMonitoring/src/TBBeamQualityDoubleHitsMonTool.cxx
+++ b/TestBeam/TBMonitoring/src/TBBeamQualityDoubleHitsMonTool.cxx
@@ -27,12 +27,15 @@
TBBeamQualityDoubleHitsMonTool::TBBeamQualityDoubleHitsMonTool(const std::string& type,
const std::string& name,
const IInterface* parent)
- : MonitorToolBase(type, name, parent)
+ : MonitorToolBase(type, name, parent),
+ m_scintnum(0),
+ m_isBooked(false)
{
declareInterface<IMonitorToolBase>(this);
// before/after BQ cuts
declareProperty("FillTime",m_time="after");
- declareProperty("histoPathBase",m_path = "/stat");
+ //declareProperty("histoPathBase",m_path = "/stat");
+ m_path = "/stat";
declareProperty("histoPath",m_histoPath="/BeamQuality/DoubleHits/");
declareProperty("ScintMax",m_scintadcmax=1024);
declareProperty("ScintMin",m_scintadcmin=0);
diff --git a/TestBeam/TBMonitoring/src/TBCaloResponseMonTool.cxx b/TestBeam/TBMonitoring/src/TBCaloResponseMonTool.cxx
index 9ce29b292d927153c265e5931026e46a62e6dc26..f9ad09ab611e3ff53ab5ec58980a2704bcc8cb35 100755
--- a/TestBeam/TBMonitoring/src/TBCaloResponseMonTool.cxx
+++ b/TestBeam/TBMonitoring/src/TBCaloResponseMonTool.cxx
@@ -56,8 +56,10 @@ TBCaloResponseMonTool::TBCaloResponseMonTool(const std::string& type,
, m_phiBins(64), m_phiLow(-180.*CLHEP::deg), m_phiHigh(180.*CLHEP::deg)
, m_eUnit(CLHEP::GeV), m_lUnit(CLHEP::mm), m_aUnit(CLHEP::rad)
, m_minEventsInBin(10)
+ , m_caloCellHelper(nullptr)
, m_pi(2.*asin(1.))
, m_twoPi(4.*asin(1.))
+ , m_totalE(nullptr)
{
declareInterface<IMonitorToolBase>(this);
// default lists
@@ -108,16 +110,6 @@ StatusCode TBCaloResponseMonTool::initialize()
// messaging
MsgStream report(msgSvc(),name());
- // allocate StoreGate
- StatusCode checkOut = service("StoreGateSvc",m_storeGate);
- if ( checkOut.isFailure() )
- {
- report << MSG::ERROR
- << "cannot allocate StoreGate service"
- << endreq;
- return checkOut;
- }
-
// unit synchs
m_eLow /= m_eUnit; m_eHigh /= m_eUnit;
m_xLow /= m_lUnit; m_xHigh /= m_lUnit;
@@ -147,29 +139,12 @@ StatusCode TBCaloResponseMonTool::fillHists()
/////////////////
// CaloCells
- const CaloCellContainer* cellContainer;
- StatusCode checkOut = m_storeGate->retrieve(cellContainer,m_caloCellName);
- if ( checkOut.isFailure() )
- {
- report << MSG::ERROR
- << "cannot allocate CaloCellContainer with key <"
- << m_caloCellName
- << ">"
- << endreq;
- return checkOut;
- }
+ const CaloCellContainer* cellContainer = nullptr;
+ ATH_CHECK( evtStore()->retrieve(cellContainer,m_caloCellName) );
// BPC data
- const TBBPCCont* bpcContainer;
- checkOut = m_storeGate->retrieve(bpcContainer,m_bpcContainerName);
- if ( checkOut.isFailure() )
- {
- report << MSG::ERROR
- << "cannot allocate TBBPContainer with key <"
- << ">"
- << endreq;
- return StatusCode::FAILURE;
- }
+ const TBBPCCont* bpcContainer = nullptr;
+ ATH_CHECK( evtStore()->retrieve(bpcContainer,m_bpcContainerName) );
////////////////////////
// First Event Action //
@@ -187,14 +162,14 @@ StatusCode TBCaloResponseMonTool::fillHists()
<< "BPC <"
<< (*firstBPC)->getDetectorName()
<< "> found in event"
- << endreq;
+ << endmsg;
}
// perform setup action
if ( (this->setupAction()).isFailure() )
{
report << MSG::ERROR
<< "problems performing setup action"
- << endreq;
+ << endmsg;
return StatusCode::FAILURE;
}
}
@@ -220,7 +195,7 @@ StatusCode TBCaloResponseMonTool::fillHists()
<< bpcContainer->size()
<< " does not fit internal collection size "
<< bpcPos.size()
- << endreq;
+ << endmsg;
}
////////////////////////////////
@@ -340,7 +315,7 @@ StatusCode TBCaloResponseMonTool::setupAction()
{
report << MSG::ERROR
<< "cannot allocate CaloCell Id manager object"
- << endreq;
+ << endmsg;
return StatusCode::FAILURE;
}
@@ -351,7 +326,7 @@ StatusCode TBCaloResponseMonTool::setupAction()
{
report << MSG::ERROR
<< "cannot allocate CaloCell_ID helper"
- << endreq;
+ << endmsg;
return StatusCode::FAILURE;
}
@@ -385,7 +360,7 @@ StatusCode TBCaloResponseMonTool::setupAction()
report << MSG::INFO << "\042TILE\042 ";
}
}
- report << MSG::INFO << endreq;
+ report << MSG::INFO << endmsg;
// get calorimeter samplings
std::vector<std::string>::const_iterator firstSampling =
@@ -405,7 +380,7 @@ StatusCode TBCaloResponseMonTool::setupAction()
<< "\042 ";
}
}
- report << MSG::INFO << endreq;
+ report << MSG::INFO << endmsg;
// book "static" histograms
this->SetBookStatus( this->bookMyHists() == StatusCode::SUCCESS );
@@ -413,7 +388,7 @@ StatusCode TBCaloResponseMonTool::setupAction()
{
report << MSG::ERROR
<< "cannot book common histograms"
- << endreq;
+ << endmsg;
return StatusCode::FAILURE;
}
@@ -429,7 +404,7 @@ StatusCode TBCaloResponseMonTool::bookHists()
MsgStream report(msgSvc(),name());
report << MSG::INFO
<< "no event independent histograms to book"
- << endreq;
+ << endmsg;
return StatusCode::SUCCESS;
}
@@ -440,23 +415,23 @@ StatusCode TBCaloResponseMonTool::bookMyHists()
report << MSG::INFO
<< "Energy distributions min/max/#bins "
<< m_eLow << "/" << m_eHigh << "/" << m_eBins
- << endreq;
+ << endmsg;
report << MSG::INFO
<< "Beam width (x) distributions min/max/#bins "
<< m_xLow << "/" << m_xHigh << "/" << m_xBins
- << endreq;
+ << endmsg;
report << MSG::INFO
<< "Beam width (y) distributions min/max/#bins "
<< m_yLow << "/" << m_yHigh << "/" << m_yBins
- << endreq;
+ << endmsg;
report << MSG::INFO
<< "Eta distributions min/max/#bins "
<< m_etaLow << "/" << m_etaHigh << "/" << m_etaBins
- << endreq;
+ << endmsg;
report << MSG::INFO
<< "Phi distributions min/max/#bins "
<< m_phiLow << "/" << m_phiHigh << "/" << m_phiBins
- << endreq;
+ << endmsg;
// booking
std::string pName;
@@ -471,7 +446,7 @@ StatusCode TBCaloResponseMonTool::bookMyHists()
<< ">, title \042"
<< tName
<< "\042"
- << endreq;
+ << endmsg;
// cell energy
// tName = "CellE";
// pName = m_path + "/" + tName;
@@ -482,7 +457,7 @@ StatusCode TBCaloResponseMonTool::bookMyHists()
// << ">, title \042"
// << tName
// << "\042"
- // << endreq;
+ // << endmsg;
// cell energy in eta/phi
// tName = "CellEinEtaPhi";
@@ -527,7 +502,7 @@ StatusCode TBCaloResponseMonTool::bookMyHists()
<< ">, title \042"
<< tName << " Energy"
<< "\042"
- << endreq;
+ << endmsg;
m_caloE[*firstModule] = ToolHistoSvc()->book(pName,tName+" Energy",
m_eBins,m_eLow,m_eHigh);
}
@@ -549,7 +524,7 @@ StatusCode TBCaloResponseMonTool::bookMyHists()
<< ">, title \042"
<< tName
<< "\042"
- << endreq;
+ << endmsg;
m_layerE[*firstSampling] = ToolHistoSvc()->book(pName,tName,
m_eBins,m_eLow,m_eHigh);
// pName = m_path + "/" + lName + "_CellE";
@@ -560,7 +535,7 @@ StatusCode TBCaloResponseMonTool::bookMyHists()
// << ">, title \042"
// << tName
// << "\042"
- // << endreq;
+ // << endmsg;
// m_layerCellE[*firstSampling] = ToolHistoSvc()->book(pName,tName,
// m_eBins,
// m_eLow,m_eHigh);
@@ -572,7 +547,7 @@ StatusCode TBCaloResponseMonTool::bookMyHists()
// << ">, title \042"
// << tName
// << "\042"
- // << endreq;
+ // << endmsg;
// m_layerCellEinEtaVsPhi[*firstSampling] =
// ToolHistoSvc()->book(pName,tName,
// m_etaBins,m_etaLow,m_etaHigh,
@@ -599,7 +574,7 @@ StatusCode TBCaloResponseMonTool::bookMyHists()
<< ">, title \042"
<< tName
<< "\042"
- << endreq;
+ << endmsg;
m_totalEvsBPCx[m_bpcNames[i]] = ToolHistoSvc()->book(pName,tName,
m_xBins,
m_xLow,m_xHigh);
@@ -611,7 +586,7 @@ StatusCode TBCaloResponseMonTool::bookMyHists()
<< ">, title \042"
<< tName
<< "\042"
- << endreq;
+ << endmsg;
m_totalEvsBPCy[m_bpcNames[i]] = ToolHistoSvc()->book(pName,tName,
m_yBins,
m_yLow,m_yHigh);
@@ -623,7 +598,7 @@ StatusCode TBCaloResponseMonTool::bookMyHists()
<< ">, title \042"
<< tName
<< "\042"
- << endreq;
+ << endmsg;
m_totalEinBPCxVsBPCy[m_bpcNames[i]] =
ToolHistoSvc()->book(pName,tName,
m_xBins,m_xLow,m_xHigh,
@@ -644,7 +619,7 @@ StatusCode TBCaloResponseMonTool::bookMyHists()
<< ">, title \042"
<< tName
<< "\042"
- << endreq;
+ << endmsg;
(m_caloEvsBPCx[m_bpcNames[i]])[*firstM] =
ToolHistoSvc()->book(pName,tName,m_xBins,m_xLow,m_xHigh);
(m_caloEProfileX[m_bpcNames[i]])[*firstM] =
@@ -657,7 +632,7 @@ StatusCode TBCaloResponseMonTool::bookMyHists()
<< ">, title \042"
<< tName
<< "\042"
- << endreq;
+ << endmsg;
(m_caloEvsBPCy[m_bpcNames[i]])[*firstM] =
ToolHistoSvc()->book(pName,tName,m_yBins,m_yLow,m_yHigh);
(m_caloEProfileY[m_bpcNames[i]])[*firstM] =
@@ -670,7 +645,7 @@ StatusCode TBCaloResponseMonTool::bookMyHists()
<< ">, title \042"
<< tName
<< "\042"
- << endreq;
+ << endmsg;
(m_caloEinBPCxVsBPCy[m_bpcNames[i]])[*firstM] =
ToolHistoSvc()->book(pName,tName,
m_xBins,m_xLow,m_xHigh,
@@ -696,7 +671,7 @@ StatusCode TBCaloResponseMonTool::bookMyHists()
<< ">, title \042"
<< tName
<< "\042"
- << endreq;
+ << endmsg;
(m_layerEvsBPCx[m_bpcNames[i]])[*firstS] =
ToolHistoSvc()->book(pName,tName,m_xBins,m_xLow,m_xHigh);
(m_layerEProfileX[m_bpcNames[i]])[*firstS] =
@@ -709,7 +684,7 @@ StatusCode TBCaloResponseMonTool::bookMyHists()
<< ">, title \042"
<< tName
<< "\042"
- << endreq;
+ << endmsg;
(m_layerEvsBPCy[m_bpcNames[i]])[*firstS] =
ToolHistoSvc()->book(pName,tName,m_yBins,m_yLow,m_yHigh);
(m_layerEProfileY[m_bpcNames[i]])[*firstS] =
@@ -722,7 +697,7 @@ StatusCode TBCaloResponseMonTool::bookMyHists()
<< ">, title \042"
<< tName
<< "\042"
- << endreq;
+ << endmsg;
(m_layerEinBPCxVsBPCy[m_bpcNames[i]])[*firstS] =
ToolHistoSvc()->book(pName,tName,
m_xBins,m_xLow,m_xHigh,
@@ -846,7 +821,7 @@ bool TBCaloResponseMonTool::fillProfile1D(const TBProfiler<double>&
// << theEntries << " in bin ["
// << x << "," << x+dx << "[, data "
// << theData[i]
- // << endreq;
+ // << endmsg;
if ( theProfile.getBinEntries(i,theEntries) &&
theEntries >= m_minEventsInBin )
{
diff --git a/TestBeam/TBMonitoring/src/TBMWPCMonTool.cxx b/TestBeam/TBMonitoring/src/TBMWPCMonTool.cxx
index 11e69efb385f1293e0cfb463cd5947c5c0e168d9..18dfb64e9983de84019fae106b53ea7600a050e9 100755
--- a/TestBeam/TBMonitoring/src/TBMWPCMonTool.cxx
+++ b/TestBeam/TBMonitoring/src/TBMWPCMonTool.cxx
@@ -20,11 +20,20 @@
TBMWPCMonTool::TBMWPCMonTool(const std::string & type,
const std::string & name,
const IInterface* parent)
- : MonitorToolBase(type, name, parent)
+ : MonitorToolBase(type, name, parent),
+ m_isBooked(false),
+ m_histo_mwpcrawHitDist(),
+ m_histo_mwpcrawClustDist(),
+ m_histo_mwpcrawHits(nullptr),
+ m_histo_mwpcrawC(),
+ m_histo_mwpcrawN(),
+ m_histo_mwpcCenter(),
+ m_histo_mwpcSize()
/*---------------------------------------------------------*/
{
declareInterface<IMonitorToolBase>(this);
- declareProperty("histoPathBase",m_path = "/stat");
+ //declareProperty("histoPathBase",m_path = "/stat");
+ m_path = "/stat";
//ADC histogram properties
declareProperty("MWPCRangeRawCenter",m_range_rawcenter);
@@ -230,11 +239,11 @@ StatusCode TBMWPCMonTool::fillHists()
// Centers of clusters
for(unsigned int k=0;k<wirec.size();k++) {
m_histo_mwpcrawC[i]->fill(wirec[k]);
- // log<< MSG::INFO << " MWPC "<< i <<" wirecenter = "<< wirec[k] << endreq;continue;
+ // log<< MSG::INFO << " MWPC "<< i <<" wirecenter = "<< wirec[k] << endmsg;continue;
}
std::vector<int> wiren = mwpc->getNwires();
- // log<< MSG::DEBUG << mwpc->getDetectorName()<< " " << wiren[0] << endreq;continue;
+ // log<< MSG::DEBUG << mwpc->getDetectorName()<< " " << wiren[0] << endmsg;continue;
int nhit=0;
// Sizes of clusters & number of hits
for(unsigned int k=0;k<wiren.size();k++) {
diff --git a/TestBeam/TBMonitoring/src/TBPhaseMonTool.cxx b/TestBeam/TBMonitoring/src/TBPhaseMonTool.cxx
index c97b8d20181a0933274271536b01a6fb04a05173..9adc1fc21097720c594e5db88707ca02b5c39b9b 100755
--- a/TestBeam/TBMonitoring/src/TBPhaseMonTool.cxx
+++ b/TestBeam/TBMonitoring/src/TBPhaseMonTool.cxx
@@ -27,7 +27,7 @@
// #include "CaloUtils/CaloSamplingHelper.h"
#include "LArIdentifier/LArOnlineID.h"
-#include "LArTools/LArCablingService.h"
+#include "LArCabling/LArCablingService.h"
#include "TBEvent/TBTDCRaw.h"
#include "TBEvent/TBTDCRawCont.h"
@@ -41,6 +41,11 @@
#include "EventInfo/EventInfo.h"
#include "EventInfo/EventID.h"
+#include "AthenaKernel/Units.h"
+
+
+namespace Units = Athena::Units;
+
/////////////////////////////////
// Constructors and Destructor //
@@ -50,6 +55,8 @@ TBPhaseMonTool::TBPhaseMonTool(const std::string& type,
const std::string& name,
const IInterface* parent)
: MonitorToolBase(type,name,parent)
+ , m_cablingService("LArCablingService", "TBPhaseMonTool")
+ , m_onlineHelper(nullptr)
, m_tdcContainerName("TDCRawCont")
, m_caloCellName("AllCalo")
, m_TBPhaseName("TBPhase")
@@ -64,7 +71,13 @@ TBPhaseMonTool::TBPhaseMonTool(const std::string& type,
, m_phaseLow(-10.*CLHEP::ns), m_phaseHigh(35.*CLHEP::ns)
, m_tUnit(CLHEP::ns)
, m_dTtoWACBins(700)
- , m_dTtoWACLow(-350.), m_dTtoWACHigh(350.)
+ , m_dTtoWACLow(-350.), m_dTtoWACHigh(350.),
+ m_tdcDelta(nullptr),
+ m_tdcDeltaRight(nullptr),
+ m_tdcDeltaLeft(nullptr),
+ m_tdcCorrelation(nullptr),
+ m_phase(nullptr),
+ m_dTtoWAC(nullptr)
{
declareInterface<IMonitorToolBase>(this);
// default lists
@@ -106,49 +119,16 @@ TBPhaseMonTool::~TBPhaseMonTool()
StatusCode TBPhaseMonTool::initialize() {
// messaging
MsgStream report(msgSvc(),name());
- report << MSG::DEBUG << "TBPhaseMonTool::initialize()" << endreq;
- StatusCode sc;
-
- // allocate eventStore
- sc = service("StoreGateSvc", m_eventStore);
- if (sc.isFailure()) {
- report << MSG::ERROR << "cannot allocate StoreGateSvc" << endreq;
- return sc;
- }
+ report << MSG::DEBUG << "TBPhaseMonTool::initialize()" << endmsg;
- // allocate detectorStore
- sc = service("DetectorStore", m_detectorStore);
- if (sc.isFailure()) {
- report << MSG::ERROR << "cannot allocate DetectorStore" << endreq;
- return sc;
- }
-
- // allocate ToolSvc
- sc = service("ToolSvc", m_toolSvc);
- if (sc.isFailure()) {
- report << MSG::ERROR << "cannot allocate ToolSvc" << endreq;
- return sc;
- }
-
- // allocate LArCablingService
- sc = m_toolSvc->retrieveTool("LArCablingService", m_cablingService);
- if (sc.isFailure()){
- report << MSG::ERROR << "cannot allocate LArCablingService" << endreq;
- return sc;
- }
-
- // get LArOnlineID helper
- sc = m_detectorStore->retrieve(m_onlineHelper, "LArOnlineID");
- if (sc.isFailure()) {
- report << MSG::ERROR << "Could not get LArOnlineID" << endreq;
- return sc;
- }
+ ATH_CHECK( m_cablingService.retrieve() );
+ ATH_CHECK( detStore()->retrieve(m_onlineHelper, "LArOnlineID") );
//
if ((int)m_tdcNames.size() == 0) {
report << MSG::ERROR
<< "Empty list of TDC names"
- << endreq ;
+ << endmsg ;
return StatusCode::FAILURE;
}
@@ -156,7 +136,7 @@ StatusCode TBPhaseMonTool::initialize() {
if ((this->setupLookupTables()).isFailure()) {
report << MSG::ERROR
<< "problems performing setup of module and sampling lookup tables"
- << endreq;
+ << endmsg;
return StatusCode::FAILURE;
}
@@ -171,7 +151,7 @@ StatusCode TBPhaseMonTool::initialize() {
<< "\042 ";
}
}
- report << MSG::INFO << endreq;
+ report << MSG::INFO << endmsg;
// get an idCalo keyed map of vectors of idSample for the requested samplings
for (std::vector<CaloSampling::CaloSample>::iterator sample = m_samplingIndices.begin(); sample != m_samplingIndices.end(); sample++) {
@@ -200,7 +180,7 @@ StatusCode TBPhaseMonTool::initialize() {
<< m_samplingToNameLookup[*sample]
<< "\042";
}
- report << MSG::INFO << endreq;
+ report << MSG::INFO << endmsg;
}
// booking flag
@@ -220,47 +200,19 @@ StatusCode TBPhaseMonTool::fillHists() {
////////////////////
MsgStream report(msgSvc(),name());
- StatusCode sc;
/////////////////
// Data Access //
/////////////////
- // CaloCells
- const CaloCellContainer* cellContainer;
- sc = m_eventStore->retrieve(cellContainer, m_caloCellName);
- if (sc.isFailure()) {
- report << MSG::ERROR
- << "cannot allocate CaloCellContainer with key <"
- << m_caloCellName
- << ">"
- << endreq;
- return sc;
- }
+ const CaloCellContainer* cellContainer = nullptr;
+ ATH_CHECK( evtStore()->retrieve(cellContainer, m_caloCellName) );
- // TDC data
- const TBTDCRawCont* tdcContainer;
- sc = m_eventStore->retrieve(tdcContainer, m_tdcContainerName);
- if (sc.isFailure()) {
- report << MSG::ERROR
- << "cannot allocate TBTDCRawContainer with key <"
- << m_tdcContainerName
- << ">"
- << endreq;
- return sc;
- }
+ const TBTDCRawCont* tdcContainer = nullptr;
+ ATH_CHECK( evtStore()->retrieve(tdcContainer, m_tdcContainerName) );
- // TBPhase
- const TBPhase* theTBPhase;
- sc = m_eventStore->retrieve(theTBPhase, m_TBPhaseName);
- if (sc.isFailure()) {
- report << MSG::ERROR
- << "cannot allocate TBPhase with key <"
- << m_TBPhaseName
- << ">"
- << endreq;
- return sc;
- }
+ const TBPhase* theTBPhase = nullptr;
+ ATH_CHECK( evtStore()->retrieve(theTBPhase, m_TBPhaseName) );
////////////////////////
@@ -305,14 +257,14 @@ StatusCode TBPhaseMonTool::fillHists() {
os << std::hex << *it_febID;
report << MSG::INFO << " \042" << os.str() << "\042";
}
- report << MSG::INFO << endreq;
+ report << MSG::INFO << endmsg;
// book "static" histograms
this->SetBookStatus( this->bookMyHists() == StatusCode::SUCCESS );
if ( this->histsNotBooked() ) {
report << MSG::ERROR
<< "cannot book common histograms"
- << endreq;
+ << endmsg;
return StatusCode::FAILURE;
}
@@ -339,7 +291,7 @@ StatusCode TBPhaseMonTool::fillHists() {
<< "TDC name found \042"
<< tdcName
<< "\042"
- << endreq;
+ << endmsg;
tdcFound++;
if (tdcRaw->isUnderThreshold()) {
m_tdcHMap[tdcName]->fill(underValue, 1.);
@@ -388,7 +340,7 @@ StatusCode TBPhaseMonTool::fillHists() {
<< "Looping over CaloCells of calorimeter : \042"
<< m_caloToNameLookup[idCalo]
<< "\042"
- << endreq;
+ << endmsg;
std::vector<CaloSampling::CaloSample> samplingV = it->second;
// loop over the corresponding CaloCell's
@@ -415,7 +367,7 @@ StatusCode TBPhaseMonTool::fillHists() {
double energy = (*cell)->e();
double time = (*cell)->time();
- if (fabs(time/CLHEP::ns - float(int(time/CLHEP::ns/25.)*25.)) > 0.001 && energy > m_energyCut) {
+ if (fabs(time/Units::ns - float(int(time*(1./(Units::ns*25.)))*25.)) > 0.001 && energy > m_energyCut) {
sumEPerSampling[idSample] += energy;
sumETimePerSampling[idSample] += energy * time;
@@ -424,9 +376,9 @@ StatusCode TBPhaseMonTool::fillHists() {
sumETimePerFeb[febID] += energy * time;
report << MSG::DEBUG
- << "cell time = " << time/CLHEP::ns << " CLHEP::ns"
- << "; energy = " << energy/CLHEP::GeV << " CLHEP::GeV"
- << endreq;
+ << "cell time = " << time/Units::ns << " CLHEP::ns"
+ << "; energy = " << energy/Units::GeV << " CLHEP::GeV"
+ << endmsg;
}
}
}
@@ -441,10 +393,10 @@ StatusCode TBPhaseMonTool::fillHists() {
m_cubicTimeVsPhasePerSampling[idSample]->fill((theTBPhase->getPhase())/m_tUnit, peakTime/m_tUnit, 1.);
report << MSG::DEBUG
<< "\042" << m_samplingToNameLookup[idSample] << "\042"
- << ": peaktime = " << peakTime/CLHEP::ns << " CLHEP::ns"
- << ": sumETime = " << sumETimePerSampling[idSample]/CLHEP::GeV/CLHEP::ns << " CLHEP::GeV*CLHEP::ns"
- << ": sumE = " << sumEPerSampling[idSample]/CLHEP::GeV << " CLHEP::GeV"
- << endreq;
+ << ": peaktime = " << peakTime/Units::ns << " CLHEP::ns"
+ << ": sumETime = " << sumETimePerSampling[idSample]/Units::GeV/Units::ns << " CLHEP::GeV*CLHEP::ns"
+ << ": sumE = " << sumEPerSampling[idSample]/Units::GeV << " CLHEP::GeV"
+ << endmsg;
// loop over tdc
// fill energy weighted cubic peaking time for each requested sampling vs tdc
@@ -458,7 +410,7 @@ StatusCode TBPhaseMonTool::fillHists() {
<< "\042: TDC name found \042"
<< tdcName
<< "\042"
- << endreq;
+ << endmsg;
if (tdcRaw->isUnderThreshold()) {
m_cubicTimeVsTDCPerSampling[idSample][tdcName]->fill(underValue, peakTime/m_tUnit, 1.);
} else if (tdcRaw->isOverflow()) {
@@ -480,10 +432,10 @@ StatusCode TBPhaseMonTool::fillHists() {
m_cubicTimeVsPhasePerFeb[febID]->fill((theTBPhase->getPhase())/m_tUnit, peakTime/m_tUnit, 1.);
report << MSG::DEBUG
<< "\042FEB" << febID << "\042" // takes too much time to get the febIDName
- << ": peaktime = " << peakTime/CLHEP::ns << " CLHEP::ns"
- << ": sumETime = " << sumETimePerFeb[febID]/CLHEP::GeV/CLHEP::ns << " CLHEP::GeV*CLHEP::ns"
- << ": sumE = " << sumEPerFeb[febID]/CLHEP::GeV << " CLHEP::GeV"
- << endreq;
+ << ": peaktime = " << peakTime/Units::ns << " CLHEP::ns"
+ << ": sumETime = " << sumETimePerFeb[febID]/Units::GeV/Units::ns << " CLHEP::GeV*CLHEP::ns"
+ << ": sumE = " << sumEPerFeb[febID]/Units::GeV << " CLHEP::GeV"
+ << endmsg;
// loop over tdc
// fill energy weighted cubic peaking time for each requested FEB vs tdc
@@ -495,7 +447,7 @@ StatusCode TBPhaseMonTool::fillHists() {
report << MSG::DEBUG
<< "\042FEB" << febID << "\042" // takes too much time to get the febIDName
<< ": TDC name found \042" << tdcName << "\042"
- << endreq;
+ << endmsg;
if (tdcRaw->isUnderThreshold()) {
m_cubicTimeVsTDCPerFeb[febID][tdcName]->fill(underValue, peakTime/m_tUnit, 1.);
} else if (tdcRaw->isOverflow()) {
@@ -526,7 +478,7 @@ StatusCode TBPhaseMonTool::bookHists() {
MsgStream report(msgSvc(),name());
report << MSG::INFO
<< "no event independent histograms to book"
- << endreq;
+ << endmsg;
return StatusCode::SUCCESS;
}
@@ -536,14 +488,12 @@ StatusCode TBPhaseMonTool::bookMyHists() {
//Get Run number
std::stringstream rn_stream;
- EventID *thisEvent; //EventID is a part of EventInfo
const EventInfo* thisEventInfo;
- StatusCode sc=m_eventStore->retrieve(thisEventInfo);
+ StatusCode sc=evtStore()->retrieve(thisEventInfo);
if (sc!=StatusCode::SUCCESS)
- report << MSG::WARNING << "No EventInfo object found! Can't read run number!" << endreq;
+ report << MSG::WARNING << "No EventInfo object found! Can't read run number!" << endmsg;
else {
- thisEvent=thisEventInfo->event_ID();
- rn_stream << "Run " << thisEvent->run_number() << " ";
+ rn_stream << "Run " << thisEventInfo->event_ID()->run_number() << " ";
}
const std::string runnumber=rn_stream.str();
@@ -552,7 +502,7 @@ StatusCode TBPhaseMonTool::bookMyHists() {
report << MSG::INFO
<< "TDC distributions min/max/#bins "
<< m_tdcLow << "/" << m_tdcHigh << "/" << m_tdcBins
- << endreq;
+ << endmsg;
std::vector<std::string>::iterator it_tdcName = m_tdcNames.begin();
for (; it_tdcName != m_tdcNames.end(); it_tdcName++) {
@@ -564,7 +514,7 @@ StatusCode TBPhaseMonTool::bookMyHists() {
m_tdcHMap[tdcName] = H;
report << MSG::DEBUG
<< "Histogram <" << pathName << ">, title \042" << histoTitle << "\042"
- << endreq;
+ << endmsg;
}
// if more than one tdc requested, book histo relating the first two
@@ -572,46 +522,46 @@ StatusCode TBPhaseMonTool::bookMyHists() {
report << MSG::INFO
<< "Delta TDC distributions min/max/#bins "
<< m_tdcLow << "/" << m_tdcHigh << "/" << m_tdcBins
- << endreq;
+ << endmsg;
report << MSG::INFO
<< "Delta TDC distributions high values min/max/#bins "
<< m_tdcRightLow << "/" << m_tdcRightHigh << "/" << m_tdcBins
- << endreq;
+ << endmsg;
report << MSG::INFO
<< "Delta TDC distributions low values min/max/#bins "
<< m_tdcLeftLow << "/" << m_tdcLeftHigh << "/" << m_tdcBins
- << endreq;
+ << endmsg;
std::string histoTitle = "TDC1-TDC0";
std::string pathName = m_path + "/" + "DeltaTDC";
m_tdcDelta = ToolHistoSvc()->book(pathName, runnumber + histoTitle, m_tdcBins, m_tdcLeftLow, m_tdcRightHigh);
report << MSG::DEBUG
<< "Histogram <" << pathName << ">, title \042" << histoTitle << "\042"
- << endreq;
+ << endmsg;
histoTitle = "TDC1-TDC0 high values";
pathName = m_path + "/" + "DeltaTDCRight";
m_tdcDeltaRight = ToolHistoSvc()->book(pathName, runnumber + histoTitle, m_tdcBins, m_tdcRightLow, m_tdcRightHigh);
report << MSG::DEBUG
<< "Histogram <" << pathName << ">, title \042" << histoTitle << "\042"
- << endreq;
+ << endmsg;
histoTitle = "TDC1-TDC0 low values";
pathName = m_path + "/" + "DeltaTDCLeft";
m_tdcDeltaLeft = ToolHistoSvc()->book(pathName, runnumber +histoTitle, m_tdcBins, m_tdcLeftLow, m_tdcLeftHigh);
report << MSG::DEBUG
<< "Histogram <" << pathName << ">, title \042" << histoTitle << "\042"
- << endreq;
+ << endmsg;
histoTitle = "TDC1 vs TDC0";
pathName = m_path + "/" + "TDCCorrelation";
m_tdcCorrelation = ToolHistoSvc()->book(pathName, runnumber + histoTitle, m_tdcBins, m_tdcLow, m_tdcHigh, m_tdcBins, m_tdcLow, m_tdcHigh);
report << MSG::DEBUG
<< "Histogram <" << pathName << ">, title \042" << histoTitle << "\042"
- << endreq;
+ << endmsg;
}
// book histos for cubic energy weighted peaking time per sampling
report << MSG::INFO
<< "Peaking time distributions min/max/#bins "
- << m_timeLow/CLHEP::ns << "ns/" << m_timeHigh/CLHEP::ns << "ns/" << m_timeBins
- << endreq;
+ << m_timeLow/Units::ns << "ns/" << m_timeHigh/Units::ns << "ns/" << m_timeBins
+ << endmsg;
// book histos for cubic energy weighted peaking time per sampling
for (std::vector<std::string>::const_iterator sampling = m_samplingNames.begin(); sampling != m_samplingNames.end(); sampling++) {
@@ -623,21 +573,21 @@ StatusCode TBPhaseMonTool::bookMyHists() {
m_cubicTimePerSampling[idSample] = H1;
report << MSG::DEBUG
<< "Histogram <" << pathName << ">, title \042" << histoTitle << "\042"
- << endreq;
+ << endmsg;
histoTitle = samplingName + ": phase corrected " + m_recoName + " time";
pathName = m_path + "/" + samplingName + "_phasetime";
H1 = ToolHistoSvc()->book(pathName, runnumber + histoTitle, m_timeBins, m_timeLow/m_tUnit, m_timeHigh/m_tUnit);
m_cubicPhaseTimePerSampling[idSample] = H1;
report << MSG::DEBUG
<< "Histogram <" << pathName << ">, title \042" << histoTitle << "\042"
- << endreq;
+ << endmsg;
histoTitle = samplingName + ": " + m_recoName + " time vs phase";
pathName = m_path + "/" + samplingName + "_phase";
IHistogram2D* H2 = ToolHistoSvc()->book(pathName, runnumber + histoTitle, m_phaseBins, m_phaseLow/m_tUnit, m_phaseHigh/m_tUnit, m_timeBins, m_timeLow/m_tUnit, m_timeHigh/m_tUnit);
m_cubicTimeVsPhasePerSampling[idSample] = H2;
report << MSG::DEBUG
<< "Histogram <" << pathName << ">, title \042" << histoTitle << "\042"
- << endreq;
+ << endmsg;
// loop over tdc's
// book histos for cubic energy weighted peaking time per sampling vs tdc
@@ -650,7 +600,7 @@ StatusCode TBPhaseMonTool::bookMyHists() {
m_cubicTimeVsTDCPerSampling[idSample][tdcName] = H2;
report << MSG::DEBUG
<< "Histogram <" << pathName << ">, title \042" << histoTitle << "\042"
- << endreq;
+ << endmsg;
}
}
@@ -675,21 +625,21 @@ StatusCode TBPhaseMonTool::bookMyHists() {
m_cubicTimePerFeb[febID] = H1;
report << MSG::DEBUG
<< "Histogram <" << pathName << ">, title \042" << histoTitle << "\042"
- << endreq;
+ << endmsg;
histoTitle = febIDName + ": phase corrected " + m_recoName + " time";
pathName = m_path + "/" + febIDName + "_phasetime";
H1 = ToolHistoSvc()->book(pathName, runnumber + histoTitle, m_timeBins, m_timeLow/m_tUnit, m_timeHigh/m_tUnit);
m_cubicPhaseTimePerFeb[febID] = H1;
report << MSG::DEBUG
<< "Histogram <" << pathName << ">, title \042" << histoTitle << "\042"
- << endreq;
+ << endmsg;
histoTitle = febIDName + ": " + m_recoName + " time vs phase";
pathName = m_path + "/" + febIDName + "_phase";
IHistogram2D* H2 = ToolHistoSvc()->book(pathName, runnumber +histoTitle, m_phaseBins, m_phaseLow/m_tUnit, m_phaseHigh/m_tUnit, m_timeBins, m_timeLow/m_tUnit, m_timeHigh/m_tUnit);
m_cubicTimeVsPhasePerFeb[febID] = H2;
report << MSG::DEBUG
<< "Histogram <" << pathName << ">, title \042" << histoTitle << "\042"
- << endreq;
+ << endmsg;
// loop over tdc's
// book histos for cubic energy weighted peaking time per FEB vs tdc
@@ -702,7 +652,7 @@ StatusCode TBPhaseMonTool::bookMyHists() {
m_cubicTimeVsTDCPerFeb[febID][tdcName] = H2;
report << MSG::DEBUG
<< "Histogram <" << pathName << ">, title \042" << histoTitle << "\042"
- << endreq;
+ << endmsg;
}
}
@@ -712,7 +662,7 @@ StatusCode TBPhaseMonTool::bookMyHists() {
m_phase = ToolHistoSvc()->book(pathName, runnumber + histoTitle, m_phaseBins, m_phaseLow/m_tUnit, m_phaseHigh/m_tUnit);
report << MSG::DEBUG
<< "Histogram <" << pathName << ">, title \042" << histoTitle << "\042"
- << endreq;
+ << endmsg;
std::string histoTitledTtoWAC = "Absolute distance to WAC in TDC counts";
std::string pathNamedTtoWAC = m_path + "/dTtoWAC";
diff --git a/TestBeam/TBMonitoring/src/TBScintillatorMonTool.cxx b/TestBeam/TBMonitoring/src/TBScintillatorMonTool.cxx
index 5525ad9fcaf9a3102cafede6c07ddc7a735366df..705cdce48904a3240045532c1e4aba7c1707bab5 100755
--- a/TestBeam/TBMonitoring/src/TBScintillatorMonTool.cxx
+++ b/TestBeam/TBMonitoring/src/TBScintillatorMonTool.cxx
@@ -29,11 +29,15 @@
TBScintillatorMonTool::TBScintillatorMonTool(const std::string & type,
const std::string & name,
const IInterface* parent)
- : MonitorToolBase(type, name, parent)
+ : MonitorToolBase(type, name, parent),
+ m_fake_detector(false),
+ m_isBooked(false),
+ m_scintnum(0)
/*---------------------------------------------------------*/
{
declareInterface<IMonitorToolBase>(this);
- declareProperty("histoPathBase",m_path = "/stat"); //Already definde in base class
+ //declareProperty("histoPathBase",m_path = "/stat"); //Already definde in base class
+ m_path = "/stat";
declareProperty("histoPath",m_histoPath="/BeamDetectors/Scintillator/");
declareProperty("FakeDetectors",m_fake_detector=false);
@@ -127,14 +131,13 @@ StatusCode TBScintillatorMonTool::mybookHists()
//Get Run number
std::stringstream rn_stream;
- EventID *thisEvent; //EventID is a part of EventInfo
const EventInfo* thisEventInfo;
StatusCode sc=evtStore()->retrieve(thisEventInfo);
if (sc!=StatusCode::SUCCESS)
ATH_MSG_WARNING ( "No EventInfo object found! Can't read run number!" );
else
- {thisEvent=thisEventInfo->event_ID();
- rn_stream << "Run " << thisEvent->run_number() << " ";
+ {
+ rn_stream << "Run " << thisEventInfo->event_ID()->run_number() << " ";
}
const std::string runnumber=rn_stream.str();
@@ -256,7 +259,7 @@ StatusCode TBScintillatorMonTool::fillHists()
if ((*it_scint)->getDetectorName() != m_scint_names[m_scint_map[nameind]]) it_scint++;
else break;
}
- msg() << MSG::DEBUG << endreq;
+ msg() << MSG::DEBUG << endmsg;
}
if(it_scint==last_scint) {
// did not find the scint
diff --git a/TestBeam/TBMonitoring/src/TBTDCRawMonTool.cxx b/TestBeam/TBMonitoring/src/TBTDCRawMonTool.cxx
index b2c859e939169440f86cc9181cad180d9f87b350..e00e33c442c269de32066a1ef1eace1b8658fad4 100755
--- a/TestBeam/TBMonitoring/src/TBTDCRawMonTool.cxx
+++ b/TestBeam/TBMonitoring/src/TBTDCRawMonTool.cxx
@@ -19,11 +19,15 @@
TBTDCRawMonTool::TBTDCRawMonTool(const std::string & type,
const std::string & name,
const IInterface* parent)
- : MonitorToolBase(type, name, parent)
+ : MonitorToolBase(type, name, parent),
+ m_isBooked(false),
+ m_histo_tdc(nullptr),
+ m_tdcNum(0)
/*---------------------------------------------------------*/
{
declareInterface<IMonitorToolBase>(this);
- declareProperty("histoPathBase",m_path = "/stat");
+ //declareProperty("histoPathBase",m_path = "/stat");
+ m_path = "/stat";
//TDC histogram properties
declareProperty("TDCNames",m_tdcNames);
diff --git a/TestBeam/TBMonitoring/src/TBTailCatcherRawMonTool.cxx b/TestBeam/TBMonitoring/src/TBTailCatcherRawMonTool.cxx
index 1548e69511284de65b2ee31ad931073f8f7b1ea2..885090f3f0b10da5b34458e46527b39f72efc12e 100755
--- a/TestBeam/TBMonitoring/src/TBTailCatcherRawMonTool.cxx
+++ b/TestBeam/TBMonitoring/src/TBTailCatcherRawMonTool.cxx
@@ -21,11 +21,17 @@
TBTailCatcherRawMonTool::TBTailCatcherRawMonTool(const std::string & type,
const std::string & name,
const IInterface* parent)
- : MonitorToolBase(type, name, parent)
+ : MonitorToolBase(type, name, parent),
+ m_isBooked(false),
+ m_histo_tcScintADC(nullptr),
+ m_histo_tcreco(nullptr),
+ m_histo_tcTotal(nullptr),
+ m_tcScintNum(0)
/*---------------------------------------------------------*/
{
declareInterface<IMonitorToolBase>(this);
- declareProperty("histoPathBase",m_path = "/stat");
+ //declareProperty("histoPathBase",m_path = "/stat");
+ m_path = "/stat";
//TailCatcher histogram properties
declareProperty("TailCatcherMax",m_posMax=1024);
diff --git a/TestBeam/TBMonitoring/src/TBTrackingMonTool.cxx b/TestBeam/TBMonitoring/src/TBTrackingMonTool.cxx
index 3596cb2f2f84b600742f1a880fb819dfc857bcae..69d9df6ff032d7941c94d4e7ad5dd492dae08b06 100755
--- a/TestBeam/TBMonitoring/src/TBTrackingMonTool.cxx
+++ b/TestBeam/TBMonitoring/src/TBTrackingMonTool.cxx
@@ -18,11 +18,20 @@
TBTrackingMonTool::TBTrackingMonTool(const std::string & type,
const std::string & name,
const IInterface* parent)
- : MonitorToolBase(type, name, parent)
+ : MonitorToolBase(type, name, parent),
+ m_isBooked(false),
+ m_histo_track_chi2(nullptr),
+ m_histo_track_angle(nullptr),
+ m_histo_track_Uslope(nullptr),
+ m_histo_track_Vslope(nullptr),
+ m_histo_track_Ucryo(nullptr),
+ m_histo_track_Vcryo(nullptr),
+ m_histo_track_Wcryo(nullptr)
/*---------------------------------------------------------*/
{
declareInterface<IMonitorToolBase>(this);
- declareProperty("histoPathBase",m_path = "/stat");
+ //declareProperty("histoPathBase",m_path = "/stat");
+ m_path = "/stat";
declareProperty("MonitorTrack",m_monitor_track=true);
declareProperty("TestTrackingMonTool",m_testTool=false);
diff --git a/TestBeam/TBMonitoring/src/TBTriggerPatternUnitMonTool.cxx b/TestBeam/TBMonitoring/src/TBTriggerPatternUnitMonTool.cxx
index fb843736ed4dd3d68f653eb60edc820e5c32959a..8c8566072c7052ad9f03a04e34f5caa5884ee101 100755
--- a/TestBeam/TBMonitoring/src/TBTriggerPatternUnitMonTool.cxx
+++ b/TestBeam/TBMonitoring/src/TBTriggerPatternUnitMonTool.cxx
@@ -25,11 +25,15 @@
TBTriggerPatternUnitMonTool::TBTriggerPatternUnitMonTool(const std::string & type,
const std::string & name,
const IInterface* parent)
- : MonitorToolBase(type, name, parent)
+ : MonitorToolBase(type, name, parent),
+ m_isBooked(false),
+ m_histo_triggpat1(nullptr),
+ m_histo_triggpat2(nullptr)
/*---------------------------------------------------------*/
{
declareInterface<IMonitorToolBase>(this);
- declareProperty("histoPathBase",m_path = "/stat");
+ //declareProperty("histoPathBase",m_path = "/stat");
+ m_path = "/stat";
declareProperty("MonitorTriggPat",m_monitor_triggpat=true);