From a958d67409589a4fa1510472bbe531ccd7f25b51 Mon Sep 17 00:00:00 2001
From: scott snyder <snyder@bnl.gov>
Date: Mon, 29 Jan 2018 20:35:33 +0100
Subject: [PATCH] ALFA_Raw2Digit: Comply with ATLAS naming conventions.
Private data members should start with m_.
---
.../ALFA_Raw2Digit/ALFA_Raw2Digit.h | 77 ++--
.../ALFA_Raw2Digit/src/ALFA_Raw2Digit.cxx | 412 +++++++++---------
2 files changed, 243 insertions(+), 246 deletions(-)
diff --git a/ForwardDetectors/ALFA/ALFA_Raw2Digit/ALFA_Raw2Digit/ALFA_Raw2Digit.h b/ForwardDetectors/ALFA/ALFA_Raw2Digit/ALFA_Raw2Digit/ALFA_Raw2Digit.h
index 29f956f205d..f9bcbdaf254 100644
--- a/ForwardDetectors/ALFA/ALFA_Raw2Digit/ALFA_Raw2Digit/ALFA_Raw2Digit.h
+++ b/ForwardDetectors/ALFA/ALFA_Raw2Digit/ALFA_Raw2Digit/ALFA_Raw2Digit.h
@@ -82,12 +82,12 @@ private:
// std::vector<int>* m_PMFId;
// std::vector<int>* m_hit;
- int mbID;
- int pmfID;
- int fibID;
+ int m_mbID;
+ int m_pmfID;
+ int m_fibID;
- int MAPMTChan;
- int MapChan;
+ int m_MAPMTChan;
+ int m_MapChan;
int m_pot;
int m_side;
@@ -103,19 +103,19 @@ private:
// int maroc2fiber[8][64];
// int maroc2mapmt[8][64];
// int mapmt2maroc[8][64];
- int maroc2fiber[8][20][64];
- int maroc2mapmt[8][20][64];
- int mapmt2maroc[8][20][64];
+ int m_maroc2fiber[8][20][64];
+ int m_maroc2mapmt[8][20][64];
+ int m_mapmt2maroc[8][20][64];
- int pmf2layer[8][23];
+ int m_pmf2layer[8][23];
// int layer2pmf[8][20];
- int OD_pmf2layer[8][4];
+ int m_OD_pmf2layer[8][4];
// int OD_layer2pmf[8][3];
- int OD_pmf_maroc2fiber[8][4][64];
- int OD_pmf_maroc2side[8][4][64];
+ int m_OD_pmf_maroc2fiber[8][4][64];
+ int m_OD_pmf_maroc2side[8][4][64];
- int mb2det[8];
+ int m_mb2det[8];
/*
TGraph *MAPMT_activity[8];
@@ -125,27 +125,24 @@ private:
TH2I* MapmtHit[8][23];
*/
- TH1I *thChargeDet[8][2];
- TH2I *All_Trigger;
- TH2D *All_Trigger_norm;
-
- TH1F* act_lay_h[8];
- TH1F* hit_lay_h[8];
- uint32_t lumi_block, lumi_block_old;
- uint16_t charge_1[8], charge_2[8];
- std::vector<bool> trigger_pattern;
- bool pot_b[8], layer_b[8][20], fiber_b[8][20][64], trigger_pattern_b[8][16];
- bool act_lay[8][20];
- Int_t n_act_lay[8], n_hits_lay[8][20], n_trig[8][4];
- Int_t event_no;
- int events_count[8];
+ TH2I *m_All_Trigger;
+ TH2D *m_All_Trigger_norm;
+
+ TH1F* m_act_lay_h[8];
+ TH1F* m_hit_lay_h[8];
+ uint32_t m_lumi_block, m_lumi_block_old;
+ uint16_t m_charge_1[8], m_charge_2[8];
+ std::vector<bool> m_trigger_pattern;
+ bool m_pot_b[8], m_layer_b[8][20], m_fiber_b[8][20][64], m_trigger_pattern_b[8][16];
+ Int_t m_n_hits_lay[8][20];
+ Int_t m_event_no;
TTree* m_tree;
TFile *m_rootOutput;
TString m_rootOutputFileName;
- Int_t pmf_chan_hit_counter[8][23][64];
- Int_t hit_counter[8];
+ Int_t m_pmf_chan_hit_counter[8][23][64];
+ Int_t m_hit_counter[8];
// ServiceHandle<StoreGateSvc> m_digitsStore;
@@ -158,19 +155,19 @@ private:
std::string m_key_DigitCollection;
std::string m_key_ODDigitCollection;
- std::ifstream inChan;
- std::ifstream inPMF;
- std::ifstream inOD;
- std::ifstream inDet;
+ std::ifstream m_inChan;
+ std::ifstream m_inPMF;
+ std::ifstream m_inOD;
+ std::ifstream m_inDet;
- std::string mapname;
- std::stringstream s;
- std::string h_name1, h_name2, h_name3;
- std::string h_loc1, h_loc2, h_loc3;
- std::string CanName;
+ std::string m_mapname;
+ std::stringstream m_s;
+ std::string m_h_name1, m_h_name2, m_h_name3;
+ std::string m_h_loc1, m_h_loc2, m_h_loc3;
+ std::string m_CanName;
- int WordId_count;
- uint32_t chan_i, chan_j;
+ int m_WordId_count;
+ uint32_t m_chan_i, m_chan_j;
/*
TTree* m_tree;
diff --git a/ForwardDetectors/ALFA/ALFA_Raw2Digit/src/ALFA_Raw2Digit.cxx b/ForwardDetectors/ALFA/ALFA_Raw2Digit/src/ALFA_Raw2Digit.cxx
index 98dcfeb0fe5..43a298596ef 100644
--- a/ForwardDetectors/ALFA/ALFA_Raw2Digit/src/ALFA_Raw2Digit.cxx
+++ b/ForwardDetectors/ALFA/ALFA_Raw2Digit/src/ALFA_Raw2Digit.cxx
@@ -24,8 +24,8 @@ ALFA_Raw2Digit::ALFA_Raw2Digit(const std::string& name, ISvcLocator* pSvcLocator
declareProperty("MeasuredDataType", m_strMeasuredDataType = "tunnel");
- All_Trigger_norm = NULL;
- All_Trigger = NULL;
+ m_All_Trigger_norm = NULL;
+ m_All_Trigger = NULL;
m_ODdigitCollection = NULL;
m_ODdigitObject = NULL;
m_digitCollection = NULL;
@@ -35,11 +35,11 @@ ALFA_Raw2Digit::ALFA_Raw2Digit(const std::string& name, ISvcLocator* pSvcLocator
m_tree = NULL;
m_nEvents = 0;
- mbID = 0;
- pmfID = 0;
- fibID = 0;
- MAPMTChan = 0;
- MapChan = 0;
+ m_mbID = 0;
+ m_pmfID = 0;
+ m_fibID = 0;
+ m_MAPMTChan = 0;
+ m_MapChan = 0;
m_pot = 0;
m_side = 0;
m_plate = 0;
@@ -49,14 +49,14 @@ ALFA_Raw2Digit::ALFA_Raw2Digit(const std::string& name, ISvcLocator* pSvcLocator
m_ODplate = 0;
m_ODfiber = 0;
- memset(&act_lay_h, 0, sizeof(act_lay_h));
- memset(&hit_lay_h, 0, sizeof(hit_lay_h));
- lumi_block = 0;
- lumi_block_old = 0;
- event_no = 0;
- WordId_count = 0;
- chan_i = 0;
- chan_j = 0;
+ memset(&m_act_lay_h, 0, sizeof(m_act_lay_h));
+ memset(&m_hit_lay_h, 0, sizeof(m_hit_lay_h));
+ m_lumi_block = 0;
+ m_lumi_block_old = 0;
+ m_event_no = 0;
+ m_WordId_count = 0;
+ m_chan_i = 0;
+ m_chan_j = 0;
}
StatusCode ALFA_Raw2Digit::initialize()
@@ -65,26 +65,26 @@ StatusCode ALFA_Raw2Digit::initialize()
if (m_strMeasuredDataType=="tunnel")
{
- mb2det[0] = 1; mb2det[1] = 0; mb2det[2] = 7; mb2det[3] = 2;
- mb2det[4] = 4; mb2det[5] = 5; mb2det[6] = 6; mb2det[7] = 3;
+ m_mb2det[0] = 1; m_mb2det[1] = 0; m_mb2det[2] = 7; m_mb2det[3] = 2;
+ m_mb2det[4] = 4; m_mb2det[5] = 5; m_mb2det[6] = 6; m_mb2det[7] = 3;
}
else if (m_strMeasuredDataType=="testbeam")
{
- mb2det[0] = 0; mb2det[1] = 1; mb2det[2] = 2; mb2det[3] = 3;
- mb2det[4] = 4; mb2det[5] = 5; mb2det[6] = 6; mb2det[7] = 7;
+ m_mb2det[0] = 0; m_mb2det[1] = 1; m_mb2det[2] = 2; m_mb2det[3] = 3;
+ m_mb2det[4] = 4; m_mb2det[5] = 5; m_mb2det[6] = 6; m_mb2det[7] = 7;
}
m_nEvents = 0;
- MAPMTChan = -1;
+ m_MAPMTChan = -1;
for (int m=0;m<8;m++)
{
- hit_counter[m] = 0;
+ m_hit_counter[m] = 0;
for (int k=0;k<23;k++)
{
for (int i=0;i<64;i++)
{
- pmf_chan_hit_counter[m][k][i] = 0;
+ m_pmf_chan_hit_counter[m][k][i] = 0;
}
}
}
@@ -109,36 +109,36 @@ StatusCode ALFA_Raw2Digit::initialize()
m_tree = new TTree("MyTree", "ALFA_toy_tree");
TBranch *branch;
- branch = m_tree->Branch("event_no", &event_no,"event_no/I"); branch->SetAutoDelete(kFALSE);
- branch = m_tree->Branch("lumi_block", &lumi_block, "lumi_block/I"); branch->SetAutoDelete(kFALSE);
- branch = m_tree->Branch("pot_b", pot_b, "pot_b[8]/O"); branch->SetAutoDelete(kFALSE);
- branch = m_tree->Branch("layer_b", layer_b, "layer_b[8][20]/O"); branch->SetAutoDelete(kFALSE);
- branch = m_tree->Branch("fiber_b", fiber_b, "fiber_b[8][20][64]/O"); branch->SetAutoDelete(kFALSE);
- branch = m_tree->Branch("trigger_pattern_b", trigger_pattern_b, "trigger_pattern[8][16]/O"); branch->SetAutoDelete(kFALSE);
- branch = m_tree->Branch("charge_1", &charge_1, "charge_1[8]/s"); branch->SetAutoDelete(kFALSE);
- branch = m_tree->Branch("charge_2", &charge_2, "charge_2[8]/s"); branch->SetAutoDelete(kFALSE);
+ branch = m_tree->Branch("m_event_no", &m_event_no,"m_event_no/I"); branch->SetAutoDelete(kFALSE);
+ branch = m_tree->Branch("m_lumi_block", &m_lumi_block, "m_lumi_block/I"); branch->SetAutoDelete(kFALSE);
+ branch = m_tree->Branch("pot_b", m_pot_b, "pot_b[8]/O"); branch->SetAutoDelete(kFALSE);
+ branch = m_tree->Branch("layer_b", m_layer_b, "layer_b[8][20]/O"); branch->SetAutoDelete(kFALSE);
+ branch = m_tree->Branch("fiber_b", m_fiber_b, "fiber_b[8][20][64]/O"); branch->SetAutoDelete(kFALSE);
+ branch = m_tree->Branch("trigger_pattern_b", m_trigger_pattern_b, "trigger_pattern[8][16]/O"); branch->SetAutoDelete(kFALSE);
+ branch = m_tree->Branch("charge_1", &m_charge_1, "charge_1[8]/s"); branch->SetAutoDelete(kFALSE);
+ branch = m_tree->Branch("charge_2", &m_charge_2, "charge_2[8]/s"); branch->SetAutoDelete(kFALSE);
*/
// for (unsigned int j=0; j<8; j++)
// {
-// h_name1 = "MAPMT_activity_p_";
-// h_name2 = "PMFvsMAPMT_p_";
-// h_name3 = "PMFvsMAROC_p_";
+// m_h_name1 = "MAPMT_activity_p_";
+// m_h_name2 = "PMFvsMAPMT_p_";
+// m_h_name3 = "PMFvsMAROC_p_";
-// h_loc1 = "/AANT/MAPMT_activity_p_";
-// h_loc2 = "/AANT/PMFvsMAPMT_p_";
-// h_loc3 = "/AANT/PMFvsMAROC_p_";
+// m_h_loc1 = "/AANT/MAPMT_activity_p_";
+// m_h_loc2 = "/AANT/PMFvsMAPMT_p_";
+// m_h_loc3 = "/AANT/PMFvsMAROC_p_";
-// s.str("");
-// s << j+1;
+// m_s.str("");
+// m_s << j+1;
-// h_name1 += s.str();
-// h_name2 += s.str();
-// h_name3 += s.str();
+// m_h_name1 += m_s.str();
+// m_h_name2 += m_s.str();
+// m_h_name3 += m_s.str();
-// h_loc1 += s.str();
-// h_loc2 += s.str();
-// h_loc3 += s.str();
+// m_h_loc1 += m_s.str();
+// m_h_loc2 += m_s.str();
+// m_h_loc3 += m_s.str();
/*
m_rootOutputFileName = "ALFA_toy_tree_tom.root";
@@ -147,24 +147,24 @@ StatusCode ALFA_Raw2Digit::initialize()
MAPMT_activity[j] = new TGraph(1472);
// MAPMT_activity[j]->SetTitle("Trigger efficiency for Upper pot;MAROC Channel; Trigger efficiency");
- MAPMT_activity[j]->SetTitle(h_name1.c_str());
+ MAPMT_activity[j]->SetTitle(m_h_name1.c_str());
MAPMT_activity[j]->SetMarkerStyle(6);
MAPMT_activity[j]->Draw("AP");
- MAPMT_activity[j]->SetName(h_name1.c_str());
+ MAPMT_activity[j]->SetName(m_h_name1.c_str());
-// sc = m_histSvc->regHist(h_loc1.c_str(),MAPMT_activity[j]);
+// sc = m_histSvc->regHist(m_h_loc1.c_str(),MAPMT_activity[j]);
- PMFvsMAPMT[j] = new TH2I(h_name2.c_str(),h_name2.c_str(),64,-0.5,63.5,23,-0.5,22.5);
- sc = m_histSvc->regHist(h_loc2.c_str(),PMFvsMAPMT[j]);
+ PMFvsMAPMT[j] = new TH2I(m_h_name2.c_str(),m_h_name2.c_str(),64,-0.5,63.5,23,-0.5,22.5);
+ sc = m_histSvc->regHist(m_h_loc2.c_str(),PMFvsMAPMT[j]);
- PMFvsMAROC[j] = new TH2I(h_name3.c_str(),h_name3.c_str(),64,-0.5,63.5,23,-0.5,22.5);
- sc = m_histSvc->regHist(h_loc3.c_str(),PMFvsMAROC[j]);
+ PMFvsMAROC[j] = new TH2I(m_h_name3.c_str(),m_h_name3.c_str(),64,-0.5,63.5,23,-0.5,22.5);
+ sc = m_histSvc->regHist(m_h_loc3.c_str(),PMFvsMAROC[j]);
for (unsigned int i=0; i<23; i++)
{
- MapmtHit[j][i] = new TH2I(h_name1.c_str(),h_name1.c_str(),8,0.5,8.5,8,0.5,8.5);
+ MapmtHit[j][i] = new TH2I(m_h_name1.c_str(),m_h_name1.c_str(),8,0.5,8.5,8,0.5,8.5);
MAPMT_activity_h[j][i] = new TH2D("","",8,0.5,8.5,8,0.5,8.5);
- sc = m_histSvc->regHist(h_loc1.c_str(),MAPMT_activity_h[j][i]);
+ sc = m_histSvc->regHist(m_h_loc1.c_str(),MAPMT_activity_h[j][i]);
}
*/
// }
@@ -211,24 +211,24 @@ StatusCode ALFA_Raw2Digit::execute()
for (unsigned int i=0;i<8;i++) {
- pot_b[i] = false;
+ m_pot_b[i] = false;
for (unsigned int j=0;j<20;j++) {
- layer_b[i][j] = false;
+ m_layer_b[i][j] = false;
for (unsigned int k=0;k<64;k++) {
- fiber_b[i][j][k] = false;
+ m_fiber_b[i][j][k] = false;
}
}
for (unsigned int k=0;k<16;k++) {
- trigger_pattern_b[i][k] = false;
+ m_trigger_pattern_b[i][k] = false;
}
}
- event_no = m_nEvents;
+ m_event_no = m_nEvents;
- lumi_block = container->GetLumiBlock();
-// std::cout << "lumi_block = " << lumi_block << std::endl;
+ m_lumi_block = container->GetLumiBlock();
+// std::cout << "m_lumi_block = " << m_lumi_block << std::endl;
// loop over container start
ALFA_RawDataContainer::const_iterator RawData_Collection_Beg = container->begin();
@@ -237,8 +237,8 @@ StatusCode ALFA_Raw2Digit::execute()
//loop over collection (container) with hits (i.e. over 1 event)
for(;RawData_Collection_Beg!=RawData_Collection_End; ++RawData_Collection_Beg)
{
- mbID = ((*RawData_Collection_Beg)->GetMBId_POT());
- msg(MSG::DEBUG) << "ALFA_Raw2Digit: MBId POT= " << mbID << endmsg;
+ m_mbID = ((*RawData_Collection_Beg)->GetMBId_POT());
+ msg(MSG::DEBUG) << "ALFA_Raw2Digit: MBId POT= " << m_mbID << endmsg;
// std::cout << "******* Time stamp = " << (*RawData_Collection_Beg)->GetTimeStamp_POT() << std::endl;
// time_t rawtime = (*RawData_Collection_Beg)->GetTimeStamp_POT();
@@ -246,16 +246,16 @@ StatusCode ALFA_Raw2Digit::execute()
//// time ( &rawtime );
//// timeinfo = localtime ( &rawtime );
// timeinfo = gmtime ( &rawtime );
-// printf ( "The date/time is: %s", asctime (timeinfo) );
+// printf ( "The date/time is: %m_s", asctime (timeinfo) );
- pot_b[mbID-1] = true;
- // event_no = ((*RawData_Collection_Beg)->GetEventCount_POT());
+ m_pot_b[m_mbID-1] = true;
+ // m_event_no = ((*RawData_Collection_Beg)->GetEventCount_POT());
- charge_1[mbID-1] = ((*RawData_Collection_Beg)->Get_ADC1_POT());
- charge_2[mbID-1] = ((*RawData_Collection_Beg)->Get_ADC2_POT());
+ m_charge_1[m_mbID-1] = ((*RawData_Collection_Beg)->Get_ADC1_POT());
+ m_charge_2[m_mbID-1] = ((*RawData_Collection_Beg)->Get_ADC2_POT());
for (unsigned int i=0;i<16;i++) {
- trigger_pattern_b[mbID-1][i] = ((*RawData_Collection_Beg)->Get_pattern_POT())[i];
-// msg(MSG::ERROR) << " pattern: bit " << i << ", value = "<< trigger_pattern_b[mbID-1][i] << " in MB = " << mbID-1 << endmsg;
+ m_trigger_pattern_b[m_mbID-1][i] = ((*RawData_Collection_Beg)->Get_pattern_POT())[i];
+// msg(MSG::ERROR) << " pattern: bit " << i << ", value = "<< m_trigger_pattern_b[m_mbID-1][i] << " in MB = " << m_mbID-1 << endmsg;
}
// loop over collection start
@@ -268,16 +268,16 @@ StatusCode ALFA_Raw2Digit::execute()
if ((*p_RawData_Beg)->GetPMFId_PMF()>0 && ((*p_RawData_Beg)->GetWordId_PMF())<24)
{
- pmfID= (*p_RawData_Beg)->GetPMFId_PMF();
+ m_pmfID= (*p_RawData_Beg)->GetPMFId_PMF();
- if (((*p_RawData_Beg)->GetWordId_PMF())==0) WordId_count=1;
- else WordId_count=0;
+ if (((*p_RawData_Beg)->GetWordId_PMF())==0) m_WordId_count=1;
+ else m_WordId_count=0;
- if (WordId_count==1){
+ if (m_WordId_count==1){
msg(MSG::DEBUG) << " pmfId = " << (*p_RawData_Beg)->GetPMFId_PMF() << ", MBId = " << (*p_RawData_Beg)->GetMBId_PMF() <<endmsg;
}
-// msg(MSG::DEBUG) << " WordId_count " << WordId_count << endmsg;
+// msg(MSG::DEBUG) << " m_WordId_count " << m_WordId_count << endmsg;
for (unsigned int i=0;i<16;i++)
{
@@ -285,79 +285,79 @@ StatusCode ALFA_Raw2Digit::execute()
{
msg(MSG::DEBUG) <<"ALFA_Raw2Digit, maroc chanel # = " << (*p_RawData_Beg)->Get_Chan(i)<< endmsg;
- fibID = (*p_RawData_Beg)->Get_Chan(i);
+ m_fibID = (*p_RawData_Beg)->Get_Chan(i);
// in Sara Diglio Byte Stream Converter PMF are counted from 1, then OD detectors have values of PMF in the range 2-4; fibers start at 0
- if ((pmfID == 1) || (pmfID > 4))
+ if ((m_pmfID == 1) || (m_pmfID > 4))
{
- m_pot = mb2det[mbID-1];
-// m_pot = mbID-1;
- m_plate = pmf2layer[m_pot][pmfID-1];
+ m_pot = m_mb2det[m_mbID-1];
+// m_pot = m_mbID-1;
+ m_plate = m_pmf2layer[m_pot][m_pmfID-1];
// changed by Petr - 19.12.2012 -----------------------------
-// m_fiber = 63-maroc2fiber[m_pot][fibID];
- m_fiber = maroc2fiber[m_pot][m_plate][fibID];
+// m_fiber = 63-m_maroc2fiber[m_pot][m_fibID];
+ m_fiber = m_maroc2fiber[m_pot][m_plate][m_fibID];
- layer_b[mbID-1][m_plate] = true;
- fiber_b[mbID-1][m_plate][m_fiber] = true;
-// msg(MSG::ERROR) << " bim ho, lumi = " << lumi_block << ", pot = "<< mbID-1 << ", plate " << m_plate << endmsg;
- n_hits_lay[mbID-1][m_plate] = n_hits_lay[mbID-1][m_plate] + 1;
-// msg(MSG::ERROR) << " number of hits " << n_hits_lay[mbID-1][m_plate] << endmsg;
+ m_layer_b[m_mbID-1][m_plate] = true;
+ m_fiber_b[m_mbID-1][m_plate][m_fiber] = true;
+// msg(MSG::ERROR) << " bim ho, lumi = " << m_lumi_block << ", pot = "<< m_mbID-1 << ", plate " << m_plate << endmsg;
+ m_n_hits_lay[m_mbID-1][m_plate] = m_n_hits_lay[m_mbID-1][m_plate] + 1;
+// msg(MSG::ERROR) << " number of hits " << m_n_hits_lay[m_mbID-1][m_plate] << endmsg;
// m_digitCollection->push_back(new ALFA_Digit(m_pot,m_plate,m_fiber));
- m_digitCollection->push_back(new ALFA_Digit(mbID-1,m_plate,m_fiber));
+ m_digitCollection->push_back(new ALFA_Digit(m_mbID-1,m_plate,m_fiber));
// changed by Petr - 19.12.2012 -----------------------------
-// MapChan = maroc2mapmt[m_pot][fibID];
- MapChan = maroc2mapmt[m_pot][m_plate][fibID];
- msg(MSG::DEBUG) << "pot = " << m_pot << ", pmf = " << pmfID-1 << ", maroc = " << fibID << ", mapmt = " << MapChan << endmsg;
+// m_MapChan = m_maroc2mapmt[m_pot][m_fibID];
+ m_MapChan = m_maroc2mapmt[m_pot][m_plate][m_fibID];
+ msg(MSG::DEBUG) << "pot = " << m_pot << ", pmf = " << m_pmfID-1 << ", maroc = " << m_fibID << ", mapmt = " << m_MapChan << endmsg;
-// PMFvsMAPMT[m_pot]->Fill(MapChan,pmfID-1);
-// PMFvsMAROC[m_pot]->Fill(fibID,pmfID-1);
+// PMFvsMAPMT[m_pot]->Fill(m_MapChan,m_pmfID-1);
+// PMFvsMAROC[m_pot]->Fill(m_fibID,m_pmfID-1);
// changed by Petr - 19.12.2012 -----------------------------
-// ChanPlot(m_pot,fibID,chan_i,chan_j);
-// ChanPlot(m_pot,m_plate,fibID,chan_i,chan_j);
-// MapmtHit[m_pot][pmfID-1]->Fill(chan_i,chan_j);
- msg(MSG::DEBUG) << "fibID = " << fibID << ", chan_i " << chan_i << ", chan_j = " << chan_j << endmsg;
+// ChanPlot(m_pot,m_fibID,m_chan_i,m_chan_j);
+// ChanPlot(m_pot,m_plate,m_fibID,m_chan_i,m_chan_j);
+// MapmtHit[m_pot][m_pmfID-1]->Fill(m_chan_i,m_chan_j);
+ msg(MSG::DEBUG) << "fibID = " << m_fibID << ", chan_i " << m_chan_i << ", chan_j = " << m_chan_j << endmsg;
- pmf_chan_hit_counter[m_pot][pmfID-1][fibID]++;
- hit_counter[m_pot]++;
+ m_pmf_chan_hit_counter[m_pot][m_pmfID-1][m_fibID]++;
+ m_hit_counter[m_pot]++;
msg(MSG::DEBUG) << "ALFA_Raw2Digit: new digit (softsim numbering-starting from 0) in the collection, pot = " << m_pot << ", plate = " << m_plate << ", fiber = " << m_fiber << endmsg;
}
else
{
- m_ODpot = mb2det[mbID-1];
-// m_ODpot = mbID-1;
- m_ODside = OD_pmf_maroc2side[m_ODpot][pmfID-1][fibID];
- m_ODplate = OD_pmf2layer[m_ODpot][pmfID-1];
- m_ODfiber = OD_pmf_maroc2fiber[m_ODpot][pmfID-1][fibID];
+ m_ODpot = m_mb2det[m_mbID-1];
+// m_ODpot = m_mbID-1;
+ m_ODside = m_OD_pmf_maroc2side[m_ODpot][m_pmfID-1][m_fibID];
+ m_ODplate = m_OD_pmf2layer[m_ODpot][m_pmfID-1];
+ m_ODfiber = m_OD_pmf_maroc2fiber[m_ODpot][m_pmfID-1][m_fibID];
- // changed by Petr - 19.12.2012 ----------------------------- commented, is it needed by ODs? TODO: to correct MapChan for OD case
-// MapChan = maroc2mapmt[m_ODpot][fibID];
-// msg(MSG::DEBUG) << " pot = " << m_ODpot << ", pmf = " << pmfID-1 << ", maroc = " << fibID << ", mapmt = " << MapChan << endmsg;
+ // changed by Petr - 19.12.2012 ----------------------------- commented, is it needed by ODs? TODO: to correct m_MapChan for OD case
+// m_MapChan = m_maroc2mapmt[m_ODpot][m_fibID];
+// msg(MSG::DEBUG) << " pot = " << m_ODpot << ", pmf = " << m_pmfID-1 << ", maroc = " << m_fibID << ", mapmt = " << m_MapChan << endmsg;
if (m_ODfiber!=98)
{
// m_ODfiber = (m_ODside==0)? m_ODfiber : 29-m_ODfiber;
// m_ODdigitCollection->push_back(new ALFA_ODDigit(m_ODpot,m_ODside,m_ODplate,m_ODfiber));
- m_ODdigitCollection->push_back(new ALFA_ODDigit(mbID-1,m_ODside,m_ODplate,m_ODfiber));
+ m_ODdigitCollection->push_back(new ALFA_ODDigit(m_mbID-1,m_ODside,m_ODplate,m_ODfiber));
// msg(MSG::DEBUG) << "pot, side, plate, fiber = " << m_ODpot << ", " << m_ODside << ", " << m_ODplate << ", " << m_ODfiber << endmsg;
}
-// PMFvsMAPMT[m_ODpot]->Fill(MapChan,pmfID-1);
-// PMFvsMAROC[m_ODpot]->Fill(fibID,pmfID-1);
+// PMFvsMAPMT[m_ODpot]->Fill(m_MapChan,m_pmfID-1);
+// PMFvsMAROC[m_ODpot]->Fill(m_fibID,m_pmfID-1);
// changed by Petr - 19.12.2012 ----------------------------- commented, is it needed by ODs? TODO: to correct ChanPlot for OD case
-// ChanPlot(m_ODpot,fibID,chan_i,chan_j);
-// MapmtHit[m_ODpot][pmfID-1]->Fill(chan_i,chan_j);
- msg(MSG::DEBUG) << "fibID = " << fibID << ", chan_i " << chan_i << ", chan_j = " << chan_j << endmsg;
+// ChanPlot(m_ODpot,m_fibID,m_chan_i,m_chan_j);
+// MapmtHit[m_ODpot][m_pmfID-1]->Fill(m_chan_i,m_chan_j);
+ msg(MSG::DEBUG) << "fibID = " << m_fibID << ", chan_i " << m_chan_i << ", chan_j = " << m_chan_j << endmsg;
- pmf_chan_hit_counter[m_ODpot][pmfID-1][fibID]++;
- hit_counter[m_ODpot]++;
+ m_pmf_chan_hit_counter[m_ODpot][m_pmfID-1][m_fibID]++;
+ m_hit_counter[m_ODpot]++;
msg(MSG::DEBUG) << "ALFA_Raw2Digit: new OD digit (softsim numbering-starting from 0) in the collection, pot = " << m_ODpot << ", side = " << m_ODside << ", plate = " << m_ODplate << ", fiber = " << m_ODfiber << endmsg;
}
@@ -399,32 +399,32 @@ StatusCode ALFA_Raw2Digit::finalize()
for (int k=0;k<23;k++){
for (int m=1;m<9;m++){
for (int n=1;n<9;n++){
- MAPMT_activity_h[j][k]->SetBinContent(m,n,double(MapmtHit[j][k]->GetBinContent(m,n))/double(hit_counter[j]));
+ MAPMT_activity_h[j][k]->SetBinContent(m,n,double(MapmtHit[j][k]->GetBinContent(m,n))/double(m_hit_counter[j]));
}
}
for (int i=0;i<64;i++){
- MAPMT_activity[j]->SetPoint(k*64+i,k*64+i,double(pmf_chan_hit_counter[j][k][i])/double(hit_counter[j]));
+ MAPMT_activity[j]->SetPoint(k*64+i,k*64+i,double(m_pmf_chan_hit_counter[j][k][i])/double(m_hit_counter[j]));
}
}
- s.str("");
- s << j+1;
+ m_s.str("");
+ m_s << j+1;
- h_name1 = "MAPMT_activity_p_";
- h_name1 += s.str();
+ m_h_name1 = "MAPMT_activity_p_";
+ m_h_name1 += m_s.str();
canvas->Clear();
canvas->cd();
- MAPMT_activity[j]->SetTitle(h_name1.c_str());
+ MAPMT_activity[j]->SetTitle(m_h_name1.c_str());
MAPMT_activity[j]->SetMarkerStyle(6);
MAPMT_activity[j]->Draw("AP");
- MAPMT_activity[j]->SetName(h_name1.c_str());
+ MAPMT_activity[j]->SetName(m_h_name1.c_str());
canvas->cd()->Update();
- h_name1 += ".eps";
- canvas->Print(h_name1.c_str());
+ m_h_name1 += ".eps";
+ canvas->Print(m_h_name1.c_str());
}
delete canvas;
@@ -461,13 +461,13 @@ StatusCode ALFA_Raw2Digit::finalize()
POT_View->cd();
- s.str("");
- s << j+1;
- CanName = "h_MAPMT_activity_p_";
- CanName += s.str();
- CanName+=".eps";
+ m_s.str("");
+ m_s << j+1;
+ m_CanName = "h_MAPMT_activity_p_";
+ m_CanName += m_s.str();
+ m_CanName+=".eps";
- POT_View->Print(CanName.c_str());
+ POT_View->Print(m_CanName.c_str());
POT_View->Close();
}
@@ -525,57 +525,57 @@ StatusCode ALFA_Raw2Digit::mapping()
// int MBnum, DETnum;
-// mapname = "./mapping/motheboard2detector.dat";
-// inDet.open(mapname.c_str());
-// msg(MSG::DEBUG) << "file name " << mapname.c_str() << endmsg;
+// m_mapname = "./mapping/motheboard2detector.dat";
+// m_inDet.open(m_mapname.c_str());
+// msg(MSG::DEBUG) << "file name " << m_mapname.c_str() << endmsg;
// for (unsigned int i=0;i<64;i++) {
-// inDet >> MBnum >> DETnum;
-// mb2det[MBnum] = DETnum;
+// m_inDet >> MBnum >> DETnum;
+// m_mb2det[MBnum] = DETnum;
// }
- std::fill_n(&maroc2fiber[0][0][0], sizeof(maroc2fiber)/sizeof(int), -9999.0);
- std::fill_n(&maroc2mapmt[0][0][0], sizeof(maroc2mapmt)/sizeof(int), -9999.0);
- std::fill_n(&mapmt2maroc[0][0][0], sizeof(mapmt2maroc)/sizeof(int), -9999.0);
+ std::fill_n(&m_maroc2fiber[0][0][0], sizeof(m_maroc2fiber)/sizeof(int), -9999.0);
+ std::fill_n(&m_maroc2mapmt[0][0][0], sizeof(m_maroc2mapmt)/sizeof(int), -9999.0);
+ std::fill_n(&m_mapmt2maroc[0][0][0], sizeof(m_mapmt2maroc)/sizeof(int), -9999.0);
for (unsigned int j=0; j<8; j++)
{
- s.str("");
+ m_s.str("");
-// mapname = "mapping/MAROC_MAPMT_FIBER_MD";
+// m_mapname = "mapping/MAROC_MAPMT_FIBER_MD";
// changed by Petr - 19.12.2012 -------------------------------------------------
-// mapname = "MAROC_MAPMT_FIBER_MD";
- mapname = "MAROC_MAPMT_FIBER_NEW_MD_";
- s << j+1;
- mapname += s.str();
- mapname += ".dat";
+// m_mapname = "MAROC_MAPMT_FIBER_MD";
+ m_mapname = "MAROC_MAPMT_FIBER_NEW_MD_";
+ m_s << j+1;
+ m_mapname += m_s.str();
+ m_mapname += ".dat";
- msg(MSG::DEBUG) << "file name " << mapname.c_str() << endmsg;
+ msg(MSG::DEBUG) << "file name " << m_mapname.c_str() << endmsg;
// ************
- std::string filePath = PathResolver::find_file(mapname.c_str(),"DATAPATH", PathResolver::RecursiveSearch);
+ std::string filePath = PathResolver::find_file(m_mapname.c_str(),"DATAPATH", PathResolver::RecursiveSearch);
if(filePath.length() == 0)
{
- msg(MSG::FATAL) << " the mapping file MD maroc-mapmt \"" << mapname.c_str() << "\" not found in Datapath." << endmsg;
+ msg(MSG::FATAL) << " the mapping file MD maroc-mapmt \"" << m_mapname.c_str() << "\" not found in Datapath." << endmsg;
throw std::runtime_error("FATAL: mapping MD maroc-mapmt not found in Datapath.");
}
else
{
- msg(MSG::DEBUG) << "DEBUG: the mapping file MD maroc-mapmt \"" << mapname.c_str() << "\" found in Datapath." << endmsg;
+ msg(MSG::DEBUG) << "DEBUG: the mapping file MD maroc-mapmt \"" << m_mapname.c_str() << "\" found in Datapath." << endmsg;
msg(MSG::DEBUG) << "DEBUG: filePath = " << filePath.c_str() << endmsg;
}
// **************
-// inChan.open(mapname.c_str());
- inChan.open(filePath.c_str());
- if (inChan.is_open())
+// m_inChan.open(m_mapname.c_str());
+ m_inChan.open(filePath.c_str());
+ if (m_inChan.is_open())
{
// changed by Petr - 19.12.2012 ---------------------------------------------
// for (unsigned int i=0;i<64;i++){
for (unsigned int i=0;i<1280;i++){
-// inChan >> MarChan >> MapChan >> FibChan;
- inChan >> iLayer >> MarChan >> MapChan >> FibChan;
+// m_inChan >> MarChan >> MapChan >> FibChan;
+ m_inChan >> iLayer >> MarChan >> MapChan >> FibChan;
// msg(MSG::DEBUG) << i << " maroc_mapmt_fiber, maroc = " << MarChan << ", map = "<< MapChan << ", fib = " << FibChan << endmsg;
msg(MSG::DEBUG) << i << " maroc_mapmt_fiber, layer = " << iLayer << ", maroc = " << MarChan << ", map = "<< MapChan << ", fib = " << FibChan << endmsg;
@@ -597,47 +597,47 @@ StatusCode ALFA_Raw2Digit::mapping()
throw std::runtime_error(s2);
}
-// maroc2fiber[j][MarChan] = FibChan;
-// maroc2mapmt[j][MarChan] = MapChan;
-// mapmt2maroc[j][MapChan] = MarChan;
- maroc2fiber[j][iLayer][MarChan] = FibChan;
- maroc2mapmt[j][iLayer][MarChan] = MapChan;
- mapmt2maroc[j][iLayer][MapChan] = MarChan;
+// m_maroc2fiber[j][MarChan] = FibChan;
+// m_maroc2mapmt[j][MarChan] = MapChan;
+// m_mapmt2maroc[j][MapChan] = MarChan;
+ m_maroc2fiber[j][iLayer][MarChan] = FibChan;
+ m_maroc2mapmt[j][iLayer][MarChan] = MapChan;
+ m_mapmt2maroc[j][iLayer][MapChan] = MarChan;
}
- inChan.close();
+ m_inChan.close();
}
else
{
- msg(MSG::ERROR) << "the file " << mapname.c_str() << " was not open" << endmsg;
+ msg(MSG::ERROR) << "the file " << m_mapname.c_str() << " was not open" << endmsg;
return StatusCode::FAILURE;
}
-// mapname = "mapping/PMF_LAYER_MD";
- mapname = "PMF_LAYER_MD";
- mapname += s.str();
- mapname += ".dat";
- msg(MSG::DEBUG) << "file name " << mapname.c_str() << endmsg;
+// m_mapname = "mapping/PMF_LAYER_MD";
+ m_mapname = "PMF_LAYER_MD";
+ m_mapname += m_s.str();
+ m_mapname += ".dat";
+ msg(MSG::DEBUG) << "file name " << m_mapname.c_str() << endmsg;
// ************
- filePath = PathResolver::find_file(mapname.c_str(),"DATAPATH", PathResolver::RecursiveSearch);
+ filePath = PathResolver::find_file(m_mapname.c_str(),"DATAPATH", PathResolver::RecursiveSearch);
if(filePath.length() == 0)
{
- msg(MSG::FATAL) << " the mapping file PMF_LAYER_MD \"" << mapname.c_str() << "\" not found in Datapath." << endmsg;
+ msg(MSG::FATAL) << " the mapping file PMF_LAYER_MD \"" << m_mapname.c_str() << "\" not found in Datapath." << endmsg;
throw std::runtime_error("FATAL: mapping PMF_LAYER_MD not found in Datapath.");
}
else
{
- msg(MSG::DEBUG) << "DEBUG: the mapping file PMF_LAYER_MD \"" << mapname.c_str() << "\" found in Datapath." << endmsg;
+ msg(MSG::DEBUG) << "DEBUG: the mapping file PMF_LAYER_MD \"" << m_mapname.c_str() << "\" found in Datapath." << endmsg;
msg(MSG::DEBUG) << "DEBUG: filePath = " << filePath.c_str() << endmsg;
}
// **************
- inPMF.open(filePath.c_str());
- if (inPMF.is_open())
+ m_inPMF.open(filePath.c_str());
+ if (m_inPMF.is_open())
{
for (unsigned int i=0;i<20;i++)
{
- inPMF >> PMFNum >> LAYNum;
+ m_inPMF >> PMFNum >> LAYNum;
msg(MSG::DEBUG) << i << " pmf2layer, pmf = " << PMFNum << ", layer = "<< LAYNum << endmsg;
if ((PMFNum < 0) || ( PMFNum > 22))
@@ -647,39 +647,39 @@ StatusCode ALFA_Raw2Digit::mapping()
}
- pmf2layer[j][PMFNum] = LAYNum;
+ m_pmf2layer[j][PMFNum] = LAYNum;
// // layer2pmf[j][LAYNum] = PMFNum;
}
- inPMF.close();
+ m_inPMF.close();
}
else
{
- msg(MSG::WARNING) << "the file " << mapname.c_str() << " was not open" << endmsg;
+ msg(MSG::WARNING) << "the file " << m_mapname.c_str() << " was not open" << endmsg;
return StatusCode::FAILURE;
}
-// mapname="mapping/OD_MAP";
- mapname="OD_MAP";
- mapname += s.str();
- mapname+=".dat";
- msg(MSG::DEBUG) << "file name " << mapname.c_str() << endmsg;
+// m_mapname="mapping/OD_MAP";
+ m_mapname="OD_MAP";
+ m_mapname += m_s.str();
+ m_mapname+=".dat";
+ msg(MSG::DEBUG) << "file name " << m_mapname.c_str() << endmsg;
// ************
- filePath = PathResolver::find_file(mapname.c_str(),"DATAPATH", PathResolver::RecursiveSearch);
+ filePath = PathResolver::find_file(m_mapname.c_str(),"DATAPATH", PathResolver::RecursiveSearch);
if(filePath.length() == 0)
{
- msg(MSG::FATAL) << " the mapping file OD_MAP \"" << mapname.c_str() << "\" not found in Datapath." << endmsg;
+ msg(MSG::FATAL) << " the mapping file OD_MAP \"" << m_mapname.c_str() << "\" not found in Datapath." << endmsg;
throw std::runtime_error("FATAL: mapping OD_MAP not found in Datapath.");
}
else
{
- msg(MSG::DEBUG) << "DEBUG: the mapping file OD_MAP \"" << mapname.c_str() << "\" found in Datapath." << endmsg;
+ msg(MSG::DEBUG) << "DEBUG: the mapping file OD_MAP \"" << m_mapname.c_str() << "\" found in Datapath." << endmsg;
msg(MSG::DEBUG) << "DEBUG: filePath = " << filePath.c_str() << endmsg;
}
// **************
- inOD.open(filePath.c_str());
- if (inOD.is_open())
+ m_inOD.open(filePath.c_str());
+ if (m_inOD.is_open())
{
for(unsigned int jlay=0; jlay<3; jlay++)
{
@@ -687,7 +687,7 @@ StatusCode ALFA_Raw2Digit::mapping()
{
for(unsigned int jch=0; jch<32; jch++)
{
- inOD >> OD_PMFNum >> OD_Dieter >> OD_LAYNum >> OD_Side >> OD_MaPmtChan >> OD_FibChan; // warning!!! MaPmt, not Maroc!
+ m_inOD >> OD_PMFNum >> OD_Dieter >> OD_LAYNum >> OD_Side >> OD_MaPmtChan >> OD_FibChan; // warning!!! MaPmt, not Maroc!
msg(MSG::DEBUG) << " pmf2layer, OD_PMFNum = " << OD_PMFNum << ", OD_Dieter = "<< OD_Dieter << ", OD_LAYNum = " << OD_LAYNum << ", OD_Side = " << OD_Side << ", OD_MaPmtChan = " << OD_MaPmtChan << ", OD_FibChan = " << OD_FibChan << endmsg;
if ((OD_PMFNum < 2) || ( OD_PMFNum > 4))
@@ -703,33 +703,33 @@ StatusCode ALFA_Raw2Digit::mapping()
}
-// OD_pmf2layer[j][OD_PMFNum-1] = OD_LAYNum-1;
+// m_OD_pmf2layer[j][OD_PMFNum-1] = OD_LAYNum-1;
// OD_layer2pmf[j][OD_LAYNum-1] = OD_PMFNum-1;
// changed by Petr - 19.12.2012 ---------------------------------
-// OD_MarChan = mapmt2maroc[j][OD_MaPmtChan-1];
-// OD_MarChan = mapmt2maroc[j][OD_LAYNum-1][OD_MaPmtChan-1];
+// OD_MarChan = m_mapmt2maroc[j][OD_MaPmtChan-1];
+// OD_MarChan = m_mapmt2maroc[j][OD_LAYNum-1][OD_MaPmtChan-1];
//added to solve ATLAS coverity 13339 (only three OD layers are allowed)
if ((OD_LAYNum > 0) && ( OD_LAYNum < 4))
{
- OD_pmf2layer[j][OD_PMFNum-1] = OD_LAYNum-1;
- OD_MarChan = mapmt2maroc[j][OD_LAYNum-1][OD_MaPmtChan-1];
+ m_OD_pmf2layer[j][OD_PMFNum-1] = OD_LAYNum-1;
+ OD_MarChan = m_mapmt2maroc[j][OD_LAYNum-1][OD_MaPmtChan-1];
}
else
{
msg(MSG::DEBUG) << "OD_LAYNum out of bounds" << endmsg;
}
- OD_pmf_maroc2fiber[j][OD_PMFNum-1][OD_MarChan] = OD_FibChan-1;
- OD_pmf_maroc2side[j][OD_PMFNum-1][OD_MarChan] = OD_Side;
+ m_OD_pmf_maroc2fiber[j][OD_PMFNum-1][OD_MarChan] = OD_FibChan-1;
+ m_OD_pmf_maroc2side[j][OD_PMFNum-1][OD_MarChan] = OD_Side;
}
}
}
- inOD.close();
+ m_inOD.close();
}
else
{
- msg(MSG::WARNING) << "the file " << mapname.c_str() << " was not open" << endmsg;
+ msg(MSG::WARNING) << "the file " << m_mapname.c_str() << " was not open" << endmsg;
return StatusCode::FAILURE;
}
}
@@ -738,25 +738,25 @@ StatusCode ALFA_Raw2Digit::mapping()
}
// changed by Petr - 19.12.2012 ---------------------------------------------------------
-//StatusCode ALFA_Raw2Digit::ChanPlot(uint32_t pot_n, uint32_t MarChan, uint32_t &chan_i, uint32_t &chan_j)
+//StatusCode ALFA_Raw2Digit::ChanPlot(uint32_t pot_n, uint32_t MarChan, uint32_t &m_chan_i, uint32_t &m_chan_j)
StatusCode ALFA_Raw2Digit::ChanPlot(uint32_t pot_n, uint32_t iLayer, uint32_t MarChan, uint32_t &chan_i, uint32_t &chan_j)
{
// returs values in range 1-8; input is 0-63!
-// if (int(fmod(double(maroc2mapmt[pot_n][MarChan]+1),double(8)))>0)
- if (int(fmod(double(maroc2mapmt[pot_n][iLayer][MarChan]+1),double(8)))>0)
+// if (int(fmod(double(m_maroc2mapmt[pot_n][MarChan]+1),double(8)))>0)
+ if (int(fmod(double(m_maroc2mapmt[pot_n][iLayer][MarChan]+1),double(8)))>0)
{
-// chan_i=int((maroc2mapmt[pot_n][MarChan]+1)/8)+1;
-// chan_j=9-int(fmod(double(maroc2mapmt[pot_n][MarChan]+1),double(8)));
- chan_i=int((maroc2mapmt[pot_n][iLayer][MarChan]+1)/8)+1;
- chan_j=9-int(fmod(double(maroc2mapmt[pot_n][iLayer][MarChan]+1),double(8)));
+// chan_i=int((m_maroc2mapmt[pot_n][MarChan]+1)/8)+1;
+// chan_j=9-int(fmod(double(m_maroc2mapmt[pot_n][MarChan]+1),double(8)));
+ chan_i=int((m_maroc2mapmt[pot_n][iLayer][MarChan]+1)/8)+1;
+ chan_j=9-int(fmod(double(m_maroc2mapmt[pot_n][iLayer][MarChan]+1),double(8)));
}
else
{
-// chan_i=int((maroc2mapmt[pot_n][MarChan]+1)/8);
- chan_i=int((maroc2mapmt[pot_n][iLayer][MarChan]+1)/8);
+// chan_i=int((m_maroc2mapmt[pot_n][MarChan]+1)/8);
+ chan_i=int((m_maroc2mapmt[pot_n][iLayer][MarChan]+1)/8);
chan_j=1;
}
-// msg(MSG::FATAL) << "in funct: fibID = " << MarChan << ", chan_i " << chan_i << ", chan_j = " << chan_j << endmsg;
+// msg(MSG::FATAL) << "in funct: m_fibID = " << MarChan << ", chan_i " << chan_i << ", chan_j = " << chan_j << endmsg;
return StatusCode::SUCCESS;
}
--
GitLab