Commit b3e337c1 authored by Jochen Meyer's avatar Jochen Meyer Committed by Graeme Stewart
Browse files

msg svc updates (MuonCalibStandAloneExtraTools-01-00-15)

	* tagging MuonCalibStandAloneExtraTools-01-00-15
	* endreq -> endmsg

2016-07-22  scott snyder  <snyder@bnl.gov>

	* Tagging MuonCalibStandAloneExtraTools-01-00-14.
	* Fix clang warnings.


Former-commit-id: a3d8ebc2
parent 5f3aef27
......@@ -104,12 +104,12 @@ class MdtDqaGlobalTimeFit {
std::string m_chamberHardwareName;
// ROOT file and analysis ntuples/trees //
TFile *m_tfile; // ROOT file
TFile *m_tfile_debug; // ROOT file for debug purposes
TNtuple *m_hit_ntuple; // hit ntuple
//TFile *m_tfile; // ROOT file
//TFile *m_tfile_debug; // ROOT file for debug purposes
//TNtuple *m_hit_ntuple; // hit ntuple
std::string m_file_name; //root file name
float m_nb_hits; //minimum number of hits in segment
//float m_nb_hits; //minimum number of hits in segment
int m_minNumHits; //minimum number of hits in segment
int m_maxNumHits; //maximum number of hits in segment
float m_chi2_cut; //track chi2 cut;
......@@ -117,25 +117,25 @@ class MdtDqaGlobalTimeFit {
bool m_debug; //write debugging rootfile
// calibration region//
const NtupleStationId *m_cal_region;
//const NtupleStationId *m_cal_region;
// line reconstruction //
IRtRelation *m_rtRel;
QuasianalyticLineReconstruction *m_qfitter;
//QuasianalyticLineReconstruction *m_qfitter;
// NOT MAINTAINED ANYMORE MuCCaFitter * m_muFitter;
DCSLFitter *m_muFitter;
GlobalTimeFitter *m_GTFitter;
// counter/numbers //
int m_nb_trigger;
//int m_nb_trigger;
// int m_nb_multilayers;
// int m_nb_layers;
// int m_nb_tubes;
int m_nb_stations;
int m_nb_layers_tubes[1500][4];
//int m_nb_stations;
//int m_nb_layers_tubes[1500][4];
// histograms //
TH1F *m_htoffset;
//TH1F *m_htoffset;
// TH1F *h_distance;
//TH1I *h_nb_hit_tubes;
......
......@@ -118,9 +118,9 @@ class MdtDqaTubeEfficiency {
std::string m_chamberHardwareName;
// ROOT file and analysis ntuples/trees //
TFile *m_tfile; // ROOT file
TFile *m_tfile_debug; // ROOT file for debug purposes
TNtuple *m_hit_ntuple; // hit ntuple
//TFile *m_tfile; // ROOT file
//TFile *m_tfile_debug; // ROOT file for debug purposes
//TNtuple *m_hit_ntuple; // hit ntuple
std::string m_file_name; // root file name
float m_nsigma; // efficiency at nsigma*resol(r)
......@@ -132,13 +132,13 @@ class MdtDqaTubeEfficiency {
bool m_useTimeCorrections;
// calibration region//
const NtupleStationId *m_cal_region;
//const NtupleStationId *m_cal_region;
// line reconstruction //
QuasianalyticLineReconstruction *m_qfitter;
// counter/numbers //
int m_nb_trigger;
//int m_nb_trigger;
// int m_nb_multilayers;
// int m_nb_layers;
// int m_nb_tubes;
......@@ -146,8 +146,8 @@ class MdtDqaTubeEfficiency {
int m_nb_layers_tubes[1500][4] ;
// histograms //
TH1F *m_h_distance;
TH1I *m_h_nb_hit_tubes;
//TH1F *m_h_distance;
//TH1I *m_h_nb_hit_tubes;
/*
std::vector< std::vector< std::vector<TH1F*> > > h_efficiency;
std::vector< std::vector< std::vector<TH1F*> > > h_fakerate;
......@@ -158,13 +158,13 @@ class MdtDqaTubeEfficiency {
std::vector< std::vector<TH1F*> > h_tube_entries_efficiency;
std::vector< std::vector<TH1F*> > h_tube_entries_fakerate;
*/
TH1F *m_h_layer_efficiency;
TH1F *m_h_layer_fakerate;
//TH1F *m_h_layer_efficiency;
//TH1F *m_h_layer_fakerate;
TH1F *m_h_chamber_efficiency;
TH1F *m_h_chamber_fakerate;
//TH1F *m_h_chamber_efficiency;
//TH1F *m_h_chamber_fakerate;
TH1F *m_h_chi2;
//TH1F *m_h_chi2;
};
......
......@@ -153,23 +153,23 @@ class NtupleMdtDqaTool : public AthAlgTool, virtual public NtupleCalibrationTool
// TRACK ANALYSIS
bool m_doTracks;
bool m_quickTrack;
//bool m_quickTrack;
int m_TrkAuthor;
//Dead Tube analysis
int m_DeadElementsAlgorithm;
// calibration region//
const NtupleStationId *m_cal_region;
//const NtupleStationId *m_cal_region;
// line reconstruction //
//QuasianalyticLineReconstruction *m_qfitter;
// counter/numbers //
int m_nb_trigger;
int m_nb_multilayers;
int m_nb_layers;
int m_nb_tubes;
//int m_nb_trigger;
//int m_nb_multilayers;
//int m_nb_layers;
//int m_nb_tubes;
// histograms //
//TH1F *h_distance;
......
......@@ -53,7 +53,7 @@ StatusCode ExtraRegionSelector::initialize(void) {
MsgStream log(msgSvc(), name());
StatusCode sc=service("RegionSelectionSvc", p_reg_sel_svc);
if(!sc.isSuccess()) {
log << MSG::ERROR <<"Cannot retrieve RegionSelectionSvc!" <<endreq;
log << MSG::ERROR <<"Cannot retrieve RegionSelectionSvc!" <<endmsg;
}
if(m_muonboy) {
m_track_author_id = m_evt_handler.muonboyIndices().track;
......@@ -85,14 +85,14 @@ StatusCode ExtraRegionSelector::finalize(void) {
void ExtraRegionSelector::prepareSegments(const MuonCalibEvent *&event, std::map<NtupleStationId, MuonCalibSegment *> &segments) {
MsgStream log(msgSvc(), name());
if(event==NULL) {
log << MSG::FATAL << "event=NULL"<<endreq;
log << MSG::FATAL << "event=NULL"<<endmsg;
event=NULL;
return;
}
const MuonCalibEvent *e(event);
const MuonCalibEvent_E *e_event=dynamic_cast<const MuonCalibEvent_E *>(e);
if(e_event==NULL) {
log << MSG::FATAL << "This tool works only with extra events!"<<endreq;
log << MSG::FATAL << "This tool works only with extra events!"<<endmsg;
event=NULL;
return;
}
......
......@@ -88,7 +88,7 @@ StatusCode ExtraRegionSelectorFast::initialize(void) {
MsgStream log(msgSvc(), name());
StatusCode sc=service("RegionSelectionSvc", p_reg_sel_svc);
if(!sc.isSuccess()) {
log << MSG::ERROR <<"Cannot retrieve RegionSelectionSvc!" <<endreq;
log << MSG::ERROR <<"Cannot retrieve RegionSelectionSvc!" <<endmsg;
}
if(m_do_debug_file) {
TDirectory *prev_dir=gDirectory;
......@@ -118,14 +118,14 @@ StatusCode ExtraRegionSelectorFast::finalize(void) {
void ExtraRegionSelectorFast::prepareSegments(const MuonCalibEvent *&event, std::map<NtupleStationId, MuonCalibSegment *> &segments) {
MsgStream log(msgSvc(), name());
if(event==NULL) {
log << MSG::FATAL << "event=NULL"<<endreq;
log << MSG::FATAL << "event=NULL"<<endmsg;
event=NULL;
return;
}
const MuonCalibEvent *e(event);
const MuonCalibEvent_E *e_event=dynamic_cast<const MuonCalibEvent_E *>(e);
if(e_event==NULL) {
log << MSG::FATAL << "This tool works only with extra events!"<<endreq;
log << MSG::FATAL << "This tool works only with extra events!"<<endmsg;
event=NULL;
return;
}
......
......@@ -61,7 +61,7 @@ StatusCode ExtraRegionSelectorSuperFast::initialize(void) {
MsgStream log(msgSvc(), name());
StatusCode sc=service("RegionSelectionSvc", p_reg_sel_svc);
if(!sc.isSuccess()) {
log << MSG::ERROR <<"Cannot retrieve RegionSelectionSvc!" <<endreq;
log << MSG::ERROR <<"Cannot retrieve RegionSelectionSvc!" <<endmsg;
}
if(m_do_debug_file) {
TDirectory *prev_dir=gDirectory;
......@@ -91,14 +91,14 @@ StatusCode ExtraRegionSelectorSuperFast::finalize(void) {
void ExtraRegionSelectorSuperFast::prepareSegments(const MuonCalibEvent *&event, std::map<NtupleStationId, MuonCalibSegment *> &segments) {
MsgStream log(msgSvc(), name());
if(event==NULL) {
log << MSG::FATAL << "event=NULL"<<endreq;
log << MSG::FATAL << "event=NULL"<<endmsg;
event=NULL;
return;
}
const MuonCalibEvent *e(event);
const MuonCalibEvent_E *e_event=dynamic_cast<const MuonCalibEvent_E *>(e);
if(e_event==NULL) {
log << MSG::FATAL << "This tool works only with extra events!"<<endreq;
log << MSG::FATAL << "This tool works only with extra events!"<<endmsg;
event=NULL;
return;
}
......
......@@ -92,9 +92,15 @@ namespace MuonCalib {
// constructor
MdtDqaGlobalTimeFit::MdtDqaGlobalTimeFit(int nbHitsMin, int nbHitsMax, float chi2cut, int BfieldON, bool debug) :
m_mdtIdHelper(NULL), m_detMgr(NULL), m_id_tool(NULL), p_reg_sel_svc(NULL), m_histoManager(NULL), m_tfile(NULL),
m_tfile_debug(NULL), m_hit_ntuple(NULL), m_nb_hits(-1.), m_cal_region(NULL), m_rtRel(NULL), m_qfitter(NULL),
m_muFitter(NULL), m_GTFitter(NULL), m_nb_trigger(-1), m_nb_stations(-1), m_htoffset(NULL) {
m_mdtIdHelper(NULL), m_detMgr(NULL), m_id_tool(NULL), p_reg_sel_svc(NULL), m_histoManager(NULL),
//m_tfile(NULL),
//m_tfile_debug(NULL), m_hit_ntuple(NULL), m_nb_hits(-1.), m_cal_region(NULL),
m_rtRel(NULL),
//m_qfitter(NULL),
m_muFitter(NULL), m_GTFitter(NULL)
//m_nb_trigger(-1), m_nb_stations(-1),
//m_htoffset(NULL)
{
m_minNumHits = nbHitsMin;
m_maxNumHits = nbHitsMax;
m_chi2_cut = chi2cut;
......
......@@ -5,7 +5,6 @@
//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
// 13.08.2008, AUTHORs: SILVESTRO DI LUISE - MAURO IODICE
//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
using namespace std;
#define PI 3.14159265
......@@ -39,6 +38,8 @@ using namespace std;
#include "TKey.h"
using namespace std;
namespace MuonCalib {
//====================================================================================
......
......@@ -78,10 +78,16 @@ MdtDqaTubeEfficiency::MdtDqaTubeEfficiency(float nsigma, float chi2Cut,
bool defaultResol, float adcCut, bool GTFitON,
bool useNewCalibConstants, bool useTimeCorrections) :
m_mdtIdHelper(NULL), m_detMgr(NULL), m_id_tool(NULL), p_reg_sel_svc(NULL), p_calib_input_svc(NULL),
m_histoManager(NULL), m_tfile(NULL), m_tfile_debug(NULL), m_hit_ntuple(NULL), m_cal_region(NULL),
m_qfitter(NULL), m_nb_trigger(-1), m_nb_stations(-1), m_h_distance(NULL), m_h_nb_hit_tubes(NULL),
m_h_layer_efficiency(NULL), m_h_layer_fakerate(NULL), m_h_chamber_efficiency(NULL),
m_h_chamber_fakerate(NULL), m_h_chi2(NULL) {
m_histoManager(NULL),
//m_tfile(NULL), m_tfile_debug(NULL), m_hit_ntuple(NULL),
//m_cal_region(NULL),
m_qfitter(NULL),
//m_nb_trigger(-1),
m_nb_stations(-1)
//m_h_distance(NULL), m_h_nb_hit_tubes(NULL),
//m_h_layer_efficiency(NULL), m_h_layer_fakerate(NULL), m_h_chamber_efficiency(NULL),
//m_h_chamber_fakerate(NULL), m_h_chi2(NULL)
{
m_nsigma = nsigma;
m_chi2Cut = chi2Cut;
m_defaultResol = defaultResol;
......
......@@ -160,7 +160,7 @@ NtupleMdtDqaTool::NtupleMdtDqaTool( const std::string &t, const std::string &n,
StatusCode NtupleMdtDqaTool::initialize() {
MsgStream log(msgSvc(), name());
log << MSG::INFO << "Initializing NtupleMdtDqaTool" << endreq;
log << MSG::INFO << "Initializing NtupleMdtDqaTool" << endmsg;
//-----------------------------//
//-- Get the StoreGate Stuff --//
......@@ -169,19 +169,19 @@ StatusCode NtupleMdtDqaTool::initialize() {
StoreGateSvc *detStore;
StatusCode sc=service("DetectorStore", detStore);
if(!sc.isSuccess()){
log << MSG::FATAL << "Cannot retrieve Store Gate!" << endreq;
log << MSG::FATAL << "Cannot retrieve Store Gate!" << endmsg;
return sc;
}
sc = detStore->retrieve(m_mdtIdHelper, "MDTIDHELPER" );
if (!sc.isSuccess()) {
log << MSG::FATAL << "Can't retrieve MdtIdHelper" << endreq;
log << MSG::FATAL << "Can't retrieve MdtIdHelper" << endmsg;
return sc;
}
sc = detStore->retrieve( m_detMgr );
if (!sc.isSuccess()) {
log << MSG::FATAL << "Can't retrieve MuonDetectorManager" << endreq;
log << MSG::FATAL << "Can't retrieve MuonDetectorManager" << endmsg;
return sc;
}
......@@ -191,21 +191,21 @@ StatusCode NtupleMdtDqaTool::initialize() {
sc = toolSvc()->retrieveTool(idToFixedIdToolType, idToFixedIdToolName, m_id_tool);
if(!sc.isSuccess()) {
log << MSG::FATAL << "Can't retrieve IdToFixedIdTool" << endreq;
log << MSG::FATAL << "Can't retrieve IdToFixedIdTool" << endmsg;
return sc;
}
//get region selection service
sc=service("RegionSelectionSvc", p_reg_sel_svc);
if(!sc.isSuccess()) {
log << MSG::ERROR <<"Cannot retrieve RegionSelectionSvc!" <<endreq;
log << MSG::ERROR <<"Cannot retrieve RegionSelectionSvc!" <<endmsg;
return sc;
}
//get pointer to Calibration input service
sc=service("MdtCalibInputSvc", p_calib_input_svc);
if(!sc.isSuccess()) {
log << MSG::ERROR <<"Cannot retrieve MdtCalibInputSvc!" <<endreq;
log << MSG::ERROR <<"Cannot retrieve MdtCalibInputSvc!" <<endmsg;
return sc;
}
......@@ -372,10 +372,10 @@ StatusCode NtupleMdtDqaTool::initialize() {
StatusCode NtupleMdtDqaTool::finalize(void) {
MsgStream log(msgSvc(), name());
log << MSG::INFO << "Finalizing NtupleMdtDqaTool" << endreq;
log << MSG::INFO << "Finalizing NtupleMdtDqaTool" << endmsg;
if (m_doFinalize) {
log << MSG::INFO << "Executing MdtDqaNtupleAnalysis::histogramAnalysis " << endreq;
log << MSG::INFO << "Executing MdtDqaNtupleAnalysis::histogramAnalysis " << endmsg;
m_ntupleAna->histogramAnalysis(m_histoManager->rootFile());
}
......@@ -414,9 +414,9 @@ StatusCode NtupleMdtDqaTool::analyseSegments(const std::vector<MuonCalibSegment
MsgStream log(msgSvc(), name());
log << MSG::INFO << "NtupleMdtDqaTool::analyseSegments ...it does nothing analysis moved elsewhere"
<< endreq;
<< endmsg;
// if (m_doFinalize && m_doEfficiency ) {
// log << MSG::INFO << "Executing MdtDqaTubeEfficiency::analyseSegments" << endreq;
// log << MSG::INFO << "Executing MdtDqaTubeEfficiency::analyseSegments" << endmsg;
// m_tubeEffi->analyseSegments(segments);
// }
return StatusCode::SUCCESS;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment