From 003d41cdc21246c0bc915b48d294616eebe07c2e Mon Sep 17 00:00:00 2001
From: Scott Snyder <scott.snyder@cern.ch>
Date: Mon, 12 Dec 2016 20:37:43 +0100
Subject: [PATCH] 'cmake fix: do not include components files in a
non-component library.' (MuGirlStau-00-02-39)
* Tagging MuGirlStau-00-02-39.
* cmake fix: do not include components files in a non-component
library.
2016-11-29 scott snyder <snyder@bnl.gov>
* Tagging MuGirlStau-00-02-38.
* Tool handle constness.
2016-07-29 scott snyder <snyder@bnl.gov>
* Tagging MuGirlStau-00-02-37.
* Namespace fixes.
* Tagging MuGirlStau-00-02-36.
* endreq -> endmsg.
---
.../MuGirlStau/CMakeLists.txt | 1 -
.../MuGirlStau/MuGirlStau/StauCalibration.h | 2 +-
.../MuGirlStau/MuGirlStau/StauTool.h | 14 ++++++++-
.../MuGirlStau/src/StauCalibration.cxx | 22 +++++++-------
.../MuGirlStau/src/StauCosmicFcn.cxx | 2 +-
.../MuGirlStau/src/StauFcn.cxx | 4 +--
.../MuGirlStau/src/StauGF.cxx | 16 +++++-----
.../MuGirlStau/src/StauMDT.cxx | 30 +++++++++----------
.../MuGirlStau/src/StauMDTT.cxx | 8 ++---
.../MuGirlStau/src/StauNTuple.cxx | 16 +++++-----
.../MuGirlStau/src/StauRPC.cxx | 18 +++++------
.../MuGirlStau/src/StauTileCal.cxx | 18 +++++------
12 files changed, 81 insertions(+), 70 deletions(-)
diff --git a/Reconstruction/MuonIdentification/MuGirlStau/CMakeLists.txt b/Reconstruction/MuonIdentification/MuGirlStau/CMakeLists.txt
index 1ab2af950ea..614cec165dc 100644
--- a/Reconstruction/MuonIdentification/MuGirlStau/CMakeLists.txt
+++ b/Reconstruction/MuonIdentification/MuGirlStau/CMakeLists.txt
@@ -49,7 +49,6 @@ find_package( ROOT COMPONENTS Physics Core Tree MathCore Hist RIO pthread Table
# Component(s) in the package:
atlas_add_library( MuGirlStauLib
src/*.cxx
- src/components/*.cxx
PUBLIC_HEADERS MuGirlStau
INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
diff --git a/Reconstruction/MuonIdentification/MuGirlStau/MuGirlStau/StauCalibration.h b/Reconstruction/MuonIdentification/MuGirlStau/MuGirlStau/StauCalibration.h
index c97e112d8a2..e1ee554975b 100755
--- a/Reconstruction/MuonIdentification/MuGirlStau/MuGirlStau/StauCalibration.h
+++ b/Reconstruction/MuonIdentification/MuGirlStau/MuGirlStau/StauCalibration.h
@@ -9,7 +9,7 @@
#include <map>
#include "TFile.h"
-using namespace std;
+//using namespace std;
namespace MuGirlNS
{
diff --git a/Reconstruction/MuonIdentification/MuGirlStau/MuGirlStau/StauTool.h b/Reconstruction/MuonIdentification/MuGirlStau/MuGirlStau/StauTool.h
index 1d9a0c533e2..741b5f388d9 100644
--- a/Reconstruction/MuonIdentification/MuGirlStau/MuGirlStau/StauTool.h
+++ b/Reconstruction/MuonIdentification/MuGirlStau/MuGirlStau/StauTool.h
@@ -30,7 +30,7 @@
#include <map>
#include <boost/regex.hpp>
#include "TFile.h"
-inline std::vector<std::string> split(const string& input, const string& delim)
+inline std::vector<std::string> split(const std::string& input, const std::string& delim)
{
// boost::regex re_delim(delim);
boost::sregex_token_iterator first(input.begin(), input.end(), boost::regex(delim), -1), last;
@@ -194,6 +194,10 @@ public:
{
return m_pMdtSegmentMakerInfoList;
}
+ ToolHandle<Muon::IMuonSegmentMaker>& mdtSegmentMaker()
+ {
+ return m_pMdtSegmentMaker;
+ }
const ToolHandle<Muon::IMuonSegmentMaker>& mdtSegmentMaker() const
{
return m_pMdtSegmentMaker;
@@ -202,10 +206,18 @@ public:
{
return m_pMdtDriftCircleCreator;
}
+ ToolHandle<IStauBetaTofTool>& tofTool()
+ {
+ return m_pTofTool;
+ }
const ToolHandle<IStauBetaTofTool>& tofTool() const
{
return m_pTofTool;
}
+ ToolHandle<MuGirlNS::IGlobalFitTool>& globalFitTool()
+ {
+ return m_pGlobalFitTool;
+ }
const ToolHandle<MuGirlNS::IGlobalFitTool>& globalFitTool() const
{
return m_pGlobalFitTool;
diff --git a/Reconstruction/MuonIdentification/MuGirlStau/src/StauCalibration.cxx b/Reconstruction/MuonIdentification/MuGirlStau/src/StauCalibration.cxx
index 173f121a0c2..c244a39e7db 100755
--- a/Reconstruction/MuonIdentification/MuGirlStau/src/StauCalibration.cxx
+++ b/Reconstruction/MuonIdentification/MuGirlStau/src/StauCalibration.cxx
@@ -17,18 +17,18 @@ void MuGirlNS::StauCalibration::initialize(
std::string &rpcCalibFileName,
std::string &caloCalibFileName)
{
- m_log << MSG::INFO << "StauCalibration::initialize() - entered" << endreq;
+ m_log << MSG::INFO << "StauCalibration::initialize() - entered" << endmsg;
loadMdtStauCalibration(mdtCalibFileName);
loadRpcStauCalibration(rpcCalibFileName);
loadTileStauCalibration(caloCalibFileName);
- m_log << MSG::INFO << "StauCalibration::initialize() - done" << endreq;
+ m_log << MSG::INFO << "StauCalibration::initialize() - done" << endmsg;
}
void MuGirlNS::StauCalibration::loadMdtStauCalibration(std::string &calibFileName)
{
std::string calibFile = PathResolver::find_file (calibFileName, "DATAPATH");
- m_log << MSG::INFO << "StauCalibration::loadMdtStauCalibration() - loading " << calibFileName << endreq;
+ m_log << MSG::INFO << "StauCalibration::loadMdtStauCalibration() - loading " << calibFileName << endmsg;
ifstream calibrationFile(calibFile); //, ios::in);
string line;
int num_records = 0;
@@ -39,14 +39,14 @@ void MuGirlNS::StauCalibration::loadMdtStauCalibration(std::string &calibFileNam
double mean = 0, sigma = 0;
const char* cline = line.c_str();
sscanf(cline, "%80x %80lf %80lf", &id, &mean, &sigma);
- m_log<<MSG::DEBUG<<"MDT "<<id<<" "<<mean<<" "<<sigma<<endreq;
+ m_log<<MSG::DEBUG<<"MDT "<<id<<" "<<mean<<" "<<sigma<<endmsg;
StauCalibrationParameters cp(mean, sigma);
m_calibrationMdt[id] = cp;
num_records++;
getline(calibrationFile, line);
}
calibrationFile.close();
- m_log << MSG::DEBUG << "StauCalibration::loadMdtStauCalibration() - loaded " << num_records << " records" << endreq;
+ m_log << MSG::DEBUG << "StauCalibration::loadMdtStauCalibration() - loaded " << num_records << " records" << endmsg;
}
// new RPC calibrations
@@ -54,7 +54,7 @@ void MuGirlNS::StauCalibration::loadRpcStauCalibration(std::string &calibFileNam
{
std::string calibFile = PathResolver::find_file (calibFileName, "DATAPATH");
- m_log << MSG::INFO << "StauCalibration::loadRpcStauCalibration() - loading " << calibFile << endreq;
+ m_log << MSG::INFO << "StauCalibration::loadRpcStauCalibration() - loading " << calibFile << endmsg;
ifstream calibrationFile(calibFile); //, ios::in);
string line;
int num_records = 0;
@@ -65,14 +65,14 @@ void MuGirlNS::StauCalibration::loadRpcStauCalibration(std::string &calibFileNam
double mean = 0, sigma = 0;
const char* cline = line.c_str();
sscanf(cline, "%80u %80lf %80lf", &compact_id, &mean, &sigma);
- m_log<<MSG::DEBUG<<"RPC "<<compact_id<<" "<<mean<<" "<<sigma<<endreq;
+ m_log<<MSG::DEBUG<<"RPC "<<compact_id<<" "<<mean<<" "<<sigma<<endmsg;
StauCalibrationParameters cp(mean, sigma);
m_calibrationRpc[compact_id] = cp;
num_records++;
getline(calibrationFile, line);
}
calibrationFile.close();
- m_log << MSG::DEBUG << "StauCalibration::loadRpcStauCalibration() - loaded " << num_records << " records" << endreq;
+ m_log << MSG::DEBUG << "StauCalibration::loadRpcStauCalibration() - loaded " << num_records << " records" << endmsg;
}
///////////////////////////////
@@ -80,7 +80,7 @@ void MuGirlNS::StauCalibration::loadTileStauCalibration(std::string &calibFileNa
{
std::string calibFile = PathResolver::find_file (calibFileName, "DATAPATH");
- m_log << MSG::INFO << "StauCalibration::loadTileStauCalibration() - loading " << calibFile << endreq;
+ m_log << MSG::INFO << "StauCalibration::loadTileStauCalibration() - loading " << calibFile << endmsg;
ifstream calibrationFile(calibFile); //, ios::in);
string line;
int num_records = 0;
@@ -91,14 +91,14 @@ void MuGirlNS::StauCalibration::loadTileStauCalibration(std::string &calibFileNa
double mean = 0, sigma = 0;
const char* cline = line.c_str();
sscanf(cline, "%80d %80df %80lf %80lf", &layer, &bin, &mean, &sigma);
- m_log<<MSG::DEBUG<<"CALO "<<layer<<" "<<bin<<" "<<mean<<" "<<sigma<<endreq;
+ m_log<<MSG::DEBUG<<"CALO "<<layer<<" "<<bin<<" "<<mean<<" "<<sigma<<endmsg;
StauCalibrationParameters cp(mean, sigma);
m_calibrationTile[std::make_pair(layer, bin)] = cp;
num_records++;
getline(calibrationFile, line);
}
calibrationFile.close();
- m_log << MSG::DEBUG << "StauCalibration::loadTileStauCalibration() - loaded " << num_records << " records" << endreq;
+ m_log << MSG::DEBUG << "StauCalibration::loadTileStauCalibration() - loaded " << num_records << " records" << endmsg;
}
MuGirlNS::StauCalibration::~StauCalibration()
diff --git a/Reconstruction/MuonIdentification/MuGirlStau/src/StauCosmicFcn.cxx b/Reconstruction/MuonIdentification/MuGirlStau/src/StauCosmicFcn.cxx
index 8cd82678ef3..032e2f26492 100644
--- a/Reconstruction/MuonIdentification/MuGirlStau/src/StauCosmicFcn.cxx
+++ b/Reconstruction/MuonIdentification/MuGirlStau/src/StauCosmicFcn.cxx
@@ -28,7 +28,7 @@ double MuGirlNS::StauCosmicFcn::function(double tTrack, StauTechnology eTech)
{
std::cout << "E123: " << __LINE__ << " " << __FILE__ << std::endl;
- LOG_VERBOSE << "technology " << technologyName(eTech) << endreq;
+ LOG_VERBOSE << "technology " << technologyName(eTech) << endmsg;
// dbgE
//allocate memory for the data of a new step
double beta = m_beta;
diff --git a/Reconstruction/MuonIdentification/MuGirlStau/src/StauFcn.cxx b/Reconstruction/MuonIdentification/MuGirlStau/src/StauFcn.cxx
index 09069255cbc..ec49eae0b18 100644
--- a/Reconstruction/MuonIdentification/MuGirlStau/src/StauFcn.cxx
+++ b/Reconstruction/MuonIdentification/MuGirlStau/src/StauFcn.cxx
@@ -27,7 +27,7 @@ MuGirlNS::StauFcn::~StauFcn()
double MuGirlNS::StauFcn::function(double currentBeta, StauTechnology eTech)
{
- LOG_VERBOSE << "technology " << technologyName(eTech) << endreq;
+ LOG_VERBOSE << "technology " << technologyName(eTech) << endmsg;
//allocate memory for the data of a new step
FcnStepData* pFcnStep = new FcnStepData();
@@ -52,7 +52,7 @@ double MuGirlNS::StauFcn::function(double currentBeta, StauTechnology eTech)
<< " doMdtt=" << doMdtt
<< " doRpc=" << doRpc
<< " doTile=" << doTile
- << endreq;
+ << endmsg;
double fcnStepChi2 = 0;
double fcnStepDoF = 0;
diff --git a/Reconstruction/MuonIdentification/MuGirlStau/src/StauGF.cxx b/Reconstruction/MuonIdentification/MuGirlStau/src/StauGF.cxx
index 74e5075f631..b9695e7a39d 100644
--- a/Reconstruction/MuonIdentification/MuGirlStau/src/StauGF.cxx
+++ b/Reconstruction/MuonIdentification/MuGirlStau/src/StauGF.cxx
@@ -40,20 +40,20 @@ void MuGirlNS::StauGF::printStepData(GlobalFitData* gfData)
{
if (gfData == NULL)
{
- LOG_VERBOSE << "gf data is NULL" << endreq;
+ LOG_VERBOSE << "gf data is NULL" << endmsg;
return;
}
LOG_VERBOSE << "gf data: beta=" << gfData->beta
<< " chi2=" << gfData->chi2
<< " dof="<< gfData->hitsOnTrk
- << endreq;
+ << endmsg;
}
void MuGirlNS::StauGF::processGlobalFitWithBeta(double currentBeta, GlobalFitData* gfData)
{
LOG_VERBOSE << "beta=" << currentBeta
<< " gfData=" << gfData
- << endreq;
+ << endmsg;
RIO_OnTrackLists* pTriggerHitsInSegments = new RIO_OnTrackLists();
std::vector<const Muon::MdtDriftCircleOnTrack*>* pMdtHits = new std::vector<
@@ -103,13 +103,13 @@ void MuGirlNS::StauGF::processGlobalFitWithBeta(double currentBeta, GlobalFitDat
// }
printStepData(gfData);
- LOG_VERBOSE << "done" << endreq;
+ LOG_VERBOSE << "done" << endmsg;
}
void MuGirlNS::StauGF::prepareForGlobalFit(RIO_OnTrackLists* pTriggerHitsInSegments,
std::vector<const Muon::MdtDriftCircleOnTrack*>* pMdtHits)
{
- LOG_VERBOSE << "entered" << endreq;
+ LOG_VERBOSE << "entered" << endmsg;
if (m_pStau->rpcHitsInSegments() != NULL)
std::copy(m_pStau->rpcHitsInSegments()->begin(), m_pStau->rpcHitsInSegments()->end(),
std::back_inserter(*pTriggerHitsInSegments));
@@ -130,7 +130,7 @@ void MuGirlNS::StauGF::prepareForGlobalFit(RIO_OnTrackLists* pTriggerHitsInSegme
}
}
}
- LOG_VERBOSE << "done" << endreq;
+ LOG_VERBOSE << "done" << endmsg;
}
void MuGirlNS::StauGF::prepareForGlobalFit(MuGirlNS::MuonSegmentList& muonSegments)
@@ -190,7 +190,7 @@ double MuGirlNS::StauGF::stauMomentum()
void MuGirlNS::StauGF::processGlobalFitWithTTrack(double /* tTrack */, GlobalFitData* gfData,
double /*beta*/)
{
- LOG_VERBOSE << "entered" << endreq;
+ LOG_VERBOSE << "entered" << endmsg;
RIO_OnTrackLists* pTriggerHitsInSegments = new RIO_OnTrackLists();
std::vector<const Muon::MdtDriftCircleOnTrack*>* pMdtHits = new std::vector<
const Muon::MdtDriftCircleOnTrack*>;
@@ -282,7 +282,7 @@ void MuGirlNS::StauGF::processGlobalFitWithTTrack(double /* tTrack */, GlobalFit
// }
printStepData(gfData);
- LOG_VERBOSE << "done" << endreq;
+ LOG_VERBOSE << "done" << endmsg;
}
void MuGirlNS::StauGF::setInitialTrackParameters(const Trk::Perigee* trk0)
diff --git a/Reconstruction/MuonIdentification/MuGirlStau/src/StauMDT.cxx b/Reconstruction/MuonIdentification/MuGirlStau/src/StauMDT.cxx
index ba5acd09d8c..7164898b377 100644
--- a/Reconstruction/MuonIdentification/MuGirlStau/src/StauMDT.cxx
+++ b/Reconstruction/MuonIdentification/MuGirlStau/src/StauMDT.cxx
@@ -105,7 +105,7 @@ void MuGirlNS::StauMDT::printStepData(MdtStepData* mdtData)
<< " chi2=" << mdtData->chi2
<< " dof=" << mdtData->dof
<< " numOfHits=" << mdtData->totNumHits
- << endreq;
+ << endmsg;
auto pStationDataList = mdtData->pStationDataList;
int i = 0;
if (pStationDataList != NULL)
@@ -118,14 +118,14 @@ void MuGirlNS::StauMDT::printStepData(MdtStepData* mdtData)
<< " dof="<< pMdtStepStation->dof
<< " #hits=" << pMdtStepStation->numHits
<< " #segs="<< pMdtStepStation->numSegs
- << endreq;
+ << endmsg;
}
}
}
void MuGirlNS::StauMDT::findNewSegments(double beta)
{
- LOG_VERBOSE << "beta=" << beta << endreq;
+ LOG_VERBOSE << "beta=" << beta << endmsg;
//clear new mdt segments
m_pStau->clearNewMdtSegments();
@@ -171,12 +171,12 @@ void MuGirlNS::StauMDT::findNewSegments(double beta)
if (m_pStau->doCalibration() && MUGIRLNS_STAUMDT_DO_CALIBRATION) m_segmentNumber++;
}
- LOG_VERBOSE << "done" << endreq;
+ LOG_VERBOSE << "done" << endmsg;
}
void MuGirlNS::StauMDT::processMdtWithBeta(double currentBeta, MdtStepData* mdtData)
{
- LOG_VERBOSE << "beta=" << currentBeta << endreq;
+ LOG_VERBOSE << "beta=" << currentBeta << endmsg;
//Set the correct beta in the ToF tool
m_pStau->tofTool()->setBeta(currentBeta);
@@ -224,7 +224,7 @@ void MuGirlNS::StauMDT::processMdtWithBeta(double currentBeta, MdtStepData* mdtD
// mdtData->dof = mdtData->totNumHits - 2*mdtData->pStationDataList->size();
printStepData(mdtData);
- LOG_VERBOSE << "done" << endreq;
+ LOG_VERBOSE << "done" << endmsg;
}
void MuGirlNS::StauMDT::fillStationData(MdtStepData* mdtData, MdtSegments* pSegments)
@@ -275,7 +275,7 @@ int MuGirlNS::StauMDT::recreateMdcots(MDCOTLists& mdts, MDCOTLists* pMdocotLists
const Trk::RIO_OnTrack* pRio = this->recreateRio(pMdcot);
if (pRio == NULL)
{
- LOG_VERBOSE << "createRIO_OnTrack failed" << endreq;
+ LOG_VERBOSE << "createRIO_OnTrack failed" << endmsg;
continue;
}
NewMdcotList.push_back(dynamic_cast<const Muon::MdtDriftCircleOnTrack*>(pRio));
@@ -315,11 +315,11 @@ void MuGirlNS::StauMDT::bestMdtSegment(MdtSegments* pSegments,
pBestSegment = NULL;
if (pSegments == NULL)
{
- LOG_VERBOSE << "got NULL segment list from MdtSegmentMaker" << endreq;
+ LOG_VERBOSE << "got NULL segment list from MdtSegmentMaker" << endmsg;
return;
}
- LOG_VERBOSE << "got " << pSegments->size() << " MDT segments" << endreq;
+ LOG_VERBOSE << "got " << pSegments->size() << " MDT segments" << endmsg;
double numHits = 0;
@@ -327,7 +327,7 @@ void MuGirlNS::StauMDT::bestMdtSegment(MdtSegments* pSegments,
{
LOG_VERBOSE << "numHits: " << pMuonSegment->numberOfContainedROTs()
<< " chi2: " << pMuonSegment->fitQuality()->chiSquared()
- << endreq;
+ << endmsg;
if (!ignoreNumHits && 4 >= pMuonSegment->numberOfContainedROTs()) continue;
if (pMuonSegment->numberOfContainedROTs() > numHits)
@@ -343,7 +343,7 @@ void MuGirlNS::StauMDT::bestMdtSegment(MdtSegments* pSegments,
<= pBestSegment->fitQuality()->chiSquared()) pBestSegment = pMuonSegment;
}
else
- m_log << MSG::WARNING << "There is no best Segment to compare with - doing nothing." << endreq;
+ m_log << MSG::WARNING << "There is no best Segment to compare with - doing nothing." << endmsg;
}
}
@@ -352,9 +352,9 @@ void MuGirlNS::StauMDT::bestMdtSegment(MdtSegments* pSegments,
<< " numHits " << pBestSegment->numberOfContainedROTs()
<< " chi2 " << pBestSegment->fitQuality()->chiSquared()
<< " dof " << pBestSegment->fitQuality()->numberDoF()
- << endreq;
+ << endmsg;
else
- LOG_VERBOSE << "bestMdtSegment found no best segment" << endreq;
+ LOG_VERBOSE << "bestMdtSegment found no best segment" << endmsg;
return;
}
@@ -366,7 +366,7 @@ void MuGirlNS::StauMDT::clear()
void MuGirlNS::StauMDT::processMdtWithTTrack(double tTrack, MdtStepData* mdtData, double beta)
{
- LOG_VERBOSE << "entered" << endreq;
+ LOG_VERBOSE << "entered" << endmsg;
//Set the tTrack in the ToF tool
m_pStau->tofTool()->setBeta(beta);
@@ -411,7 +411,7 @@ void MuGirlNS::StauMDT::processMdtWithTTrack(double tTrack, MdtStepData* mdtData
//mdtData->dof = mdtData->totNumHits - 2*mdtData->pStationDataList->size();
printStepData(mdtData);
- LOG_VERBOSE << "done" << endreq;
+ LOG_VERBOSE << "done" << endmsg;
}
//const Trk::RIO_OnTrack* MuGirlNS::StauMDT::processWithTTrackRT(const Muon::MdtDriftCircleOnTrack* pMdcot)
diff --git a/Reconstruction/MuonIdentification/MuGirlStau/src/StauMDTT.cxx b/Reconstruction/MuonIdentification/MuGirlStau/src/StauMDTT.cxx
index a8acc3364f5..363af5559f3 100644
--- a/Reconstruction/MuonIdentification/MuGirlStau/src/StauMDTT.cxx
+++ b/Reconstruction/MuonIdentification/MuGirlStau/src/StauMDTT.cxx
@@ -77,7 +77,7 @@ bool StauMDTT::initialize(const Trk::Track* pTrack)
LOG_VERBOSE << "after correct " << mdcot->globalPosition()
<< " time " << mdcot->driftTime()
- << endreq;
+ << endmsg;
//calibration
double t0Shift = 0;
double error = MDTTRESOLUTION;
@@ -161,13 +161,13 @@ void StauMDTT::printStepData(MdttStepData* mdttData)
<< " beta=" << mdttData->beta
<< " chi2=" << mdttData->chi2
<< " dof=" << mdttData->dof
- << endreq;
+ << endmsg;
}
void StauMDTT::processWithBeta(double currentBeta, MdttStepData* mdttData)
{
if (mdttData == NULL) return;
- LOG_VERBOSE << "beta=" << currentBeta << endreq;
+ LOG_VERBOSE << "beta=" << currentBeta << endmsg;
mdttData->chi2 = 0.0;
for (auto pMdtt : m_mdtts)
@@ -178,7 +178,7 @@ void StauMDTT::processWithBeta(double currentBeta, MdttStepData* mdttData)
}
mdttData->dof = m_mdtts.size();
- LOG_VERBOSE << "done chi2=" << mdttData->chi2 << " dof=" << mdttData->dof << endreq;
+ LOG_VERBOSE << "done chi2=" << mdttData->chi2 << " dof=" << mdttData->dof << endmsg;
}
void MuGirlNS::StauMDTT::averageBeta()
diff --git a/Reconstruction/MuonIdentification/MuGirlStau/src/StauNTuple.cxx b/Reconstruction/MuonIdentification/MuGirlStau/src/StauNTuple.cxx
index 8d2ec183359..2df06fb19f0 100644
--- a/Reconstruction/MuonIdentification/MuGirlStau/src/StauNTuple.cxx
+++ b/Reconstruction/MuonIdentification/MuGirlStau/src/StauNTuple.cxx
@@ -17,7 +17,7 @@ MuGirlNS::StauNTuple::StauNTuple(MsgStream& log) :
StatusCode MuGirlNS::StauNTuple::book(NTuple::Tuple* pNTuple)
{
- LOG_DEBUG << "entered" << endreq;
+ LOG_DEBUG << "entered" << endmsg;
if (pNTuple->addItem("MUGIRL/StauBeta", m_beta).isFailure()
|| pNTuple->addItem("MUGIRL/StauMass", m_mass).isFailure()
@@ -28,7 +28,7 @@ StatusCode MuGirlNS::StauNTuple::book(NTuple::Tuple* pNTuple)
|| pNTuple->addItem("MUGIRL/StauBetaAvgTileCal", m_betaAvgTileCal).isFailure()
|| pNTuple->addItem("MUGIRL/StauIsBarrel", m_fcnType).isFailure())
{
- m_log << MSG::WARNING << "Cannot addItem(MUGIRL/<stau summary>" << endreq;
+ m_log << MSG::WARNING << "Cannot addItem(MUGIRL/<stau summary>" << endmsg;
return StatusCode::RECOVERABLE;
}
@@ -86,17 +86,17 @@ StatusCode MuGirlNS::StauNTuple::book(NTuple::Tuple* pNTuple)
|| pNTuple->addItem("MUGIRL/StauRpcZ", m_rpcHits, m_rpcHitZ).isFailure()
|| pNTuple->addItem("MUGIRL/StauRpcHitsIsEta", m_rpcHits, m_rpcHitIsEta).isFailure())
{
- m_log << MSG::WARNING << "Cannot addItem(MUGIRL/<stau step data>" << endreq;
+ m_log << MSG::WARNING << "Cannot addItem(MUGIRL/<stau step data>" << endmsg;
return StatusCode::RECOVERABLE;
}
- LOG_DEBUG << "done" << endreq;
+ LOG_DEBUG << "done" << endmsg;
return StatusCode::SUCCESS;
}
StatusCode MuGirlNS::StauNTuple::fillStau(StauTool* pStau)
{
- LOG_DEBUG << "entered" << endreq;
+ LOG_DEBUG << "entered" << endmsg;
m_beta = (float) pStau->beta();
m_mass = (float) pStau->mass();
@@ -206,15 +206,15 @@ StatusCode MuGirlNS::StauNTuple::fillStau(StauTool* pStau)
if (m_maxStationNsteps - 5 < m_mdtStationNsteps || m_maxSteps - 5 < m_steps
|| m_maxRpcHits - 5 < m_rpcStationNsteps)
{
- LOG_INFO << "has too many steps, stop writing them" << endreq;
+ LOG_INFO << "has too many steps, stop writing them" << endmsg;
return StatusCode::SUCCESS;
}
}
}
else
- LOG_INFO << "got NULL list of fcn steps" << endreq;
- LOG_DEBUG << "done" << endreq;
+ LOG_INFO << "got NULL list of fcn steps" << endmsg;
+ LOG_DEBUG << "done" << endmsg;
return StatusCode::SUCCESS;
}
diff --git a/Reconstruction/MuonIdentification/MuGirlStau/src/StauRPC.cxx b/Reconstruction/MuonIdentification/MuGirlStau/src/StauRPC.cxx
index 3bb3e12f60f..9b44d65cf81 100644
--- a/Reconstruction/MuonIdentification/MuGirlStau/src/StauRPC.cxx
+++ b/Reconstruction/MuonIdentification/MuGirlStau/src/StauRPC.cxx
@@ -44,13 +44,13 @@ MuGirlNS::StauRPC::StauRPC(StauTool* pStauTool, MsgStream& log,
{
const Muon::RpcClusterOnTrack* pRpcRIO = dynamic_cast<const Muon::RpcClusterOnTrack*>(pRIO);
if( !pRpcRIO ) {
- LOG_DEBUG << "Cannot dynamic_cast ROT to const Muon::RpcClusterOnTrack* - continuing" << endreq;
+ LOG_DEBUG << "Cannot dynamic_cast ROT to const Muon::RpcClusterOnTrack* - continuing" << endmsg;
continue;
}
auto pPrepData = pRpcRIO->prepRawData();
auto pRpcPrepData = dynamic_cast<const Muon::RpcPrepData*>(pPrepData);
if (pRpcPrepData == NULL){
- LOG_DEBUG << "Cannot convert PrepRawData to RpcPrepData - continuing" << endreq;
+ LOG_DEBUG << "Cannot convert PrepRawData to RpcPrepData - continuing" << endmsg;
continue;
}
bool b_isEta = !pIdHelper->measuresPhi(pRpcRIO->identify());
@@ -66,7 +66,7 @@ MuGirlNS::StauRPC::StauRPC(StauTool* pStauTool, MsgStream& log,
<< ", pRpcPrepData->time(): " << pRpcPrepData->time()
<< ", timeShift: " << timeShift
<< " -> measuredTime: " << measuredTime
- << endreq;
+ << endmsg;
if (m_pStau->doCalibration())
{ //Use external calibration files
int id = pRpcRIO->identify().get_identifier32().get_compact();
@@ -191,7 +191,7 @@ void MuGirlNS::StauRPC::printStepData(RpcStepData* rpcData)
LOG_VERBOSE << "rpc data: beta=" << rpcData->beta
<< " chi2=" << rpcData->chi2
<< " dof=" << rpcData->totNumHits
- << endreq;
+ << endmsg;
auto pRpcStationDataList = rpcData->pStationDataList;
int j = 0;
@@ -204,14 +204,14 @@ void MuGirlNS::StauRPC::printStepData(RpcStepData* rpcData)
// << ": distance=" << rpcStepStation->distance
<< " chi2=" << rpcStepStation->chi2
<< " #hits=" << rpcStepStation->numHits
- << endreq;
+ << endmsg;
}
}
}
void MuGirlNS::StauRPC::processRpcWithBeta(double currentBeta, RpcStepData* pRpcStepData)
{
- LOG_VERBOSE << "beta=" << currentBeta << endreq;
+ LOG_VERBOSE << "beta=" << currentBeta << endmsg;
pRpcStepData->beta = currentBeta;
pRpcStepData->chi2 = 0.;
@@ -231,7 +231,7 @@ void MuGirlNS::StauRPC::processRpcWithBeta(double currentBeta, RpcStepData* pRpc
pRpcStepData->dof = pRpcStepData->totNumHits;
printStepData(pRpcStepData);
- LOG_VERBOSE << "done" << endreq;
+ LOG_VERBOSE << "done" << endmsg;
}
double MuGirlNS::StauRPC::rpcStationChi2(double currentBeta, StauRpcHitsList* pHitsList, int& dof,
@@ -362,7 +362,7 @@ unsigned int MuGirlNS::StauRPC::rpcMinIsAt()
void MuGirlNS::StauRPC::processRpcWithTTrack(double tTrack, RpcStepData* pRpcStepData, double beta)
{
- LOG_VERBOSE << "tTrack=" << tTrack << endreq;
+ LOG_VERBOSE << "tTrack=" << tTrack << endmsg;
//double currentBeta = 1.0;
pRpcStepData->beta = beta;
pRpcStepData->tTrack = tTrack;
@@ -383,7 +383,7 @@ void MuGirlNS::StauRPC::processRpcWithTTrack(double tTrack, RpcStepData* pRpcSte
pRpcStepData->dof = pRpcStepData->totNumHits;
printStepData(pRpcStepData);
- LOG_VERBOSE << "done" << endreq;
+ LOG_VERBOSE << "done" << endmsg;
}
MuGirlNS::StauRpcHitsLists* MuGirlNS::StauRPC::copyStauRpcHitsLists()
diff --git a/Reconstruction/MuonIdentification/MuGirlStau/src/StauTileCal.cxx b/Reconstruction/MuonIdentification/MuGirlStau/src/StauTileCal.cxx
index f2971df70be..a7b1b50927f 100644
--- a/Reconstruction/MuonIdentification/MuGirlStau/src/StauTileCal.cxx
+++ b/Reconstruction/MuonIdentification/MuGirlStau/src/StauTileCal.cxx
@@ -37,7 +37,7 @@ MuGirlNS::StauTileCal::StauTileCal(StauTool* pStauTool, MsgStream& log,
m_pCalibration(NULL),
m_randEngine (randEngine)
{
- LOG_DEBUG << "trkParticle=" << trkParticle << endreq;
+ LOG_DEBUG << "trkParticle=" << trkParticle << endmsg;
//std::vector<const CaloCell*> cellsOnTrack = m_pToCalo->getCellsOnTrack(m_pTrkParticle,tile1,tile3,true);
/*
std::vector<const CaloCell*> cellsOnTrack = m_pToCalo->getCellsOnTrack(m_pTrkParticle,em1,hec3,true);
@@ -63,13 +63,13 @@ MuGirlNS::StauTileCal::StauTileCal(StauTool* pStauTool, MsgStream& log,
LOG_DEBUG << "total cells: " << association->data().size()
<< ", intersected cells: " << intersected
<< ", passed energy cut " << energy_cut << ": " << passed_enery_cut
- << endreq;
+ << endmsg;
initCaloCells(association);
}
else
- LOG_DEBUG << "failed to get Calo cells" << endreq;
+ LOG_DEBUG << "failed to get Calo cells" << endmsg;
}
- LOG_DEBUG << "done" << endreq;
+ LOG_DEBUG << "done" << endmsg;
}
MuGirlNS::StauTileCal::StauTileCal(StauTool* pStauTool, MsgStream& log,
@@ -121,7 +121,7 @@ void MuGirlNS::StauTileCal::initCaloCells(const Rec::ParticleCellAssociation* as
auto dde = caloCell->caloDDE();
if (dde == NULL) // No cell location
{
- LOG_DEBUG << "could not find CaloDet Description Element for track cell " << hex << id << endreq;
+ LOG_DEBUG << "could not find CaloDet Description Element for track cell " << std::hex << id << endmsg;
continue;
}
int layer = LayerFromSampling(dde->getSampling());
@@ -132,7 +132,7 @@ void MuGirlNS::StauTileCal::initCaloCells(const Rec::ParticleCellAssociation* as
{
LOG_DEBUG << "(layer,bin)=(" << layer << "," << ebin << ") not in calibration map"
<< ", cell energy: " << caloCell->e()
- << endreq;
+ << endmsg;
continue;
}
error = (itCalib->second.error > 0) ? itCalib->second.error : TILECALRESOLUTION;
@@ -190,7 +190,7 @@ void MuGirlNS::StauTileCal::initStepData(TileCalStepData* tileCalStepData, doubl
void MuGirlNS::StauTileCal::processTileCalWithBeta(double currentBeta,
TileCalStepData* tileCalStepData)
{
- LOG_VERBOSE << "currentBeta=" << currentBeta << endreq;
+ LOG_VERBOSE << "currentBeta=" << currentBeta << endmsg;
double chi2 = 0.;
for (auto cell : *m_pCaloCells)
{
@@ -214,7 +214,7 @@ void MuGirlNS::StauTileCal::printStepData(TileCalStepData* tileCalStepData)
{
if (tileCalStepData != NULL)
LOG_VERBOSE << "tileCal data: beta=" << tileCalStepData->beta << " chi2="
- << tileCalStepData->chi2 << " #cells=" << tileCalStepData->numOfCells << endreq;
+ << tileCalStepData->chi2 << " #cells=" << tileCalStepData->numOfCells << endmsg;
}
void MuGirlNS::StauTileCal::clear()
@@ -276,7 +276,7 @@ void MuGirlNS::StauTileCal::averageBeta()
void MuGirlNS::StauTileCal::processTileCalWithTTrack(double tTrack,
TileCalStepData* tileCalStepData, double beta)
{
- LOG_VERBOSE << "tTrack=" << tTrack << endreq;
+ LOG_VERBOSE << "tTrack=" << tTrack << endmsg;
double currentBeta = beta;
double stauToF;
double muonToF;
--
GitLab