diff --git a/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalBCMTool.cxx b/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalBCMTool.cxx
index 6b0737671768c447ffea361d415c77237aff80c2..d6f9585cad71140d7afed9aaf02f030424af5b0c 100755
--- a/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalBCMTool.cxx
+++ b/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalBCMTool.cxx
@@ -1,3 +1,4 @@
+
 /*
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
@@ -63,30 +64,30 @@ InDetGlobalBCMTool::InDetGlobalBCMTool(
 				       const IInterface* parent)
   : InDetGlobalMotherMonTool(type, name, parent),
     m_detector("ID"),
-    pulse_width_all{nullptr,nullptr},
-    hits_lvl1a{nullptr,nullptr},
-    hits_bcid{nullptr, nullptr},
-    hitdistribution{nullptr, nullptr},
-    pulse_position_gen{nullptr, nullptr},
-    pulse_width_gen{nullptr, nullptr},
-    strange_signals{nullptr, nullptr},
-    highocc(nullptr),
-    deltat_vs_hits{nullptr,nullptr},
-    deltat_aligned_vs_hits{nullptr,nullptr},
-    deltat_vs_bcid{nullptr,nullptr},
-    deltat_aligned_vs_bcid{nullptr,nullptr},
-    deltat_vs_lb{nullptr,nullptr},
-    deltat_aligned_vs_lb{nullptr,nullptr},
-    deltat_vs_ecr{nullptr,nullptr},
-    deltat_aligned_vs_ecr{nullptr,nullptr},
-    deltat_vs_PrVertex{nullptr,nullptr},
-    deltat_vs_pixhits{nullptr,nullptr},
-    deltat_vs_pixhitsEC{nullptr,nullptr},
-    deltat_vs_pixhitsBR{nullptr,nullptr},
-    deltat_vs_scthits{nullptr,nullptr},
-    deltat_vs_scthitsBR{nullptr,nullptr},
-    sct_vs_pix_col{nullptr,nullptr},
-    sct_vs_pix_bkg{nullptr,nullptr}
+    m_pulse_width_all{nullptr,nullptr},
+    m_hits_lvl1a{nullptr,nullptr},
+    m_hits_bcid{nullptr, nullptr},
+    m_hitdistribution{nullptr, nullptr},
+    m_pulse_position_gen{nullptr, nullptr},
+    m_pulse_width_gen{nullptr, nullptr},
+    m_strange_signals{nullptr, nullptr},
+    m_highocc(nullptr),
+    m_deltat_vs_hits{nullptr,nullptr},
+    m_deltat_aligned_vs_hits{nullptr,nullptr},
+    m_deltat_vs_bcid{nullptr,nullptr},
+    m_deltat_aligned_vs_bcid{nullptr,nullptr},
+    m_deltat_vs_lb{nullptr,nullptr},
+    m_deltat_aligned_vs_lb{nullptr,nullptr},
+    m_deltat_vs_ecr{nullptr,nullptr},
+    m_deltat_aligned_vs_ecr{nullptr,nullptr},
+    m_deltat_vs_PrVertex{nullptr,nullptr},
+    m_deltat_vs_pixhits{nullptr,nullptr},
+    m_deltat_vs_pixhitsEC{nullptr,nullptr},
+    m_deltat_vs_pixhitsBR{nullptr,nullptr},
+    m_deltat_vs_scthits{nullptr,nullptr},
+    m_deltat_vs_scthitsBR{nullptr,nullptr},
+    m_sct_vs_pix_col{nullptr,nullptr},
+    m_sct_vs_pix_bkg{nullptr,nullptr}
 {
   declareProperty("Detector", m_detector); 
   declareProperty("vxContainerName",m_vxContainerName="VxPrimaryCandidate");
@@ -115,105 +116,105 @@ StatusCode InDetGlobalBCMTool::bookHistogramsRecurrent()
 
     name = "HitsVsLvl1AAll";
     title = "Hits vs LVL1A All";
-    registerHist(monGr_GlobalHistograms,hits_lvl1a_all = new TH1F(name.c_str(),title.c_str(),32,0,32));
-    hits_lvl1a_all->GetXaxis()->SetTitle("lvl1a [25 ns]");
-    hits_lvl1a_all->GetYaxis()->SetTitle("# of hits");
+    registerHist(monGr_GlobalHistograms,m_hits_lvl1a_all = new TH1F(name.c_str(),title.c_str(),32,0,32));
+    m_hits_lvl1a_all->GetXaxis()->SetTitle("lvl1a [25 ns]");
+    m_hits_lvl1a_all->GetYaxis()->SetTitle("# of hits");
 
     name = "ChannelVsLvl1a";
     title = "Channel vs LVL1 A";
-    registerHist(monGr_GlobalHistograms,ChannelVsLvl1a = new TH2F(name.c_str(), title.c_str(), 64, 0, 64, 16, 0, 16));
-    ChannelVsLvl1a->GetXaxis()->SetTitle("LVL1 A [25 ns]");
-    ChannelVsLvl1a->GetYaxis()->SetTitle("Channel #");
+    registerHist(monGr_GlobalHistograms,m_ChannelVsLvl1a = new TH2F(name.c_str(), title.c_str(), 64, 0, 64, 16, 0, 16));
+    m_ChannelVsLvl1a->GetXaxis()->SetTitle("LVL1 A [25 ns]");
+    m_ChannelVsLvl1a->GetYaxis()->SetTitle("Channel #");
     
     name = "ChannelVsBCID";
     title = "Channel vs BCID";
-    registerHist(monGr_GlobalHistograms,ChannelVsBCID = new TH2F(name.c_str(),title.c_str(), bcids_displayed,bcid_start, bcid_start+bcids_displayed, 16, 0,16));
-    ChannelVsBCID->GetXaxis()->SetTitle("BCID [25 ns]");
-    ChannelVsBCID->GetYaxis()->SetTitle("Channel #");
+    registerHist(monGr_GlobalHistograms,m_ChannelVsBCID = new TH2F(name.c_str(),title.c_str(), bcids_displayed,bcid_start, bcid_start+bcids_displayed, 16, 0,16));
+    m_ChannelVsBCID->GetXaxis()->SetTitle("BCID [25 ns]");
+    m_ChannelVsBCID->GetYaxis()->SetTitle("Channel #");
     
     name = "ChannelVsECR";
     title = "Channel vs ECR";
-    registerHist(monGr_GlobalHistograms,ChannelVsECR = new TH2F(name.c_str(), title.c_str(), 256, 0, 256, 16, 0, 16));
-    ChannelVsECR->GetXaxis()->SetTitle("ECR [5 s]");
-    ChannelVsECR->GetYaxis()->SetTitle("Channel #");
+    registerHist(monGr_GlobalHistograms,m_ChannelVsECR = new TH2F(name.c_str(), title.c_str(), 256, 0, 256, 16, 0, 16));
+    m_ChannelVsECR->GetXaxis()->SetTitle("ECR [5 s]");
+    m_ChannelVsECR->GetYaxis()->SetTitle("Channel #");
 
     name = "NumberOfEvents";
     title = "Number of monitored events";
-    registerHist(monGr_GlobalHistograms,NumberOfEvents = new TH1F(name.c_str(), title.c_str(), 3,0,3));
-    NumberOfEvents->GetXaxis()->SetTitle("sourceID [0=BCM, 1=LowHorizontal, 2=LowVertical]");
-    NumberOfEvents->GetYaxis()->SetTitle("# of events");    
+    registerHist(monGr_GlobalHistograms,m_NumberOfEvents = new TH1F(name.c_str(), title.c_str(), 3,0,3));
+    m_NumberOfEvents->GetXaxis()->SetTitle("sourceID [0=BCM, 1=LowHorizontal, 2=LowVertical]");
+    m_NumberOfEvents->GetYaxis()->SetTitle("# of events");    
 
     name = "AbortFraction";
     title = "Abort Fraction";
-    registerHist(monGr_GlobalHistograms,AbortFraction = new TH1F(name.c_str(), title.c_str(), 101, 0, 101));
-    AbortFraction->GetXaxis()->SetTitle("Abort Fraction %");
-    AbortFraction->GetYaxis()->SetTitle("# of Hits");
+    registerHist(monGr_GlobalHistograms,m_AbortFraction = new TH1F(name.c_str(), title.c_str(), 101, 0, 101));
+    m_AbortFraction->GetXaxis()->SetTitle("Abort Fraction %");
+    m_AbortFraction->GetYaxis()->SetTitle("# of Hits");
 
     name = "AbortFractionROD0";
     title = "Abort Fraction ROD0";
-    registerHist(monGr_GlobalHistograms,AbortFractionROD0 = new TH1F(name.c_str(), title.c_str(), 101, 0, 101));
-    AbortFractionROD0->GetXaxis()->SetTitle("Abort Fraction %");
-    AbortFractionROD0->GetYaxis()->SetTitle("# of Hits");
+    registerHist(monGr_GlobalHistograms,m_AbortFractionROD0 = new TH1F(name.c_str(), title.c_str(), 101, 0, 101));
+    m_AbortFractionROD0->GetXaxis()->SetTitle("Abort Fraction %");
+    m_AbortFractionROD0->GetYaxis()->SetTitle("# of Hits");
 
     name = "AbortFractionROD1";
     title = "Abort Fraction ROD1";
-    registerHist(monGr_GlobalHistograms,AbortFractionROD1 = new TH1F(name.c_str(), title.c_str(), 101, 0, 101));
-    AbortFractionROD1->GetXaxis()->SetTitle("Abort Fraction %");
-    AbortFractionROD1->GetYaxis()->SetTitle("# of Hits");
+    registerHist(monGr_GlobalHistograms,m_AbortFractionROD1 = new TH1F(name.c_str(), title.c_str(), 101, 0, 101));
+    m_AbortFractionROD1->GetXaxis()->SetTitle("Abort Fraction %");
+    m_AbortFractionROD1->GetYaxis()->SetTitle("# of Hits");
 
     name = "AbortFractionVsBCID";
     title = "Abort Fraction Vs BCID";
-    registerHist(monGr_GlobalHistograms,AbortFractionVsBCID = new TH1F(name.c_str(), title.c_str(), 3563, 0, 3563));
-    AbortFractionVsBCID->GetXaxis()->SetTitle("BCID [25 ns]");
-    AbortFractionVsBCID->GetYaxis()->SetTitle("Abort Fraction %");
+    registerHist(monGr_GlobalHistograms,m_AbortFractionVsBCID = new TH1F(name.c_str(), title.c_str(), 3563, 0, 3563));
+    m_AbortFractionVsBCID->GetXaxis()->SetTitle("BCID [25 ns]");
+    m_AbortFractionVsBCID->GetYaxis()->SetTitle("Abort Fraction %");
 
     name = "AbortFractionROD0VsBCID";
     title = "Abort Fraction ROD0 Vs BCID";
-    registerHist(monGr_GlobalHistograms,AbortFractionROD0VsBCID = new TH1F(name.c_str(), title.c_str(), 3563, 0, 3563));
-    AbortFractionROD0VsBCID->GetXaxis()->SetTitle("BCID [25 ns]");
-    AbortFractionROD0VsBCID->GetYaxis()->SetTitle("Abort Fraction %");
+    registerHist(monGr_GlobalHistograms,m_AbortFractionROD0VsBCID = new TH1F(name.c_str(), title.c_str(), 3563, 0, 3563));
+    m_AbortFractionROD0VsBCID->GetXaxis()->SetTitle("BCID [25 ns]");
+    m_AbortFractionROD0VsBCID->GetYaxis()->SetTitle("Abort Fraction %");
 
     name = "AbortFractionROD1VsBCID";
     title = "Abort Fraction ROD1 Vs BCID";
-    registerHist(monGr_GlobalHistograms,AbortFractionROD1VsBCID = new TH1F(name.c_str(), title.c_str(), 3563, 0, 3563));
-    AbortFractionROD1VsBCID->GetXaxis()->SetTitle("BCID [25 ns]");
-    AbortFractionROD1VsBCID->GetYaxis()->SetTitle("Abort Fraction %");
+    registerHist(monGr_GlobalHistograms,m_AbortFractionROD1VsBCID = new TH1F(name.c_str(), title.c_str(), 3563, 0, 3563));
+    m_AbortFractionROD1VsBCID->GetXaxis()->SetTitle("BCID [25 ns]");
+    m_AbortFractionROD1VsBCID->GetYaxis()->SetTitle("Abort Fraction %");
 
     name = "AbortFractionVsECR";
     title = "Abort Fraction Vs ECR";
-    registerHist(monGr_GlobalHistograms,AbortFractionVsECR = new TH1F(name.c_str(), title.c_str(), 256, 0, 256));
-    AbortFractionVsECR->GetXaxis()->SetTitle("ECR [5 s]");
-    AbortFractionVsECR->GetYaxis()->SetTitle("Abort Fraction %");
+    registerHist(monGr_GlobalHistograms,m_AbortFractionVsECR = new TH1F(name.c_str(), title.c_str(), 256, 0, 256));
+    m_AbortFractionVsECR->GetXaxis()->SetTitle("ECR [5 s]");
+    m_AbortFractionVsECR->GetYaxis()->SetTitle("Abort Fraction %");
 
     name = "AbortFractionVsLB";
     title = "Abort Fraction Vs LB";
-    registerHist(monGr_GlobalHistograms,AbortFractionVsLB = new TH2F(name.c_str(), title.c_str(), lb_max, lb_start, lb_max, 100, 0, 1));
-    AbortFractionVsLB->GetXaxis()->SetTitle("LB");
-    AbortFractionVsLB->GetYaxis()->SetTitle("Abort Fraction %");
+    registerHist(monGr_GlobalHistograms,m_AbortFractionVsLB = new TH2F(name.c_str(), title.c_str(), lb_max, lb_start, lb_max, 100, 0, 1));
+    m_AbortFractionVsLB->GetXaxis()->SetTitle("LB");
+    m_AbortFractionVsLB->GetYaxis()->SetTitle("Abort Fraction %");
 
     name = "AbortFractionROD0VsECR";
     title = "Abort Fraction ROD0 Vs ECR";
-    registerHist(monGr_GlobalHistograms,AbortFractionROD0VsECR = new TH1F(name.c_str(), title.c_str(), 256, 0, 256));
-    AbortFractionROD0VsECR->GetXaxis()->SetTitle("ECR [5 s]");
-    AbortFractionROD0VsECR->GetYaxis()->SetTitle("Abort Fraction %");
+    registerHist(monGr_GlobalHistograms,m_AbortFractionROD0VsECR = new TH1F(name.c_str(), title.c_str(), 256, 0, 256));
+    m_AbortFractionROD0VsECR->GetXaxis()->SetTitle("ECR [5 s]");
+    m_AbortFractionROD0VsECR->GetYaxis()->SetTitle("Abort Fraction %");
 
     name = "AbortFractionROD1VsECR";
     title = "Abort Fraction ROD1 Vs ECR";
-    registerHist(monGr_GlobalHistograms,AbortFractionROD1VsECR = new TH1F(name.c_str(), title.c_str(), 256, 0, 256));
-    AbortFractionROD1VsECR->GetXaxis()->SetTitle("BCID [5 s]");
-    AbortFractionROD1VsECR->GetYaxis()->SetTitle("Abort Fraction %");
+    registerHist(monGr_GlobalHistograms,m_AbortFractionROD1VsECR = new TH1F(name.c_str(), title.c_str(), 256, 0, 256));
+    m_AbortFractionROD1VsECR->GetXaxis()->SetTitle("BCID [5 s]");
+    m_AbortFractionROD1VsECR->GetYaxis()->SetTitle("Abort Fraction %");
 
     name = "timewalkAll";
     title = "timewalk All";
-    registerHist(monGr_GlobalHistograms,timewalk_all = new TH2F(name.c_str(),title.c_str(),64, 0, 64, 32, 0, 32));
-    timewalk_all->GetXaxis()->SetTitle("pulse pos in time bins [25/64 ns]");
-    timewalk_all->GetYaxis()->SetTitle("pulse width in time bins [25/64 ns]");
+    registerHist(monGr_GlobalHistograms,m_timewalk_all = new TH2F(name.c_str(),title.c_str(),64, 0, 64, 32, 0, 32));
+    m_timewalk_all->GetXaxis()->SetTitle("pulse pos in time bins [25/64 ns]");
+    m_timewalk_all->GetYaxis()->SetTitle("pulse width in time bins [25/64 ns]");
 
     name = "NumberHighOccupancyEventsVsLB";
     title = "Number of High Occupancy Events Vs LB";
-    registerHist(monGr_GlobalHistograms, highocc = new TH1F(name.c_str(),title.c_str(), lb_max, lb_start, lb_max));
-    highocc->GetXaxis()->SetTitle("LB number");
-    highocc->GetYaxis()->SetTitle("Number of High Occupancy Events");
+    registerHist(monGr_GlobalHistograms, m_highocc = new TH1F(name.c_str(),title.c_str(), lb_max, lb_start, lb_max));
+    m_highocc->GetXaxis()->SetTitle("LB number");
+    m_highocc->GetYaxis()->SetTitle("Number of High Occupancy Events");
 
 
     // station_nr=0 for A-side, 1 for C-side
@@ -227,153 +228,153 @@ StatusCode InDetGlobalBCMTool::bookHistogramsRecurrent()
 
 	name = "PulsePositionAll";
 	title = "Pulse Position All";
-	registerHist(monGr_GlobalHistograms,pulse_position_all[gain_value] = new TH1F(name.c_str(),title.c_str(),64, 0, 64));
-	pulse_position_all[gain_value]->GetXaxis()->SetTitle("time bins [25/64 ns]");
-	pulse_position_all[gain_value]->GetYaxis()->SetTitle("# of hits");
+	registerHist(monGr_GlobalHistograms,m_pulse_position_all[gain_value] = new TH1F(name.c_str(),title.c_str(),64, 0, 64));
+	m_pulse_position_all[gain_value]->GetXaxis()->SetTitle("time bins [25/64 ns]");
+	m_pulse_position_all[gain_value]->GetYaxis()->SetTitle("# of hits");
 
 	name = "PulseWidthAll";
 	title = "Pulse Width All";
-	registerHist(monGr_GlobalHistograms,pulse_width_all[gain_value] = new TH1F(name.c_str(),title.c_str(),32, 0, 32));
-	pulse_width_all[gain_value]->GetXaxis()->SetTitle("time bins [25/64 ns]");
-	pulse_width_all[gain_value]->GetYaxis()->SetTitle("# of hits");
+	registerHist(monGr_GlobalHistograms,m_pulse_width_all[gain_value] = new TH1F(name.c_str(),title.c_str(),32, 0, 32));
+	m_pulse_width_all[gain_value]->GetXaxis()->SetTitle("time bins [25/64 ns]");
+	m_pulse_width_all[gain_value]->GetYaxis()->SetTitle("# of hits");
 	
 	name = "HitDistribution" + gain + "Gain";
 	title = "Hits vs Channel " + gain + " Gain";
-	registerHist(monGr_GlobalHistograms,hitdistribution[gain_value] = new TH1F(name.c_str(),title.c_str(),8,0,8));
-	hitdistribution[gain_value]->GetXaxis()->SetTitle("detector");
-	hitdistribution[gain_value]->GetYaxis()->SetTitle("# of hits");
+	registerHist(monGr_GlobalHistograms,m_hitdistribution[gain_value] = new TH1F(name.c_str(),title.c_str(),8,0,8));
+	m_hitdistribution[gain_value]->GetXaxis()->SetTitle("detector");
+	m_hitdistribution[gain_value]->GetYaxis()->SetTitle("# of hits");
 
 	name = "HitsVsLvl1A" + gain + "Gain";
 	title = "Hits vs LVL1 A  " + gain + " Gain";
-	registerHist(monGr_GlobalHistograms,hits_lvl1a[gain_value] = new TH1F(name.c_str(),title.c_str(),32,0,32));
-	hits_lvl1a[gain_value]->GetXaxis()->SetTitle("lvl1a [25 ns]");
-	hits_lvl1a[gain_value]->GetYaxis()->SetTitle("# of hits");
+	registerHist(monGr_GlobalHistograms,m_hits_lvl1a[gain_value] = new TH1F(name.c_str(),title.c_str(),32,0,32));
+	m_hits_lvl1a[gain_value]->GetXaxis()->SetTitle("lvl1a [25 ns]");
+	m_hits_lvl1a[gain_value]->GetYaxis()->SetTitle("# of hits");
        
 	name = "HitsVsBCID" + gain + "Gain";
 	title = "Hits vs BCID  " + gain + " Gain";
-	registerHist(monGr_GlobalHistograms,hits_bcid[gain_value] = new TH1F(name.c_str(),title.c_str(), bcids_displayed, bcid_start, bcid_start+bcids_displayed));
-	hits_bcid[gain_value]->GetXaxis()->SetTitle("BCID [25 ns]");
-	hits_bcid[gain_value]->GetYaxis()->SetTitle("# of hits");\
+	registerHist(monGr_GlobalHistograms,m_hits_bcid[gain_value] = new TH1F(name.c_str(),title.c_str(), bcids_displayed, bcid_start, bcid_start+bcids_displayed));
+	m_hits_bcid[gain_value]->GetXaxis()->SetTitle("BCID [25 ns]");
+	m_hits_bcid[gain_value]->GetYaxis()->SetTitle("# of hits");\
 	
 	name = "StrangeSignals" + gain + "Gain";
 	title = "Strange Signals  " + gain + " Gain";
-	registerHist(monGr_GlobalHistograms,strange_signals[gain_value] = new TH1F(name.c_str(),title.c_str(),16,0,16));
-	strange_signals[gain_value]->GetXaxis()->SetTitle("Channel");
-	strange_signals[gain_value]->GetYaxis()->SetTitle("# of hits");
+	registerHist(monGr_GlobalHistograms,m_strange_signals[gain_value] = new TH1F(name.c_str(),title.c_str(),16,0,16));
+	m_strange_signals[gain_value]->GetXaxis()->SetTitle("Channel");
+	m_strange_signals[gain_value]->GetYaxis()->SetTitle("# of hits");
 
 	name = "PulsePosition" + gain + "Gain";
 	title = "Pulse Position  " + gain + " Gain";
-	registerHist(monGr_GlobalHistograms,pulse_position_gen[gain_value] = new TH1F(name.c_str(),title.c_str(),64, 0, 64));
-	pulse_position_gen[gain_value]->GetXaxis()->SetTitle("time bins [25/64 ns]");
-	pulse_position_gen[gain_value]->GetYaxis()->SetTitle("# of hits");
+	registerHist(monGr_GlobalHistograms,m_pulse_position_gen[gain_value] = new TH1F(name.c_str(),title.c_str(),64, 0, 64));
+	m_pulse_position_gen[gain_value]->GetXaxis()->SetTitle("time bins [25/64 ns]");
+	m_pulse_position_gen[gain_value]->GetYaxis()->SetTitle("# of hits");
 
 	name = "PulseWidth" + gain + "Gain";
 	title = "Pulse Width  " + gain + " Gain";
-	registerHist(monGr_GlobalHistograms,pulse_width_gen[gain_value] = new TH1F(name.c_str(),title.c_str(),32, 0, 32));
-	pulse_width_gen[gain_value]->GetXaxis()->SetTitle("time bins [25/64 ns]");
-	pulse_width_gen[gain_value]->GetYaxis()->SetTitle("# of hits");
+	registerHist(monGr_GlobalHistograms,m_pulse_width_gen[gain_value] = new TH1F(name.c_str(),title.c_str(),32, 0, 32));
+	m_pulse_width_gen[gain_value]->GetXaxis()->SetTitle("time bins [25/64 ns]");
+	m_pulse_width_gen[gain_value]->GetYaxis()->SetTitle("# of hits");
 
 	name = "Deltat" + gain + "Gain";
 	title = "#Delta t " + gain + " Gain";
-	registerHist(monGr_GlobalHistograms, deltat_vs_hits[gain_value] = new TH1F(name.c_str(),title.c_str(),50,-25,25));
-	deltat_vs_hits[gain_value]->GetXaxis()->SetTitle("#Delta t [ns]");
-	deltat_vs_hits[gain_value]->GetYaxis()->SetTitle("# of hits");
+	registerHist(monGr_GlobalHistograms, m_deltat_vs_hits[gain_value] = new TH1F(name.c_str(),title.c_str(),50,-25,25));
+	m_deltat_vs_hits[gain_value]->GetXaxis()->SetTitle("#Delta t [ns]");
+	m_deltat_vs_hits[gain_value]->GetYaxis()->SetTitle("# of hits");
 	
 	name = "DeltatAligned" + gain + "Gain";
 	title = "#Delta t Aligned " + gain + " Gain";
-	registerHist(monGr_GlobalHistograms, deltat_aligned_vs_hits[gain_value] = new TH1F(name.c_str(),title.c_str(),50,-25,25));
-	deltat_aligned_vs_hits[gain_value]->GetXaxis()->SetTitle("#Delta t [ns]");
-	deltat_aligned_vs_hits[gain_value]->GetYaxis()->SetTitle("# of hits");
+	registerHist(monGr_GlobalHistograms, m_deltat_aligned_vs_hits[gain_value] = new TH1F(name.c_str(),title.c_str(),50,-25,25));
+	m_deltat_aligned_vs_hits[gain_value]->GetXaxis()->SetTitle("#Delta t [ns]");
+	m_deltat_aligned_vs_hits[gain_value]->GetYaxis()->SetTitle("# of hits");
 	
 	name = "DeltatVsBCID" + gain + "Gain";
 	title = "#Delta t vs BCID " + gain + " Gain";
-	registerHist(monGr_GlobalHistograms, deltat_vs_bcid[gain_value] = new TH2F(name.c_str(),title.c_str(), bcids_displayed,bcid_start, bcid_start+bcids_displayed,50,-25,25));
-	deltat_vs_bcid[gain_value]->GetXaxis()->SetTitle("BCID [25 ns]");
-	deltat_vs_bcid[gain_value]->GetYaxis()->SetTitle("#Delta t [ns]");
+	registerHist(monGr_GlobalHistograms, m_deltat_vs_bcid[gain_value] = new TH2F(name.c_str(),title.c_str(), bcids_displayed,bcid_start, bcid_start+bcids_displayed,50,-25,25));
+	m_deltat_vs_bcid[gain_value]->GetXaxis()->SetTitle("BCID [25 ns]");
+	m_deltat_vs_bcid[gain_value]->GetYaxis()->SetTitle("#Delta t [ns]");
 
 	name = "DeltatAlignedVsBCID" + gain + "Gain";
 	title = "#Delta t Aligned vs BCID " + gain + " Gain";
-	registerHist(monGr_GlobalHistograms, deltat_aligned_vs_bcid[gain_value] = new TH2F(name.c_str(),title.c_str(), bcids_displayed,bcid_start, bcid_start+bcids_displayed,50,-25,25));
-	deltat_aligned_vs_bcid[gain_value]->GetXaxis()->SetTitle("BCID [25 ns]");
-	deltat_aligned_vs_bcid[gain_value]->GetYaxis()->SetTitle("#Delta t [ns]");
+	registerHist(monGr_GlobalHistograms, m_deltat_aligned_vs_bcid[gain_value] = new TH2F(name.c_str(),title.c_str(), bcids_displayed,bcid_start, bcid_start+bcids_displayed,50,-25,25));
+	m_deltat_aligned_vs_bcid[gain_value]->GetXaxis()->SetTitle("BCID [25 ns]");
+	m_deltat_aligned_vs_bcid[gain_value]->GetYaxis()->SetTitle("#Delta t [ns]");
 
 	name = "DeltatVsLB" + gain + "Gain";
 	title = "#Delta t vs LB " + gain + " Gain";
-	registerHist(monGr_GlobalHistograms, deltat_vs_lb[gain_value] = new TH2F(name.c_str(),title.c_str(), lb_max, lb_start, lb_max, 50,-25,25));
-	deltat_vs_lb[gain_value]->GetXaxis()->SetTitle("LB number");
-	deltat_vs_lb[gain_value]->GetYaxis()->SetTitle("#Delta t [ns]");
+	registerHist(monGr_GlobalHistograms, m_deltat_vs_lb[gain_value] = new TH2F(name.c_str(),title.c_str(), lb_max, lb_start, lb_max, 50,-25,25));
+	m_deltat_vs_lb[gain_value]->GetXaxis()->SetTitle("LB number");
+	m_deltat_vs_lb[gain_value]->GetYaxis()->SetTitle("#Delta t [ns]");
 
 	name = "DeltatAlignedVsLB" + gain + "Gain";
 	title = "#Delta t Aligned vs LB " + gain + " Gain";
-	registerHist(monGr_GlobalHistograms, deltat_aligned_vs_lb[gain_value] = new TH2F(name.c_str(),title.c_str(), lb_max, lb_start, lb_max, 50,-25,25));
-	deltat_aligned_vs_lb[gain_value]->GetXaxis()->SetTitle("LB number");
-	deltat_aligned_vs_lb[gain_value]->GetYaxis()->SetTitle("#Delta t [ns]");
+	registerHist(monGr_GlobalHistograms, m_deltat_aligned_vs_lb[gain_value] = new TH2F(name.c_str(),title.c_str(), lb_max, lb_start, lb_max, 50,-25,25));
+	m_deltat_aligned_vs_lb[gain_value]->GetXaxis()->SetTitle("LB number");
+	m_deltat_aligned_vs_lb[gain_value]->GetYaxis()->SetTitle("#Delta t [ns]");
 
 	name = "DeltatVsECR" + gain + "Gain";
 	title = "#Delta t vs ECR " + gain + " Gain";
-	registerHist(monGr_GlobalHistograms, deltat_vs_ecr[gain_value] = new TH2F(name.c_str(),title.c_str(), ecrs_displayed,ecr_start, ecr_start+ecrs_displayed,50,-25,25));
-	deltat_vs_ecr[gain_value]->GetXaxis()->SetTitle("ECR");
-	deltat_vs_ecr[gain_value]->GetYaxis()->SetTitle("#Delta t [ns]");
+	registerHist(monGr_GlobalHistograms, m_deltat_vs_ecr[gain_value] = new TH2F(name.c_str(),title.c_str(), ecrs_displayed,ecr_start, ecr_start+ecrs_displayed,50,-25,25));
+	m_deltat_vs_ecr[gain_value]->GetXaxis()->SetTitle("ECR");
+	m_deltat_vs_ecr[gain_value]->GetYaxis()->SetTitle("#Delta t [ns]");
 
 	name = "DeltatAlignedVsECR" + gain + "Gain";
 	title = "#Delta t Aligned vs ECR " + gain + " Gain";
-	registerHist(monGr_GlobalHistograms, deltat_aligned_vs_ecr[gain_value] = new TH2F(name.c_str(),title.c_str(), ecrs_displayed,ecr_start, ecr_start+ecrs_displayed,50,-25,25));
-	deltat_aligned_vs_ecr[gain_value]->GetXaxis()->SetTitle("ECR");
-	deltat_aligned_vs_ecr[gain_value]->GetYaxis()->SetTitle("#Delta t [ns]");
+	registerHist(monGr_GlobalHistograms, m_deltat_aligned_vs_ecr[gain_value] = new TH2F(name.c_str(),title.c_str(), ecrs_displayed,ecr_start, ecr_start+ecrs_displayed,50,-25,25));
+	m_deltat_aligned_vs_ecr[gain_value]->GetXaxis()->SetTitle("ECR");
+	m_deltat_aligned_vs_ecr[gain_value]->GetYaxis()->SetTitle("#Delta t [ns]");
 
 	name = "DeltatVsPrVertex" + gain + "Gain";
 	title = "#Delta t vs Primary Vertex " + gain + " Gain";
-	registerHist(monGr_GlobalHistograms, deltat_vs_PrVertex[gain_value] = new TH2F(name.c_str(),title.c_str(),100,-200,200,50,-25,25));
-	deltat_vs_PrVertex[gain_value]->GetXaxis()->SetTitle("Primary Vertex z position [mm] ");
-	deltat_vs_PrVertex[gain_value]->GetYaxis()->SetTitle("#Delta t [ns]");
+	registerHist(monGr_GlobalHistograms, m_deltat_vs_PrVertex[gain_value] = new TH2F(name.c_str(),title.c_str(),100,-200,200,50,-25,25));
+	m_deltat_vs_PrVertex[gain_value]->GetXaxis()->SetTitle("Primary Vertex z position [mm] ");
+	m_deltat_vs_PrVertex[gain_value]->GetYaxis()->SetTitle("#Delta t [ns]");
 
 	name = "DeltatVsPixelHits" + gain + "Gain";
 	title = "#Delta t vs NumberPixelHits " + gain + " Gain";
-	registerHist(monGr_GlobalHistograms, deltat_vs_pixhits[gain_value] = new TH2F(name.c_str(),title.c_str(), 100, 0, 10000, 50,-25,25));
-	deltat_vs_pixhits[gain_value]->GetXaxis()->SetTitle("Number Pixel Hits");
-	deltat_vs_pixhits[gain_value]->GetYaxis()->SetTitle("#Delta t [ns]");
+	registerHist(monGr_GlobalHistograms, m_deltat_vs_pixhits[gain_value] = new TH2F(name.c_str(),title.c_str(), 100, 0, 10000, 50,-25,25));
+	m_deltat_vs_pixhits[gain_value]->GetXaxis()->SetTitle("Number Pixel Hits");
+	m_deltat_vs_pixhits[gain_value]->GetYaxis()->SetTitle("#Delta t [ns]");
 	  
 	name = "DeltatVsPixelHitsBR" + gain + "Gain";
 	title = "#Delta t vs NumberPixelHits in Barrel " + gain + " Gain";
-	registerHist(monGr_GlobalHistograms, deltat_vs_pixhitsBR[gain_value] = new TH2F(name.c_str(),title.c_str(), 100, 0, 10000, 50,-25,25));
-	deltat_vs_pixhitsBR[gain_value]->GetXaxis()->SetTitle("Number Barrel Pixel Hits");
-	deltat_vs_pixhitsBR[gain_value]->GetYaxis()->SetTitle("#Delta t [ns]");
+	registerHist(monGr_GlobalHistograms, m_deltat_vs_pixhitsBR[gain_value] = new TH2F(name.c_str(),title.c_str(), 100, 0, 10000, 50,-25,25));
+	m_deltat_vs_pixhitsBR[gain_value]->GetXaxis()->SetTitle("Number Barrel Pixel Hits");
+	m_deltat_vs_pixhitsBR[gain_value]->GetYaxis()->SetTitle("#Delta t [ns]");
 	  
 	name = "DeltatVsPixelHitsEC" + gain + "Gain";
 	title = "#Delta t vs NumberPixelHits in Endcap " + gain + " Gain";
-	registerHist(monGr_GlobalHistograms, deltat_vs_pixhitsEC[gain_value] = new TH2F(name.c_str(),title.c_str(), 100, 0, 10000, 50,-25,25));
-	deltat_vs_pixhitsEC[gain_value]->GetXaxis()->SetTitle("Number Endcap Pixel Hits");
-	deltat_vs_pixhitsEC[gain_value]->GetYaxis()->SetTitle("#Delta t [ns]");
+	registerHist(monGr_GlobalHistograms, m_deltat_vs_pixhitsEC[gain_value] = new TH2F(name.c_str(),title.c_str(), 100, 0, 10000, 50,-25,25));
+	m_deltat_vs_pixhitsEC[gain_value]->GetXaxis()->SetTitle("Number Endcap Pixel Hits");
+	m_deltat_vs_pixhitsEC[gain_value]->GetYaxis()->SetTitle("#Delta t [ns]");
 	  
 	name = "DeltatVsSctHits" + gain + "Gain";
 	title = "#Delta t vs NumberSctHits " + gain + " Gain";
-	registerHist(monGr_GlobalHistograms, deltat_vs_scthits[gain_value] = new TH2F(name.c_str(),title.c_str(), 100, 0, 20000, 50,-25,25));
-	deltat_vs_scthits[gain_value]->GetXaxis()->SetTitle("Number Sct Hits");
-	deltat_vs_scthits[gain_value]->GetYaxis()->SetTitle("#Delta t [ns]");
+	registerHist(monGr_GlobalHistograms, m_deltat_vs_scthits[gain_value] = new TH2F(name.c_str(),title.c_str(), 100, 0, 20000, 50,-25,25));
+	m_deltat_vs_scthits[gain_value]->GetXaxis()->SetTitle("Number Sct Hits");
+	m_deltat_vs_scthits[gain_value]->GetYaxis()->SetTitle("#Delta t [ns]");
 	  
 	name = "DeltatVsSctHitsBR" + gain + "Gain";
 	title = "#Delta t vs NumberSctHits in Barrel " + gain + " Gain";
-	registerHist(monGr_GlobalHistograms, deltat_vs_scthitsBR[gain_value] = new TH2F(name.c_str(),title.c_str(), 100, 0, 20000, 50,-25,25));
-	deltat_vs_scthitsBR[gain_value]->GetXaxis()->SetTitle("Number Barrel Sct Hits");
-	deltat_vs_scthitsBR[gain_value]->GetYaxis()->SetTitle("#Delta t [ns]");
+	registerHist(monGr_GlobalHistograms, m_deltat_vs_scthitsBR[gain_value] = new TH2F(name.c_str(),title.c_str(), 100, 0, 20000, 50,-25,25));
+	m_deltat_vs_scthitsBR[gain_value]->GetXaxis()->SetTitle("Number Barrel Sct Hits");
+	m_deltat_vs_scthitsBR[gain_value]->GetYaxis()->SetTitle("#Delta t [ns]");
 	  
 	name = "DeltatVsSctHitsEC" + gain + "Gain";
 	title = "#Delta t vs NumberSctHits in Endcap " + gain + " Gain";
-	registerHist(monGr_GlobalHistograms, deltat_vs_scthitsEC[gain_value] = new TH2F(name.c_str(),title.c_str(), 100, 0, 20000, 50,-25,25));
-	deltat_vs_scthitsEC[gain_value]->GetXaxis()->SetTitle("Number Endcap Sct Hits");
-	deltat_vs_scthitsEC[gain_value]->GetYaxis()->SetTitle("#Delta t [ns]");
+	registerHist(monGr_GlobalHistograms, m_deltat_vs_scthitsEC[gain_value] = new TH2F(name.c_str(),title.c_str(), 100, 0, 20000, 50,-25,25));
+	m_deltat_vs_scthitsEC[gain_value]->GetXaxis()->SetTitle("Number Endcap Sct Hits");
+	m_deltat_vs_scthitsEC[gain_value]->GetYaxis()->SetTitle("#Delta t [ns]");
 
 	name = "SctVsPixHitsCol" + gain + "Gain";
 	title = "#NumberSctHits vs NumberPixHits w/ Collison delta t " + gain + " Gain";
-	registerHist(monGr_GlobalHistograms, sct_vs_pix_col[gain_value] = new TH2F(name.c_str(),title.c_str(), 100, 0, 20000, 100, 0, 10000));
-	sct_vs_pix_col[gain_value]->GetXaxis()->SetTitle("Number Pixel Hits");
-	sct_vs_pix_col[gain_value]->GetYaxis()->SetTitle("Number Sct Hits");
+	registerHist(monGr_GlobalHistograms, m_sct_vs_pix_col[gain_value] = new TH2F(name.c_str(),title.c_str(), 100, 0, 20000, 100, 0, 10000));
+	m_sct_vs_pix_col[gain_value]->GetXaxis()->SetTitle("Number Pixel Hits");
+	m_sct_vs_pix_col[gain_value]->GetYaxis()->SetTitle("Number Sct Hits");
 	  
 	name = "SctVsPixHitsBkg" + gain + "Gain";
 	title = "#NumberSctHits vs NumberPixHits w/ Background delta t " + gain + " Gain";
-	registerHist(monGr_GlobalHistograms, sct_vs_pix_bkg[gain_value] = new TH2F(name.c_str(),title.c_str(), 100, 0, 20000, 100, 0, 10000));
-	sct_vs_pix_bkg[gain_value]->GetXaxis()->SetTitle("Number Pixel Hits");
-	sct_vs_pix_bkg[gain_value]->GetYaxis()->SetTitle("Number Sct Hits");
+	registerHist(monGr_GlobalHistograms, m_sct_vs_pix_bkg[gain_value] = new TH2F(name.c_str(),title.c_str(), 100, 0, 20000, 100, 0, 10000));
+	m_sct_vs_pix_bkg[gain_value]->GetXaxis()->SetTitle("Number Pixel Hits");
+	m_sct_vs_pix_bkg[gain_value]->GetYaxis()->SetTitle("Number Sct Hits");
 	  
 	for (unsigned int pulse_nr=0;pulse_nr<2;pulse_nr++) {
 
@@ -382,21 +383,21 @@ StatusCode InDetGlobalBCMTool::bookHistogramsRecurrent()
 	    
 	  name="Pulse"+pulse+"Width"+gain+"Gain";
 	  title="Pulse"+ pulse +"Width" + gain  + "Gain";
-	  registerHist(monGr_GlobalHistograms, pulse_width[gain_value][pulse_nr] = new TH1F(name.c_str(),title.c_str(),32,0,32));
-	  pulse_width[gain_value][pulse_nr]->GetXaxis()->SetTitle("time bins [25/32 ns]");
-	  pulse_width[gain_value][pulse_nr]->GetYaxis()->SetTitle("# of hits");
+	  registerHist(monGr_GlobalHistograms, m_pulse_width[gain_value][pulse_nr] = new TH1F(name.c_str(),title.c_str(),32,0,32));
+	  m_pulse_width[gain_value][pulse_nr]->GetXaxis()->SetTitle("time bins [25/32 ns]");
+	  m_pulse_width[gain_value][pulse_nr]->GetYaxis()->SetTitle("# of hits");
 
 	  name= "Pulse"+pulse+"Position"+ gain+"Gain";
 	  title = "Pulse " + pulse + " Position  " + gain + " Gain";
-	  registerHist(monGr_GlobalHistograms, pulse_position[gain_value][pulse_nr] = new TH1F(name.c_str(),title.c_str(),64,0,64));
-	  pulse_position[gain_value][pulse_nr]->GetXaxis()->SetTitle("time bins [25/64 ns]");
-	  pulse_position[gain_value][pulse_nr]->GetYaxis()->SetTitle("# of hits");
+	  registerHist(monGr_GlobalHistograms, m_pulse_position[gain_value][pulse_nr] = new TH1F(name.c_str(),title.c_str(),64,0,64));
+	  m_pulse_position[gain_value][pulse_nr]->GetXaxis()->SetTitle("time bins [25/64 ns]");
+	  m_pulse_position[gain_value][pulse_nr]->GetYaxis()->SetTitle("# of hits");
 
 	  name = "HitDistributionPulse"+pulse+gain+"Gain";
 	  title = "Hitdistribution Pulse " + pulse + " " + gain + " Gain";
-	  registerHist(monGr_GlobalHistograms, hitdistribution_pulse[gain_value][pulse_nr] = new TH1F(name.c_str(),title.c_str(),8,0,8));
-	  hitdistribution_pulse[gain_value][pulse_nr]->GetXaxis()->SetTitle("detector");
-	  hitdistribution_pulse[gain_value][pulse_nr]->GetYaxis()->SetTitle("# of hits");
+	  registerHist(monGr_GlobalHistograms, m_hitdistribution_pulse[gain_value][pulse_nr] = new TH1F(name.c_str(),title.c_str(),8,0,8));
+	  m_hitdistribution_pulse[gain_value][pulse_nr]->GetXaxis()->SetTitle("detector");
+	  m_hitdistribution_pulse[gain_value][pulse_nr]->GetYaxis()->SetTitle("# of hits");
 
 	}//end of pulse loop
       }//end of gain loop
@@ -417,21 +418,21 @@ StatusCode InDetGlobalBCMTool::bookHistogramsRecurrent()
 	        
 	    name="HitsVsLvl1A"+station_name+"Gain_gain";
 	    title = "" + station_name + " Hits vs LVL1 A  " + gain + " Gain";
-	    registerHist(monGr_SideHistograms,stat_lvl1a[station_nr][gain_value] = new TH1F(name.c_str(),title.c_str(),32,0,32));
-	    stat_lvl1a[station_nr][gain_value]->GetXaxis()->SetTitle("lvl1a [25 ns]");
-	    stat_lvl1a[station_nr][gain_value]->GetYaxis()->SetTitle("# of hits");
+	    registerHist(monGr_SideHistograms,m_stat_lvl1a[station_nr][gain_value] = new TH1F(name.c_str(),title.c_str(),32,0,32));
+	    m_stat_lvl1a[station_nr][gain_value]->GetXaxis()->SetTitle("lvl1a [25 ns]");
+	    m_stat_lvl1a[station_nr][gain_value]->GetYaxis()->SetTitle("# of hits");
 	        
 	    name="PulsePosition"+station_name+"Gain_"+gain;
 	    title = "" + station_name + " Pulse Position  " + gain + " Gain";
-	    registerHist(monGr_SideHistograms, stat_pulse_position_gen[station_nr][gain_value] = new TH1F(name.c_str(),title.c_str(),64,0,64));
-	    stat_pulse_position_gen[station_nr][gain_value]->GetXaxis()->SetTitle("time bins [25/64 ns]");
-	    stat_pulse_position_gen[station_nr][gain_value]->GetYaxis()->SetTitle("# of hits");
+	    registerHist(monGr_SideHistograms, m_stat_pulse_position_gen[station_nr][gain_value] = new TH1F(name.c_str(),title.c_str(),64,0,64));
+	    m_stat_pulse_position_gen[station_nr][gain_value]->GetXaxis()->SetTitle("time bins [25/64 ns]");
+	    m_stat_pulse_position_gen[station_nr][gain_value]->GetYaxis()->SetTitle("# of hits");
 	        
 	    name="PulseWidth"+station_name+"Gain_"+gain;
 	    title = "" + station_name + " Pulse Width  " + gain + " Gain";
-	    registerHist(monGr_SideHistograms,stat_pulse_width_gen[station_nr][gain_value] = new TH1F(name.c_str(),title.c_str(),32,0,32));
-	    stat_pulse_width_gen[station_nr][gain_value]->GetXaxis()->SetTitle("time bins [25/32 ns]");
-	    stat_pulse_width_gen[station_nr][gain_value]->GetYaxis()->SetTitle("# of hits");
+	    registerHist(monGr_SideHistograms,m_stat_pulse_width_gen[station_nr][gain_value] = new TH1F(name.c_str(),title.c_str(),32,0,32));
+	    m_stat_pulse_width_gen[station_nr][gain_value]->GetXaxis()->SetTitle("time bins [25/32 ns]");
+	    m_stat_pulse_width_gen[station_nr][gain_value]->GetYaxis()->SetTitle("# of hits");
 
 	    for (unsigned int pulse_nr=0; pulse_nr<2;pulse_nr++)
 	      {
@@ -440,15 +441,15 @@ StatusCode InDetGlobalBCMTool::bookHistogramsRecurrent()
 		
 		name="Pulse"+station_name+"Position"+pulse+"Gain_"+gain;
 		title=station_name+" Pulse "+pulse+" Position "+gain+" Gain";
-		registerHist(monGr_SideHistograms, stat_pulse_position[station_nr][gain_value][pulse_nr] = new TH1F(name.c_str(),title.c_str(),64,0,64));
-		stat_pulse_position[station_nr][gain_value][pulse_nr]->GetXaxis()->SetTitle("time bins [25/64 ns]");
-		stat_pulse_position[station_nr][gain_value][pulse_nr]->GetYaxis()->SetTitle("# of hits");
+		registerHist(monGr_SideHistograms, m_stat_pulse_position[station_nr][gain_value][pulse_nr] = new TH1F(name.c_str(),title.c_str(),64,0,64));
+		m_stat_pulse_position[station_nr][gain_value][pulse_nr]->GetXaxis()->SetTitle("time bins [25/64 ns]");
+		m_stat_pulse_position[station_nr][gain_value][pulse_nr]->GetYaxis()->SetTitle("# of hits");
 		
 		name="Pulse"+station_name+"Width"+pulse+"Gain_"+gain;
 		title=station_name+" Pulse "+pulse+" Width "+gain+" Gain";
-		registerHist(monGr_SideHistograms,stat_pulse_width[station_nr][gain_value][pulse_nr] = new TH1F(name.c_str(),title.c_str(),32,0,32));
-		stat_pulse_width[station_nr][gain_value][pulse_nr]->GetXaxis()->SetTitle("time bins [25/32 ns]");
-		stat_pulse_width[station_nr][gain_value][pulse_nr]->GetYaxis()->SetTitle("# of hits");
+		registerHist(monGr_SideHistograms,m_stat_pulse_width[station_nr][gain_value][pulse_nr] = new TH1F(name.c_str(),title.c_str(),32,0,32));
+		m_stat_pulse_width[station_nr][gain_value][pulse_nr]->GetXaxis()->SetTitle("time bins [25/32 ns]");
+		m_stat_pulse_width[station_nr][gain_value][pulse_nr]->GetYaxis()->SetTitle("# of hits");
 			
 	      }//end of pulse_nr loop
 	  }//end of gain loop
@@ -498,27 +499,27 @@ StatusCode InDetGlobalBCMTool::bookHistogramsRecurrent()
 	    
 	  name="HitsVsLvl1A"+station_name+"Gain_"+detector_name+gain;
 	  title= station_name+ " "+ detector_name +" Hits vs LVL1 A "+ gain +" Gain";
-	  registerHist(monGr_DetectorHistograms,det_lvl1a[detector][gain_value] = new TH1F(name.c_str(),title.c_str(),32,0,32));
-	  det_lvl1a[detector][gain_value]->GetXaxis()->SetTitle("lvl1a [25 ns]");
-	  det_lvl1a[detector][gain_value]->GetYaxis()->SetTitle("# of hits");
+	  registerHist(monGr_DetectorHistograms,m_det_lvl1a[detector][gain_value] = new TH1F(name.c_str(),title.c_str(),32,0,32));
+	  m_det_lvl1a[detector][gain_value]->GetXaxis()->SetTitle("lvl1a [25 ns]");
+	  m_det_lvl1a[detector][gain_value]->GetYaxis()->SetTitle("# of hits");
 	    
 	  name="PulsePosition"+station_name+"Gain_"+detector_name+gain;
 	  title=station_name+" "+detector_name+" Pulse Position "+gain +" Gain";
-	  registerHist(monGr_DetectorHistograms, det_pulse_position_gen[detector][gain_value] = new TH1F(name.c_str(),title.c_str(),64,0,64));
-	  det_pulse_position_gen[detector][gain_value]->GetXaxis()->SetTitle("time bins [25/64 ns]");
-	  det_pulse_position_gen[detector][gain_value]->GetYaxis()->SetTitle("# of hits");
+	  registerHist(monGr_DetectorHistograms, m_det_pulse_position_gen[detector][gain_value] = new TH1F(name.c_str(),title.c_str(),64,0,64));
+	  m_det_pulse_position_gen[detector][gain_value]->GetXaxis()->SetTitle("time bins [25/64 ns]");
+	  m_det_pulse_position_gen[detector][gain_value]->GetYaxis()->SetTitle("# of hits");
 	    
 	  name="PulseWidth"+station_name+"Gain_"+detector_name+gain;
 	  title=station_name+" "+detector_name+" Pulse Width "+gain+" Gain";
-	  registerHist(monGr_DetectorHistograms,det_pulse_width_gen[detector][gain_value] = new TH1F(name.c_str(),title.c_str(),32,0,32));
-	  det_pulse_width_gen[detector][gain_value]->GetXaxis()->SetTitle("time bins [25/32 ns]");
-	  det_pulse_width_gen[detector][gain_value]->GetYaxis()->SetTitle("# of hits");
+	  registerHist(monGr_DetectorHistograms,m_det_pulse_width_gen[detector][gain_value] = new TH1F(name.c_str(),title.c_str(),32,0,32));
+	  m_det_pulse_width_gen[detector][gain_value]->GetXaxis()->SetTitle("time bins [25/32 ns]");
+	  m_det_pulse_width_gen[detector][gain_value]->GetYaxis()->SetTitle("# of hits");
 	  
 	  name="timewalk"+station_name+"_"+detector_name+gain;
 	  title=station_name+" "+detector_name+" timewalk "+ gain +" Gain";
-	  registerHist(monGr_GlobalHistograms,det_timewalk[detector][gain_value] = new TH2F(name.c_str(),title.c_str(),64, 0, 64, 32, 0, 32));
-	  det_timewalk[detector][gain_value]->GetXaxis()->SetTitle("pulse pos in time bins [25/64 ns]");
-	  det_timewalk[detector][gain_value]->GetYaxis()->SetTitle("pulse width in time bins [25/64 ns]");    
+	  registerHist(monGr_GlobalHistograms,m_det_timewalk[detector][gain_value] = new TH2F(name.c_str(),title.c_str(),64, 0, 64, 32, 0, 32));
+	  m_det_timewalk[detector][gain_value]->GetXaxis()->SetTitle("pulse pos in time bins [25/64 ns]");
+	  m_det_timewalk[detector][gain_value]->GetYaxis()->SetTitle("pulse width in time bins [25/64 ns]");    
 	  
 	  for (unsigned int pulse_nr=0;pulse_nr<2;pulse_nr++) {
 	    if (pulse_nr==0){pulse="1";} 
@@ -526,15 +527,15 @@ StatusCode InDetGlobalBCMTool::bookHistogramsRecurrent()
 	        
 	    name="Pulse"+station_name+"Position"+detector_name+"Gain_"+pulse+gain;
 	    title=station_name+" "+ detector_name +" Pulse "+pulse+" Position "+ gain +" Gain";
-	    registerHist(monGr_DetectorHistograms, det_pulse_position[detector][gain_value][pulse_nr] = new TH1F(name.c_str(),title.c_str(),64,0,64));
-	    det_pulse_position[detector][gain_value][pulse_nr]->GetXaxis()->SetTitle("time bins [25/64 ns]");
-	    det_pulse_position[detector][gain_value][pulse_nr]->GetYaxis()->SetTitle("# of hits");
+	    registerHist(monGr_DetectorHistograms, m_det_pulse_position[detector][gain_value][pulse_nr] = new TH1F(name.c_str(),title.c_str(),64,0,64));
+	    m_det_pulse_position[detector][gain_value][pulse_nr]->GetXaxis()->SetTitle("time bins [25/64 ns]");
+	    m_det_pulse_position[detector][gain_value][pulse_nr]->GetYaxis()->SetTitle("# of hits");
 	        
 	    name="Pulse"+station_name+"Width"+detector_name+"Gain_"+pulse+gain;
 	    title=station_name + " " + detector_name + " Pulse " + pulse + "  Width " + gain + " Gain";
-	    registerHist(monGr_DetectorHistograms,det_pulse_width[detector][gain_value][pulse_nr] = new TH1F(name.c_str(),title.c_str(),32,0,33));
-	    det_pulse_width[detector][gain_value][pulse_nr]->GetXaxis()->SetTitle("time bins [25/32 ns]");
-	    det_pulse_width[detector][gain_value][pulse_nr]->GetYaxis()->SetTitle("# of hits");
+	    registerHist(monGr_DetectorHistograms,m_det_pulse_width[detector][gain_value][pulse_nr] = new TH1F(name.c_str(),title.c_str(),32,0,33));
+	    m_det_pulse_width[detector][gain_value][pulse_nr]->GetXaxis()->SetTitle("time bins [25/32 ns]");
+	    m_det_pulse_width[detector][gain_value][pulse_nr]->GetYaxis()->SetTitle("# of hits");
 	  }//end of pulse loop
 	}//end of gain loop 
     }//end of detector loop
@@ -547,11 +548,11 @@ StatusCode InDetGlobalBCMTool::bookHistogramsRecurrent()
 /***************************************************************************
  * At first a method to fill the global and the pulse 1 and 2 histos
  **************************************************************************/
-void FillGlobalHistos(TH2F* h1, TH2F* h2, TH2F* h3, TH1F* h4, TH1F* h5, int pulsewid, int channel, int bcid, int m_ecr, int lvl1a){
+void FillGlobalHistos(TH2F* h1, TH2F* h2, TH2F* h3, TH1F* h4, TH1F* h5, int pulsewid, int channel, int bcid, int ecr, int lvl1a){
   if (pulsewid!=0){
     h1->Fill(lvl1a, channel);
     h2->Fill(bcid, channel);
-    h3->Fill(m_ecr, channel);
+    h3->Fill(ecr, channel);
     h4->Fill(lvl1a);
     h5->Fill(bcid);
   }
@@ -656,7 +657,7 @@ StatusCode InDetGlobalBCMTool::fillHistograms(){
     BCM_RDO_Container::const_iterator BCM_RDO_itr     = m_BCM_RDO->begin();
     BCM_RDO_Container::const_iterator BCM_RDO_itr_end = m_BCM_RDO->end();
 
-    bool ROD0 = true; //bools for NumberOfEvents histo
+    bool ROD0 = true; //bools for m_NumberOfEvents histo
     bool ROD1 = true;
 
     //int abortcountHGRod0 = 0; //FIXME abortFraction calculator
@@ -734,13 +735,13 @@ StatusCode InDetGlobalBCMTool::fillHistograms(){
 	   *Filling NumberOfEvent histograms
 	   *********************************/
 	  if (ROD0 && (bcm_channel == 0 || bcm_channel == 2 || bcm_channel == 4 || bcm_channel == 6 || bcm_channel == 9 || bcm_channel == 11 || bcm_channel == 13 || bcm_channel == 15)){
-	    NumberOfEvents->Fill(1.5);
-	    NumberOfEvents->Fill(0.5);
+	    m_NumberOfEvents->Fill(1.5);
+	    m_NumberOfEvents->Fill(0.5);
 	    ROD0 = false; // FIXME seems to be a bug: first loop is over channel, so alternating RODs, bit bool ROD0 (and ROD1) is being set to false after filling first time! as well filled, if all BC was empty!
 	  }
 	  if (ROD1 && (bcm_channel == 1 || bcm_channel == 3 || bcm_channel == 5 || bcm_channel == 7 || bcm_channel == 8 || bcm_channel == 10 || bcm_channel == 12 || bcm_channel == 14)){
-	    NumberOfEvents->Fill(2.5);
-	    NumberOfEvents->Fill(0.5);
+	    m_NumberOfEvents->Fill(2.5);
+	    m_NumberOfEvents->Fill(0.5);
 	    ROD1 = false;
 	  }
 	    
@@ -748,8 +749,8 @@ StatusCode InDetGlobalBCMTool::fillHistograms(){
 	        
 	    // strange signals: You see something where there should be nothing, because the pulse widths are zero. // FIXME condition never fulfillable
 	    if (( bcm_pulse1width == 0 && bcm_pulse2width == 0) &&  (bcm_pulse1position !=0 || bcm_pulse2position !=0)){
-	      if (bcm_channel < 8) strange_signals[0]->Fill(bcm_channel);
-	      if (bcm_channel > 7) strange_signals[1]->Fill(bcm_channel);
+	      if (bcm_channel < 8) m_strange_signals[0]->Fill(bcm_channel);
+	      if (bcm_channel > 7) m_strange_signals[1]->Fill(bcm_channel);
 	    }
 	        
 	    //Event information to get ECR
@@ -768,20 +769,20 @@ StatusCode InDetGlobalBCMTool::fillHistograms(){
 	     ******************************************************************************************/
 
 	    if ( bcm_channel < 8 ){
-	      if (bcm_pulse1width != 0) hitdistribution[0]->Fill(bcm_channel);
-	      if (bcm_pulse2width != 0) hitdistribution[0]->Fill(bcm_channel);
-	      FillGlobalHistos(ChannelVsLvl1a, ChannelVsBCID, ChannelVsECR, hits_lvl1a[0], hits_bcid[0], bcm_pulse1width, bcm_channel, bcm_bcid, ecr, bcm_lvl1a);
-	      FillGlobalHistos(ChannelVsLvl1a, ChannelVsBCID, ChannelVsECR, hits_lvl1a[0], hits_bcid[0], bcm_pulse2width, bcm_channel, bcm_bcid, ecr, bcm_lvl1a);
-	      FillPulseHistos(pulse_position_gen[0], pulse_width_gen[0], pulse_position[0][0], pulse_width[0][0], bcm_pulse1position, bcm_pulse1width, bcm_channel,  hitdistribution_pulse[0][0]);
-	      FillPulseHistos(pulse_position_gen[0], pulse_width_gen[0], pulse_position[0][1], pulse_width[0][1], bcm_pulse2position, bcm_pulse2width, bcm_channel,  hitdistribution_pulse[0][1]);
+	      if (bcm_pulse1width != 0) m_hitdistribution[0]->Fill(bcm_channel);
+	      if (bcm_pulse2width != 0) m_hitdistribution[0]->Fill(bcm_channel);
+	      FillGlobalHistos(m_ChannelVsLvl1a, m_ChannelVsBCID, m_ChannelVsECR, m_hits_lvl1a[0], m_hits_bcid[0], bcm_pulse1width, bcm_channel, bcm_bcid, ecr, bcm_lvl1a);
+	      FillGlobalHistos(m_ChannelVsLvl1a, m_ChannelVsBCID, m_ChannelVsECR, m_hits_lvl1a[0], m_hits_bcid[0], bcm_pulse2width, bcm_channel, bcm_bcid, ecr, bcm_lvl1a);
+	      FillPulseHistos(m_pulse_position_gen[0], m_pulse_width_gen[0], m_pulse_position[0][0], m_pulse_width[0][0], bcm_pulse1position, bcm_pulse1width, bcm_channel,  m_hitdistribution_pulse[0][0]);
+	      FillPulseHistos(m_pulse_position_gen[0], m_pulse_width_gen[0], m_pulse_position[0][1], m_pulse_width[0][1], bcm_pulse2position, bcm_pulse2width, bcm_channel,  m_hitdistribution_pulse[0][1]);
 	    }
 	    if (bcm_channel > 7){
-	      if (bcm_pulse1width != 0) hitdistribution[1]->Fill(bcm_channel-8);
-	      if (bcm_pulse2width != 0) hitdistribution[1]->Fill(bcm_channel-8);
-	      FillGlobalHistos(ChannelVsLvl1a, ChannelVsBCID, ChannelVsECR, hits_lvl1a[1], hits_bcid[1], bcm_pulse1width, bcm_channel, bcm_bcid, ecr, bcm_lvl1a);
-	      FillGlobalHistos(ChannelVsLvl1a, ChannelVsBCID, ChannelVsECR, hits_lvl1a[1], hits_bcid[1], bcm_pulse2width, bcm_channel, bcm_bcid, ecr, bcm_lvl1a);
-	      FillPulseHistos(pulse_position_gen[1], pulse_width_gen[1], pulse_position[1][0], pulse_width[1][0], bcm_pulse1position, bcm_pulse1width, bcm_channel-8, hitdistribution_pulse[1][0]);
-	      FillPulseHistos(pulse_position_gen[1], pulse_width_gen[1], pulse_position[1][1], pulse_width[1][1], bcm_pulse2position, bcm_pulse2width, bcm_channel-8, hitdistribution_pulse[1][1]);
+	      if (bcm_pulse1width != 0) m_hitdistribution[1]->Fill(bcm_channel-8);
+	      if (bcm_pulse2width != 0) m_hitdistribution[1]->Fill(bcm_channel-8);
+	      FillGlobalHistos(m_ChannelVsLvl1a, m_ChannelVsBCID, m_ChannelVsECR, m_hits_lvl1a[1], m_hits_bcid[1], bcm_pulse1width, bcm_channel, bcm_bcid, ecr, bcm_lvl1a);
+	      FillGlobalHistos(m_ChannelVsLvl1a, m_ChannelVsBCID, m_ChannelVsECR, m_hits_lvl1a[1], m_hits_bcid[1], bcm_pulse2width, bcm_channel, bcm_bcid, ecr, bcm_lvl1a);
+	      FillPulseHistos(m_pulse_position_gen[1], m_pulse_width_gen[1], m_pulse_position[1][0], m_pulse_width[1][0], bcm_pulse1position, bcm_pulse1width, bcm_channel-8, m_hitdistribution_pulse[1][0]);
+	      FillPulseHistos(m_pulse_position_gen[1], m_pulse_width_gen[1], m_pulse_position[1][1], m_pulse_width[1][1], bcm_pulse2position, bcm_pulse2width, bcm_channel-8, m_hitdistribution_pulse[1][1]);
 	    }
 	          
 	    /************************************************************************************************
@@ -806,8 +807,8 @@ StatusCode InDetGlobalBCMTool::fillHistograms(){
 		s2a.lvl1a = bcm_lvl1a;
 		positions_A[0].push_back(s2a);
 	      }
-	      FillPulseHistos(stat_pulse_position_gen[0][0], stat_pulse_width_gen[0][0], stat_pulse_position[0][0][0], stat_pulse_width[0][0][0], bcm_pulse1position, bcm_pulse1width, bcm_lvl1a, stat_lvl1a[0][0]);
-	      FillPulseHistos(stat_pulse_position_gen[0][0], stat_pulse_width_gen[0][0], stat_pulse_position[0][0][1], stat_pulse_width[0][0][1], bcm_pulse2position, bcm_pulse2width, bcm_lvl1a, stat_lvl1a[0][0]);
+	      FillPulseHistos(m_stat_pulse_position_gen[0][0], m_stat_pulse_width_gen[0][0], m_stat_pulse_position[0][0][0], m_stat_pulse_width[0][0][0], bcm_pulse1position, bcm_pulse1width, bcm_lvl1a, m_stat_lvl1a[0][0]);
+	      FillPulseHistos(m_stat_pulse_position_gen[0][0], m_stat_pulse_width_gen[0][0], m_stat_pulse_position[0][0][1], m_stat_pulse_width[0][0][1], bcm_pulse2position, bcm_pulse2width, bcm_lvl1a, m_stat_lvl1a[0][0]);
 	    }
 
 	    // A Side High Gain
@@ -828,8 +829,8 @@ StatusCode InDetGlobalBCMTool::fillHistograms(){
 		s2a.lvl1a = bcm_lvl1a;
 		positions_A[1].push_back(s2a);
 	      }
-	      FillPulseHistos(stat_pulse_position_gen[0][1], stat_pulse_width_gen[0][1], stat_pulse_position[0][1][0], stat_pulse_width[0][1][0], bcm_pulse1position, bcm_pulse1width, bcm_lvl1a, stat_lvl1a[0][1]);
-	      FillPulseHistos(stat_pulse_position_gen[0][1], stat_pulse_width_gen[0][1], stat_pulse_position[0][1][1], stat_pulse_width[0][1][1], bcm_pulse2position, bcm_pulse2width, bcm_lvl1a, stat_lvl1a[0][1]);
+	      FillPulseHistos(m_stat_pulse_position_gen[0][1], m_stat_pulse_width_gen[0][1], m_stat_pulse_position[0][1][0], m_stat_pulse_width[0][1][0], bcm_pulse1position, bcm_pulse1width, bcm_lvl1a, m_stat_lvl1a[0][1]);
+	      FillPulseHistos(m_stat_pulse_position_gen[0][1], m_stat_pulse_width_gen[0][1], m_stat_pulse_position[0][1][1], m_stat_pulse_width[0][1][1], bcm_pulse2position, bcm_pulse2width, bcm_lvl1a, m_stat_lvl1a[0][1]);
 	    }
 	    // C Side Low Gain
 	    if (bcm_channel > 3 && bcm_channel < 8){
@@ -849,8 +850,8 @@ StatusCode InDetGlobalBCMTool::fillHistograms(){
 		s2c.lvl1a = bcm_lvl1a;
 		positions_C[0].push_back(s2c);
 	      }
-	      FillPulseHistos(stat_pulse_position_gen[1][0], stat_pulse_width_gen[1][0], stat_pulse_position[1][0][0], stat_pulse_width[1][0][0], bcm_pulse1position, bcm_pulse1width, bcm_lvl1a, stat_lvl1a[1][0]);
-	      FillPulseHistos(stat_pulse_position_gen[1][0], stat_pulse_width_gen[1][0], stat_pulse_position[1][0][1], stat_pulse_width[1][0][1], bcm_pulse2position, bcm_pulse2width, bcm_lvl1a, stat_lvl1a[1][0]);
+	      FillPulseHistos(m_stat_pulse_position_gen[1][0], m_stat_pulse_width_gen[1][0], m_stat_pulse_position[1][0][0], m_stat_pulse_width[1][0][0], bcm_pulse1position, bcm_pulse1width, bcm_lvl1a, m_stat_lvl1a[1][0]);
+	      FillPulseHistos(m_stat_pulse_position_gen[1][0], m_stat_pulse_width_gen[1][0], m_stat_pulse_position[1][0][1], m_stat_pulse_width[1][0][1], bcm_pulse2position, bcm_pulse2width, bcm_lvl1a, m_stat_lvl1a[1][0]);
 	    }
 	    // C Side High Gain
 	    if (bcm_channel > 11){
@@ -870,8 +871,8 @@ StatusCode InDetGlobalBCMTool::fillHistograms(){
 		s2c.lvl1a = bcm_lvl1a;
 		positions_C[1].push_back(s2c);
 	      }
-	      FillPulseHistos(stat_pulse_position_gen[1][1], stat_pulse_width_gen[1][1], stat_pulse_position[1][1][0], stat_pulse_width[1][1][0], bcm_pulse1position, bcm_pulse1width, bcm_lvl1a, stat_lvl1a[1][1]);
-	      FillPulseHistos(stat_pulse_position_gen[1][1], stat_pulse_width_gen[1][1], stat_pulse_position[1][1][1], stat_pulse_width[1][1][1], bcm_pulse2position, bcm_pulse2width, bcm_lvl1a, stat_lvl1a[1][1]);
+	      FillPulseHistos(m_stat_pulse_position_gen[1][1], m_stat_pulse_width_gen[1][1], m_stat_pulse_position[1][1][0], m_stat_pulse_width[1][1][0], bcm_pulse1position, bcm_pulse1width, bcm_lvl1a, m_stat_lvl1a[1][1]);
+	      FillPulseHistos(m_stat_pulse_position_gen[1][1], m_stat_pulse_width_gen[1][1], m_stat_pulse_position[1][1][1], m_stat_pulse_width[1][1][1], bcm_pulse2position, bcm_pulse2width, bcm_lvl1a, m_stat_lvl1a[1][1]);
 	    }
 	          
 	    /****************************************************************************
@@ -879,68 +880,68 @@ StatusCode InDetGlobalBCMTool::fillHistograms(){
 	     ****************************************************************************/
 	    switch (bcm_channel){
 	    case 0:
-	      FillPulseHistos(det_pulse_position_gen[0][0], det_pulse_width_gen[0][0], det_pulse_position[0][0][0], det_pulse_width[0][0][0], bcm_pulse1position, bcm_pulse1width, bcm_lvl1a, det_lvl1a[0][0]);
-	      FillPulseHistos(det_pulse_position_gen[0][0], det_pulse_width_gen[0][0], det_pulse_position[0][0][1], det_pulse_width[0][0][1], bcm_pulse2position, bcm_pulse2width, bcm_lvl1a, det_lvl1a[0][0]);
+	      FillPulseHistos(m_det_pulse_position_gen[0][0], m_det_pulse_width_gen[0][0], m_det_pulse_position[0][0][0], m_det_pulse_width[0][0][0], bcm_pulse1position, bcm_pulse1width, bcm_lvl1a, m_det_lvl1a[0][0]);
+	      FillPulseHistos(m_det_pulse_position_gen[0][0], m_det_pulse_width_gen[0][0], m_det_pulse_position[0][0][1], m_det_pulse_width[0][0][1], bcm_pulse2position, bcm_pulse2width, bcm_lvl1a, m_det_lvl1a[0][0]);
 	      break;
 	    case 1:
-	      FillPulseHistos(det_pulse_position_gen[1][0], det_pulse_width_gen[1][0], det_pulse_position[1][0][0], det_pulse_width[1][0][0], bcm_pulse1position, bcm_pulse1width, bcm_lvl1a, det_lvl1a[1][0]);
-	      FillPulseHistos(det_pulse_position_gen[1][0], det_pulse_width_gen[1][0], det_pulse_position[1][0][1], det_pulse_width[1][0][1], bcm_pulse2position, bcm_pulse2width, bcm_lvl1a, det_lvl1a[1][0]);
+	      FillPulseHistos(m_det_pulse_position_gen[1][0], m_det_pulse_width_gen[1][0], m_det_pulse_position[1][0][0], m_det_pulse_width[1][0][0], bcm_pulse1position, bcm_pulse1width, bcm_lvl1a, m_det_lvl1a[1][0]);
+	      FillPulseHistos(m_det_pulse_position_gen[1][0], m_det_pulse_width_gen[1][0], m_det_pulse_position[1][0][1], m_det_pulse_width[1][0][1], bcm_pulse2position, bcm_pulse2width, bcm_lvl1a, m_det_lvl1a[1][0]);
 	      break;
 	    case 2:
-	      FillPulseHistos(det_pulse_position_gen[2][0], det_pulse_width_gen[2][0], det_pulse_position[2][0][0], det_pulse_width[2][0][0], bcm_pulse1position, bcm_pulse1width, bcm_lvl1a, det_lvl1a[2][0]);
-	      FillPulseHistos(det_pulse_position_gen[2][0], det_pulse_width_gen[2][0], det_pulse_position[2][0][1], det_pulse_width[2][0][1], bcm_pulse2position, bcm_pulse2width, bcm_lvl1a, det_lvl1a[2][0]);
+	      FillPulseHistos(m_det_pulse_position_gen[2][0], m_det_pulse_width_gen[2][0], m_det_pulse_position[2][0][0], m_det_pulse_width[2][0][0], bcm_pulse1position, bcm_pulse1width, bcm_lvl1a, m_det_lvl1a[2][0]);
+	      FillPulseHistos(m_det_pulse_position_gen[2][0], m_det_pulse_width_gen[2][0], m_det_pulse_position[2][0][1], m_det_pulse_width[2][0][1], bcm_pulse2position, bcm_pulse2width, bcm_lvl1a, m_det_lvl1a[2][0]);
 	      break;
 	    case 3:
-	      FillPulseHistos(det_pulse_position_gen[3][0], det_pulse_width_gen[3][0], det_pulse_position[3][0][0], det_pulse_width[3][0][0], bcm_pulse1position, bcm_pulse1width, bcm_lvl1a, det_lvl1a[3][0]);
-	      FillPulseHistos(det_pulse_position_gen[3][0], det_pulse_width_gen[3][0], det_pulse_position[3][0][1], det_pulse_width[3][0][1], bcm_pulse2position, bcm_pulse2width, bcm_lvl1a, det_lvl1a[3][0]);
+	      FillPulseHistos(m_det_pulse_position_gen[3][0], m_det_pulse_width_gen[3][0], m_det_pulse_position[3][0][0], m_det_pulse_width[3][0][0], bcm_pulse1position, bcm_pulse1width, bcm_lvl1a, m_det_lvl1a[3][0]);
+	      FillPulseHistos(m_det_pulse_position_gen[3][0], m_det_pulse_width_gen[3][0], m_det_pulse_position[3][0][1], m_det_pulse_width[3][0][1], bcm_pulse2position, bcm_pulse2width, bcm_lvl1a, m_det_lvl1a[3][0]);
 	      break;
 	    case 4:
-	      FillPulseHistos(det_pulse_position_gen[4][0], det_pulse_width_gen[4][0], det_pulse_position[4][0][0], det_pulse_width[4][0][0], bcm_pulse1position, bcm_pulse1width, bcm_lvl1a, det_lvl1a[4][0]);
-	      FillPulseHistos(det_pulse_position_gen[4][0], det_pulse_width_gen[4][0], det_pulse_position[4][0][1], det_pulse_width[4][0][1], bcm_pulse2position, bcm_pulse2width, bcm_lvl1a, det_lvl1a[4][0]);
+	      FillPulseHistos(m_det_pulse_position_gen[4][0], m_det_pulse_width_gen[4][0], m_det_pulse_position[4][0][0], m_det_pulse_width[4][0][0], bcm_pulse1position, bcm_pulse1width, bcm_lvl1a, m_det_lvl1a[4][0]);
+	      FillPulseHistos(m_det_pulse_position_gen[4][0], m_det_pulse_width_gen[4][0], m_det_pulse_position[4][0][1], m_det_pulse_width[4][0][1], bcm_pulse2position, bcm_pulse2width, bcm_lvl1a, m_det_lvl1a[4][0]);
 	      break;
 	    case 5:
-	      FillPulseHistos(det_pulse_position_gen[5][0], det_pulse_width_gen[5][0], det_pulse_position[5][0][0], det_pulse_width[5][0][0], bcm_pulse1position, bcm_pulse1width, bcm_lvl1a, det_lvl1a[5][0]);
-	      FillPulseHistos(det_pulse_position_gen[5][0], det_pulse_width_gen[5][0], det_pulse_position[5][0][1], det_pulse_width[5][0][1], bcm_pulse2position, bcm_pulse2width, bcm_lvl1a, det_lvl1a[5][0]);
+	      FillPulseHistos(m_det_pulse_position_gen[5][0], m_det_pulse_width_gen[5][0], m_det_pulse_position[5][0][0], m_det_pulse_width[5][0][0], bcm_pulse1position, bcm_pulse1width, bcm_lvl1a, m_det_lvl1a[5][0]);
+	      FillPulseHistos(m_det_pulse_position_gen[5][0], m_det_pulse_width_gen[5][0], m_det_pulse_position[5][0][1], m_det_pulse_width[5][0][1], bcm_pulse2position, bcm_pulse2width, bcm_lvl1a, m_det_lvl1a[5][0]);
 	      break;
 	    case 6:
-	      FillPulseHistos(det_pulse_position_gen[6][0], det_pulse_width_gen[6][0], det_pulse_position[6][0][0], det_pulse_width[6][0][0], bcm_pulse1position, bcm_pulse1width, bcm_lvl1a, det_lvl1a[6][0]);
-	      FillPulseHistos(det_pulse_position_gen[6][0], det_pulse_width_gen[6][0], det_pulse_position[6][0][1], det_pulse_width[6][0][1], bcm_pulse2position, bcm_pulse2width, bcm_lvl1a, det_lvl1a[6][0]);
+	      FillPulseHistos(m_det_pulse_position_gen[6][0], m_det_pulse_width_gen[6][0], m_det_pulse_position[6][0][0], m_det_pulse_width[6][0][0], bcm_pulse1position, bcm_pulse1width, bcm_lvl1a, m_det_lvl1a[6][0]);
+	      FillPulseHistos(m_det_pulse_position_gen[6][0], m_det_pulse_width_gen[6][0], m_det_pulse_position[6][0][1], m_det_pulse_width[6][0][1], bcm_pulse2position, bcm_pulse2width, bcm_lvl1a, m_det_lvl1a[6][0]);
 	      break;
 	    case 7:
-	      FillPulseHistos(det_pulse_position_gen[7][0], det_pulse_width_gen[7][0], det_pulse_position[7][0][0], det_pulse_width[7][0][0], bcm_pulse1position, bcm_pulse1width, bcm_lvl1a, det_lvl1a[7][0]);
-	      FillPulseHistos(det_pulse_position_gen[7][0], det_pulse_width_gen[7][0], det_pulse_position[7][0][1], det_pulse_width[7][0][1], bcm_pulse2position, bcm_pulse2width, bcm_lvl1a, det_lvl1a[7][0]);
+	      FillPulseHistos(m_det_pulse_position_gen[7][0], m_det_pulse_width_gen[7][0], m_det_pulse_position[7][0][0], m_det_pulse_width[7][0][0], bcm_pulse1position, bcm_pulse1width, bcm_lvl1a, m_det_lvl1a[7][0]);
+	      FillPulseHistos(m_det_pulse_position_gen[7][0], m_det_pulse_width_gen[7][0], m_det_pulse_position[7][0][1], m_det_pulse_width[7][0][1], bcm_pulse2position, bcm_pulse2width, bcm_lvl1a, m_det_lvl1a[7][0]);
 	      break;
 	    case 8:
-	      FillPulseHistos(det_pulse_position_gen[0][1], det_pulse_width_gen[0][1], det_pulse_position[0][1][0], det_pulse_width[0][1][0], bcm_pulse1position, bcm_pulse1width, bcm_lvl1a, det_lvl1a[0][1]);
-	      FillPulseHistos(det_pulse_position_gen[0][1], det_pulse_width_gen[0][1], det_pulse_position[0][1][1], det_pulse_width[0][1][1], bcm_pulse2position, bcm_pulse2width, bcm_lvl1a, det_lvl1a[0][1]);
+	      FillPulseHistos(m_det_pulse_position_gen[0][1], m_det_pulse_width_gen[0][1], m_det_pulse_position[0][1][0], m_det_pulse_width[0][1][0], bcm_pulse1position, bcm_pulse1width, bcm_lvl1a, m_det_lvl1a[0][1]);
+	      FillPulseHistos(m_det_pulse_position_gen[0][1], m_det_pulse_width_gen[0][1], m_det_pulse_position[0][1][1], m_det_pulse_width[0][1][1], bcm_pulse2position, bcm_pulse2width, bcm_lvl1a, m_det_lvl1a[0][1]);
 	      break;
 	    case 9:
-	      FillPulseHistos(det_pulse_position_gen[1][1], det_pulse_width_gen[1][1], det_pulse_position[1][1][0], det_pulse_width[1][1][0], bcm_pulse1position, bcm_pulse1width, bcm_lvl1a, det_lvl1a[1][1]);
-	      FillPulseHistos(det_pulse_position_gen[1][1], det_pulse_width_gen[1][1], det_pulse_position[1][1][1], det_pulse_width[1][1][1], bcm_pulse2position, bcm_pulse2width, bcm_lvl1a, det_lvl1a[1][1]);
+	      FillPulseHistos(m_det_pulse_position_gen[1][1], m_det_pulse_width_gen[1][1], m_det_pulse_position[1][1][0], m_det_pulse_width[1][1][0], bcm_pulse1position, bcm_pulse1width, bcm_lvl1a, m_det_lvl1a[1][1]);
+	      FillPulseHistos(m_det_pulse_position_gen[1][1], m_det_pulse_width_gen[1][1], m_det_pulse_position[1][1][1], m_det_pulse_width[1][1][1], bcm_pulse2position, bcm_pulse2width, bcm_lvl1a, m_det_lvl1a[1][1]);
 	      break;
 	    case 10:
-	      FillPulseHistos(det_pulse_position_gen[2][1], det_pulse_width_gen[2][1], det_pulse_position[2][1][0], det_pulse_width[2][1][0], bcm_pulse1position, bcm_pulse1width, bcm_lvl1a, det_lvl1a[2][1]);
-	      FillPulseHistos(det_pulse_position_gen[2][1], det_pulse_width_gen[2][1], det_pulse_position[2][1][1], det_pulse_width[2][1][1], bcm_pulse2position, bcm_pulse2width, bcm_lvl1a, det_lvl1a[2][1]);
+	      FillPulseHistos(m_det_pulse_position_gen[2][1], m_det_pulse_width_gen[2][1], m_det_pulse_position[2][1][0], m_det_pulse_width[2][1][0], bcm_pulse1position, bcm_pulse1width, bcm_lvl1a, m_det_lvl1a[2][1]);
+	      FillPulseHistos(m_det_pulse_position_gen[2][1], m_det_pulse_width_gen[2][1], m_det_pulse_position[2][1][1], m_det_pulse_width[2][1][1], bcm_pulse2position, bcm_pulse2width, bcm_lvl1a, m_det_lvl1a[2][1]);
 	      break;
 	    case 11:
-	      FillPulseHistos(det_pulse_position_gen[3][1], det_pulse_width_gen[3][1], det_pulse_position[3][1][0], det_pulse_width[3][1][0], bcm_pulse1position, bcm_pulse1width, bcm_lvl1a, det_lvl1a[3][1]);
-	      FillPulseHistos(det_pulse_position_gen[3][1], det_pulse_width_gen[3][1], det_pulse_position[3][1][1], det_pulse_width[3][1][1], bcm_pulse2position, bcm_pulse2width, bcm_lvl1a, det_lvl1a[3][1]);
+	      FillPulseHistos(m_det_pulse_position_gen[3][1], m_det_pulse_width_gen[3][1], m_det_pulse_position[3][1][0], m_det_pulse_width[3][1][0], bcm_pulse1position, bcm_pulse1width, bcm_lvl1a, m_det_lvl1a[3][1]);
+	      FillPulseHistos(m_det_pulse_position_gen[3][1], m_det_pulse_width_gen[3][1], m_det_pulse_position[3][1][1], m_det_pulse_width[3][1][1], bcm_pulse2position, bcm_pulse2width, bcm_lvl1a, m_det_lvl1a[3][1]);
 	      break;
 	    case 12:
-	      FillPulseHistos(det_pulse_position_gen[4][1], det_pulse_width_gen[4][1], det_pulse_position[4][1][0], det_pulse_width[4][1][0], bcm_pulse1position, bcm_pulse1width, bcm_lvl1a, det_lvl1a[4][1]);
-	      FillPulseHistos(det_pulse_position_gen[4][1], det_pulse_width_gen[4][1], det_pulse_position[4][1][1], det_pulse_width[4][1][1], bcm_pulse2position, bcm_pulse2width, bcm_lvl1a, det_lvl1a[4][1]);
+	      FillPulseHistos(m_det_pulse_position_gen[4][1], m_det_pulse_width_gen[4][1], m_det_pulse_position[4][1][0], m_det_pulse_width[4][1][0], bcm_pulse1position, bcm_pulse1width, bcm_lvl1a, m_det_lvl1a[4][1]);
+	      FillPulseHistos(m_det_pulse_position_gen[4][1], m_det_pulse_width_gen[4][1], m_det_pulse_position[4][1][1], m_det_pulse_width[4][1][1], bcm_pulse2position, bcm_pulse2width, bcm_lvl1a, m_det_lvl1a[4][1]);
 	      break;
 	    case 13:
-	      FillPulseHistos(det_pulse_position_gen[5][1], det_pulse_width_gen[5][1], det_pulse_position[5][1][0], det_pulse_width[5][1][0], bcm_pulse1position, bcm_pulse1width, bcm_lvl1a, det_lvl1a[5][1]);
-	      FillPulseHistos(det_pulse_position_gen[5][1], det_pulse_width_gen[5][1], det_pulse_position[5][1][1], det_pulse_width[5][1][1], bcm_pulse2position, bcm_pulse2width, bcm_lvl1a, det_lvl1a[5][1]);
+	      FillPulseHistos(m_det_pulse_position_gen[5][1], m_det_pulse_width_gen[5][1], m_det_pulse_position[5][1][0], m_det_pulse_width[5][1][0], bcm_pulse1position, bcm_pulse1width, bcm_lvl1a, m_det_lvl1a[5][1]);
+	      FillPulseHistos(m_det_pulse_position_gen[5][1], m_det_pulse_width_gen[5][1], m_det_pulse_position[5][1][1], m_det_pulse_width[5][1][1], bcm_pulse2position, bcm_pulse2width, bcm_lvl1a, m_det_lvl1a[5][1]);
 	      break;
 	    case 14:
-	      FillPulseHistos(det_pulse_position_gen[6][1], det_pulse_width_gen[6][1], det_pulse_position[6][1][0], det_pulse_width[6][1][0], bcm_pulse1position, bcm_pulse1width, bcm_lvl1a, det_lvl1a[6][1]);
-	      FillPulseHistos(det_pulse_position_gen[6][1], det_pulse_width_gen[6][1], det_pulse_position[6][1][1], det_pulse_width[6][1][1], bcm_pulse2position, bcm_pulse2width, bcm_lvl1a, det_lvl1a[6][1]);
+	      FillPulseHistos(m_det_pulse_position_gen[6][1], m_det_pulse_width_gen[6][1], m_det_pulse_position[6][1][0], m_det_pulse_width[6][1][0], bcm_pulse1position, bcm_pulse1width, bcm_lvl1a, m_det_lvl1a[6][1]);
+	      FillPulseHistos(m_det_pulse_position_gen[6][1], m_det_pulse_width_gen[6][1], m_det_pulse_position[6][1][1], m_det_pulse_width[6][1][1], bcm_pulse2position, bcm_pulse2width, bcm_lvl1a, m_det_lvl1a[6][1]);
 	      break;
 	    case 15:
-	      FillPulseHistos(det_pulse_position_gen[7][1], det_pulse_width_gen[7][1], det_pulse_position[7][1][0], det_pulse_width[7][1][0], bcm_pulse1position, bcm_pulse1width, bcm_lvl1a, det_lvl1a[7][1]);
-	      FillPulseHistos(det_pulse_position_gen[7][1], det_pulse_width_gen[7][1], det_pulse_position[7][1][1], det_pulse_width[7][1][1], bcm_pulse2position, bcm_pulse2width, bcm_lvl1a, det_lvl1a[7][1]);
+	      FillPulseHistos(m_det_pulse_position_gen[7][1], m_det_pulse_width_gen[7][1], m_det_pulse_position[7][1][0], m_det_pulse_width[7][1][0], bcm_pulse1position, bcm_pulse1width, bcm_lvl1a, m_det_lvl1a[7][1]);
+	      FillPulseHistos(m_det_pulse_position_gen[7][1], m_det_pulse_width_gen[7][1], m_det_pulse_position[7][1][1], m_det_pulse_width[7][1][1], bcm_pulse2position, bcm_pulse2width, bcm_lvl1a, m_det_lvl1a[7][1]);
 	      break;
 	    }
 	  }
@@ -1041,24 +1042,24 @@ StatusCode InDetGlobalBCMTool::fillHistograms(){
 	  if (bcid==(*it_c).bcid) { // i.e. (positions_A[gain].front()).bcid == (positions_C[gain].begin()).bcid
 	    int deltatbins=(*it_c).position-(positions_A[gain].front()).position;
 	    deltat = deltatbins/64.0*25.0;
-	    deltat_vs_hits[gain]->Fill(deltat);
-	    deltat_vs_bcid[gain]->Fill((*it_c).bcid, deltat);
-	    deltat_vs_lb[gain]->Fill(m_current_LB, deltat);
-	    deltat_vs_ecr[gain]->Fill((*it_c).ecr, deltat);
-	    deltat_vs_PrVertex[gain]->Fill(z, deltat);
-	    deltat_vs_pixhits[gain]->Fill(n_pix_hits[0]+n_pix_hits[1]+n_pix_hits[2], deltat);
-	    deltat_vs_pixhitsBR[gain]->Fill(n_pix_hits[1], deltat);
-	    deltat_vs_pixhitsEC[gain]->Fill(n_pix_hits[0]+n_pix_hits[2], deltat);
-	    deltat_vs_scthits[gain]->Fill(n_sct_hits[0]+n_sct_hits[1]+n_sct_hits[2], deltat);
-	    deltat_vs_scthitsBR[gain]->Fill(n_sct_hits[1], deltat);
-	    deltat_vs_scthitsEC[gain]->Fill(n_sct_hits[0]+n_sct_hits[2], deltat);
-	    if (abs(deltat) < 6.25) sct_vs_pix_col[gain]->Fill(n_sct_hits[0]+n_sct_hits[1]+n_sct_hits[2], n_pix_hits[0]+n_pix_hits[1]+n_pix_hits[2]);
-	    else sct_vs_pix_bkg[gain]->Fill(n_sct_hits[0]+n_sct_hits[1]+n_sct_hits[2], n_pix_hits[0]+n_pix_hits[1]+n_pix_hits[2]);
+	    m_deltat_vs_hits[gain]->Fill(deltat);
+	    m_deltat_vs_bcid[gain]->Fill((*it_c).bcid, deltat);
+	    m_deltat_vs_lb[gain]->Fill(m_current_LB, deltat);
+	    m_deltat_vs_ecr[gain]->Fill((*it_c).ecr, deltat);
+	    m_deltat_vs_PrVertex[gain]->Fill(z, deltat);
+	    m_deltat_vs_pixhits[gain]->Fill(n_pix_hits[0]+n_pix_hits[1]+n_pix_hits[2], deltat);
+	    m_deltat_vs_pixhitsBR[gain]->Fill(n_pix_hits[1], deltat);
+	    m_deltat_vs_pixhitsEC[gain]->Fill(n_pix_hits[0]+n_pix_hits[2], deltat);
+	    m_deltat_vs_scthits[gain]->Fill(n_sct_hits[0]+n_sct_hits[1]+n_sct_hits[2], deltat);
+	    m_deltat_vs_scthitsBR[gain]->Fill(n_sct_hits[1], deltat);
+	    m_deltat_vs_scthitsEC[gain]->Fill(n_sct_hits[0]+n_sct_hits[2], deltat);
+	    if (abs(deltat) < 6.25) m_sct_vs_pix_col[gain]->Fill(n_sct_hits[0]+n_sct_hits[1]+n_sct_hits[2], n_pix_hits[0]+n_pix_hits[1]+n_pix_hits[2]);
+	    else m_sct_vs_pix_bkg[gain]->Fill(n_sct_hits[0]+n_sct_hits[1]+n_sct_hits[2], n_pix_hits[0]+n_pix_hits[1]+n_pix_hits[2]);
 	    if (detector_a==(*it_c).detector) {
-	      deltat_aligned_vs_ecr[gain]->Fill(ecr,deltat);
-	      deltat_aligned_vs_bcid[gain]->Fill(bcid,deltat);
-	      deltat_aligned_vs_lb[gain]->Fill(m_current_LB, deltat);
-	      deltat_aligned_vs_hits[gain]->Fill(deltat);
+	      m_deltat_aligned_vs_ecr[gain]->Fill(ecr,deltat);
+	      m_deltat_aligned_vs_bcid[gain]->Fill(bcid,deltat);
+	      m_deltat_aligned_vs_lb[gain]->Fill(m_current_LB, deltat);
+	      m_deltat_aligned_vs_hits[gain]->Fill(deltat);
 	    }
 	  }//end of bcid if
 	}//end of c loop
@@ -1086,24 +1087,24 @@ StatusCode InDetGlobalBCMTool::fillHistograms(){
       double nROD1abortfraction = 100*((nROD1HitLG[bc_counter]*11)+nROD1HitHG[bc_counter])/36.0;
       if (nROD0abortfraction != 0 || nROD1abortfraction !=0) {
 	double nabortfraction = (nROD0abortfraction+nROD1abortfraction)/2;
-	AbortFraction->Fill(nabortfraction);
-	AbortFractionVsECR->Fill(ecr, nabortfraction);
-	AbortFractionVsLB->Fill(m_current_LB, nabortfraction);
+	m_AbortFraction->Fill(nabortfraction);
+	m_AbortFractionVsECR->Fill(ecr, nabortfraction);
+	m_AbortFractionVsLB->Fill(m_current_LB, nabortfraction);
 	if (nROD0BCID[bc_counter]==nROD1BCID[bc_counter]) {
-	  AbortFractionVsBCID->Fill(nROD0BCID[bc_counter], nabortfraction);
+	  m_AbortFractionVsBCID->Fill(nROD0BCID[bc_counter], nabortfraction);
 	}
       }
       if (nROD0abortfraction != 0) {
 	//ATH_MSG_WARNING("nROD0abortfraction: " << nROD0abortfraction);
-	AbortFractionROD0->Fill(nROD0abortfraction);
-	AbortFractionROD0VsECR->Fill(ecr,nROD0abortfraction);
-	AbortFractionROD0VsBCID->Fill(nROD0BCID[bc_counter],nROD0abortfraction);
+	m_AbortFractionROD0->Fill(nROD0abortfraction);
+	m_AbortFractionROD0VsECR->Fill(ecr,nROD0abortfraction);
+	m_AbortFractionROD0VsBCID->Fill(nROD0BCID[bc_counter],nROD0abortfraction);
       }
       if (nROD1abortfraction != 0) {
 	//ATH_MSG_WARNING("nROD1abortfraction: " << nROD1abortfraction);
-	AbortFractionROD1->Fill(nROD1abortfraction);
-	AbortFractionROD1VsECR->Fill(ecr,nROD1abortfraction);
-	AbortFractionROD1VsBCID->Fill(nROD1BCID[bc_counter],nROD1abortfraction);
+	m_AbortFractionROD1->Fill(nROD1abortfraction);
+	m_AbortFractionROD1VsECR->Fill(ecr,nROD1abortfraction);
+	m_AbortFractionROD1VsBCID->Fill(nROD1BCID[bc_counter],nROD1abortfraction);
       }
     }
 	  
diff --git a/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalBCMTool.h b/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalBCMTool.h
index 725472582df1223ed21aedf3adcef04dcfba259f..71215e141d9b123d6cebf798cbaaf02450625f8d 100755
--- a/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalBCMTool.h
+++ b/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalBCMTool.h
@@ -61,70 +61,70 @@ private:
     int   m_nExampleInt; 
     
     //BCM Side Histograms    
-    TH1F *stat_pulse_position[2][2][2]; //station/pulse/gain
-    TH1F *stat_pulse_width[2][2][2]; //station/pulse/gain
-    TH1F *stat_pulse_position_gen[2][2]; //station/gain
-    TH1F *stat_pulse_width_gen[2][2]; //station/gain
-    TH1F *stat_lvl1a[2][2]; //station/gain
+    TH1F *m_stat_pulse_position[2][2][2]; //station/pulse/gain
+    TH1F *m_stat_pulse_width[2][2][2]; //station/pulse/gain
+    TH1F *m_stat_pulse_position_gen[2][2]; //station/gain
+    TH1F *m_stat_pulse_width_gen[2][2]; //station/gain
+    TH1F *m_stat_lvl1a[2][2]; //station/gain
 
     //BCM Detector Histogram
-    TH1F* det_lvl1a[8][2];//detector/gain
-    TH1F* det_pulse_position[8][2][2];//detector/pulse/gain
-    TH1F* det_pulse_width[8][2][2];//detector/pulse/gain
-    TH1F* det_pulse_position_gen[8][2];//detector/gain
-    TH1F* det_pulse_width_gen[8][2];//detector/gain
-    TH2F* det_timewalk[8][2];//detector/gain
+    TH1F* m_det_lvl1a[8][2];//detector/gain
+    TH1F* m_det_pulse_position[8][2][2];//detector/pulse/gain
+    TH1F* m_det_pulse_width[8][2][2];//detector/pulse/gain
+    TH1F* m_det_pulse_position_gen[8][2];//detector/gain
+    TH1F* m_det_pulse_width_gen[8][2];//detector/gain
+    TH2F* m_det_timewalk[8][2];//detector/gain
 
     // BCM Global Monitoring Histograms
-    TH2F* ChannelVsLvl1a;
-    TH2F* ChannelVsBCID;
-    TH2F* ChannelVsECR;
-
-    TH1F* hits_lvl1a_all;
-    TH2F* timewalk_all;
-    TH1F* AbortFraction;
-    TH1F* AbortFractionROD0;
-    TH1F* AbortFractionROD1;
-    TH1F* AbortFractionVsBCID;
-    TH1F* AbortFractionROD0VsBCID;
-    TH1F* AbortFractionROD1VsBCID;
-    TH1F* AbortFractionVsECR;
-    TH1F* AbortFractionROD0VsECR;
-    TH1F* AbortFractionROD1VsECR;
-    TH2F* AbortFractionVsLB;
-
-    TH1F* NumberOfEvents;
-    TH1F* pulse_position_all[2];
-    TH1F* pulse_width_all[2];
-    TH1F* hits_lvl1a[2];//gain
-    TH1F* hits_bcid[2];//gain
-    TH1F* hitdistribution[2];//gain
-    TH1F* pulse_position_gen[2];//gain
-    TH1F* pulse_width_gen[2];//gain
-    TH1F* strange_signals[2];//gain
-    TH1F* hitdistribution_pulse[2][2];//pulse/gain
-    TH1F* pulse_position[2][2];//pulse/gain
-    TH1F* pulse_width[2][2];//pulse/gain
-    TH1F* highocc;
+    TH2F* m_ChannelVsLvl1a;
+    TH2F* m_ChannelVsBCID;
+    TH2F* m_ChannelVsECR;
+
+    TH1F* m_hits_lvl1a_all;
+    TH2F* m_timewalk_all;
+    TH1F* m_AbortFraction;
+    TH1F* m_AbortFractionROD0;
+    TH1F* m_AbortFractionROD1;
+    TH1F* m_AbortFractionVsBCID;
+    TH1F* m_AbortFractionROD0VsBCID;
+    TH1F* m_AbortFractionROD1VsBCID;
+    TH1F* m_AbortFractionVsECR;
+    TH1F* m_AbortFractionROD0VsECR;
+    TH1F* m_AbortFractionROD1VsECR;
+    TH2F* m_AbortFractionVsLB;
+
+    TH1F* m_NumberOfEvents;
+    TH1F* m_pulse_position_all[2];
+    TH1F* m_pulse_width_all[2];
+    TH1F* m_hits_lvl1a[2];//gain
+    TH1F* m_hits_bcid[2];//gain
+    TH1F* m_hitdistribution[2];//gain
+    TH1F* m_pulse_position_gen[2];//gain
+    TH1F* m_pulse_width_gen[2];//gain
+    TH1F* m_strange_signals[2];//gain
+    TH1F* m_hitdistribution_pulse[2][2];//pulse/gain
+    TH1F* m_pulse_position[2][2];//pulse/gain
+    TH1F* m_pulse_width[2][2];//pulse/gain
+    TH1F* m_highocc;
 
     //Deltat Histograms
-    TH1F* deltat_vs_hits[2];//gain
-    TH1F* deltat_aligned_vs_hits[2];//gain
-    TH2F* deltat_vs_bcid[2];//gain
-    TH2F* deltat_aligned_vs_bcid[2];//gain
-    TH2F* deltat_vs_lb[2];//gain
-    TH2F* deltat_aligned_vs_lb[2];//gain
-    TH2F* deltat_vs_ecr[2];//gain
-    TH2F* deltat_aligned_vs_ecr[2];//gain
-    TH2F* deltat_vs_PrVertex[2];//gain
-    TH2F* deltat_vs_pixhits[2];//gain
-    TH2F* deltat_vs_pixhitsEC[2];//gain
-    TH2F* deltat_vs_pixhitsBR[2];//gain
-    TH2F* deltat_vs_scthits[2];//gain
-    TH2F* deltat_vs_scthitsEC[2];//gain
-    TH2F* deltat_vs_scthitsBR[2];//gain
-    TH2F* sct_vs_pix_col[2];//gain
-    TH2F* sct_vs_pix_bkg[2];//gain
+    TH1F* m_deltat_vs_hits[2];//gain
+    TH1F* m_deltat_aligned_vs_hits[2];//gain
+    TH2F* m_deltat_vs_bcid[2];//gain
+    TH2F* m_deltat_aligned_vs_bcid[2];//gain
+    TH2F* m_deltat_vs_lb[2];//gain
+    TH2F* m_deltat_aligned_vs_lb[2];//gain
+    TH2F* m_deltat_vs_ecr[2];//gain
+    TH2F* m_deltat_aligned_vs_ecr[2];//gain
+    TH2F* m_deltat_vs_PrVertex[2];//gain
+    TH2F* m_deltat_vs_pixhits[2];//gain
+    TH2F* m_deltat_vs_pixhitsEC[2];//gain
+    TH2F* m_deltat_vs_pixhitsBR[2];//gain
+    TH2F* m_deltat_vs_scthits[2];//gain
+    TH2F* m_deltat_vs_scthitsEC[2];//gain
+    TH2F* m_deltat_vs_scthitsBR[2];//gain
+    TH2F* m_sct_vs_pix_col[2];//gain
+    TH2F* m_sct_vs_pix_bkg[2];//gain
 
     //LB
     unsigned int m_current_LB;
diff --git a/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalErrorMonTool.cxx b/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalErrorMonTool.cxx
index 7ec143fccf349fd8726c0a115953da9223da0630..c2227362e4ff65e8dfa8f6dd796afa1c7cac639c 100755
--- a/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalErrorMonTool.cxx
+++ b/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalErrorMonTool.cxx
@@ -41,9 +41,9 @@ InDetGlobalErrorMonTool::InDetGlobalErrorMonTool( const std::string & type,
   m_totalModulesMapPixel(nullptr),
   m_totalModulesMapSCT(nullptr),
   m_totalModulesMapSi(nullptr),
-  c_nBinsEta( 200 ),
-  c_rangeEta( 2.5 ),
-  c_nBinsPhi( 200 )
+  m_c_nBinsEta( 200 ),
+  m_c_rangeEta( 2.5 ),
+  m_c_nBinsPhi( 200 )
 {
 }
 
@@ -80,36 +80,36 @@ StatusCode InDetGlobalErrorMonTool::bookHistogramsRecurrent()
     if ( newRunFlag() )
     {
       m_disabledModulesMapPixel = new TH2F( "disabledModulesMapPixel", "Map of disabled modules for Pixel", 
-					    c_nBinsEta, -c_rangeEta, c_rangeEta, 
-					    c_nBinsPhi, -M_PI, M_PI );
+					    m_c_nBinsEta, -m_c_rangeEta, m_c_rangeEta, 
+					    m_c_nBinsPhi, -M_PI, M_PI );
       
       m_disabledModulesMapSCT   = new TH2F( "disabledModulesMapSCT", "Map of disabled modules for SCT", 
-					    c_nBinsEta, -c_rangeEta, c_rangeEta, 
-					    c_nBinsPhi, -M_PI, M_PI );
+					    m_c_nBinsEta, -m_c_rangeEta, m_c_rangeEta, 
+					    m_c_nBinsPhi, -M_PI, M_PI );
        
       m_badModulesMapPixel = new TH2F( "badModulesMapPixel", "Map of bad modules for Pixel", 
-					 c_nBinsEta, -c_rangeEta, c_rangeEta, 
-					 c_nBinsPhi, -M_PI, M_PI );
+					 m_c_nBinsEta, -m_c_rangeEta, m_c_rangeEta, 
+					 m_c_nBinsPhi, -M_PI, M_PI );
       
       m_errorModulesMapPixel = new TH2F( "errorModulesMapPixel", "Map of modules in error for Pixel", 
-					 c_nBinsEta, -c_rangeEta, c_rangeEta, 
-					 c_nBinsPhi, -M_PI, M_PI );
+					 m_c_nBinsEta, -m_c_rangeEta, m_c_rangeEta, 
+					 m_c_nBinsPhi, -M_PI, M_PI );
       
      m_errorModulesMapSCT   = new TH2F( "errorModulesMapSCT", "Map of bad modules for SCT", 
-					 c_nBinsEta, -c_rangeEta, c_rangeEta, 
-					 c_nBinsPhi, -M_PI, M_PI );
+					 m_c_nBinsEta, -m_c_rangeEta, m_c_rangeEta, 
+					 m_c_nBinsPhi, -M_PI, M_PI );
       
       m_totalModulesMapPixel = new TH2F( "totalModulesMapPixel", "Map of all bad and disabled modules for Pixel", 
-					 c_nBinsEta, -c_rangeEta, c_rangeEta, 
-					 c_nBinsPhi, -M_PI, M_PI );
+					 m_c_nBinsEta, -m_c_rangeEta, m_c_rangeEta, 
+					 m_c_nBinsPhi, -M_PI, M_PI );
       
       m_totalModulesMapSCT   = new TH2F( "totalModulesMapSCT", "Map of all bad and disabled modules for SCT", 
-					 c_nBinsEta, -c_rangeEta, c_rangeEta, 
-					 c_nBinsPhi, -M_PI, M_PI );
+					 m_c_nBinsEta, -m_c_rangeEta, m_c_rangeEta, 
+					 m_c_nBinsPhi, -M_PI, M_PI );
 
       m_totalModulesMapSi   = new TH2F( "totalModulesMapSi", "Map of all bad and disabled modules for Pixel and SCT", 
-					 c_nBinsEta, -c_rangeEta, c_rangeEta, 
-					 c_nBinsPhi, -M_PI, M_PI );
+					 m_c_nBinsEta, -m_c_rangeEta, m_c_rangeEta, 
+					 m_c_nBinsPhi, -M_PI, M_PI );
       
       status &= monGr_shift.regHist( m_disabledModulesMapPixel ).isSuccess();
       status &= monGr_shift.regHist( m_errorModulesMapPixel ).isSuccess();
@@ -202,8 +202,8 @@ void InDetGlobalErrorMonTool::FillModule( moduleGeo_t module, TH2F * histo )
   unsigned int highY = 0;
   double area = 0.;
   
-  double widthEta = 2. * c_rangeEta / c_nBinsEta;
-  double widthPhi = 2. * M_PI / c_nBinsPhi;
+  double widthEta = 2. * m_c_rangeEta / m_c_nBinsEta;
+  double widthPhi = 2. * M_PI / m_c_nBinsPhi;
   double edgesEta[200], centerEta[200], 
     edgesPhi[200], centerPhi[200];
   
@@ -212,25 +212,25 @@ void InDetGlobalErrorMonTool::FillModule( moduleGeo_t module, TH2F * histo )
   histo->GetYaxis()->GetLowEdge(edgesPhi);
   histo->GetYaxis()->GetCenter(centerPhi);
   
-  for ( unsigned int i = 0; i < c_nBinsEta; i++ )
+  for ( unsigned int i = 0; i < m_c_nBinsEta; i++ )
     if ( edgesEta[i] + widthEta > module.first.first )
       {
 	lowX = i;
 	break;
       }
-  for ( unsigned int i = lowX; i < c_nBinsEta; i++ )
+  for ( unsigned int i = lowX; i < m_c_nBinsEta; i++ )
     if ( edgesEta[i] > module.first.second )
       {
 	highX = i;
 	break;
       }
-  for ( unsigned int i = 0; i < c_nBinsPhi; i++ )
+  for ( unsigned int i = 0; i < m_c_nBinsPhi; i++ )
     if ( edgesPhi[i] + widthPhi > module.second.first )
       {
 	lowY = i;
 	break;
       }
-  for ( unsigned int i = lowY; i < c_nBinsPhi; i++ )
+  for ( unsigned int i = lowY; i < m_c_nBinsPhi; i++ )
     if ( edgesPhi[i] > module.second.second )
       {
 	highY = i;
diff --git a/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalErrorMonTool.h b/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalErrorMonTool.h
index 4439791461d8e1e81cca4c96e614fb8f419b29c9..551ff247706969b3ef88f187f4d77413f74db3c6 100755
--- a/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalErrorMonTool.h
+++ b/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalErrorMonTool.h
@@ -78,9 +78,9 @@ private:
     TH2F * m_totalModulesMapSCT;
     TH2F * m_totalModulesMapSi;
 
-    const unsigned int c_nBinsEta;
-    const float        c_rangeEta;
-    const unsigned int c_nBinsPhi;
+    const unsigned int m_c_nBinsEta;
+    const float        m_c_rangeEta;
+    const unsigned int m_c_nBinsPhi;
 };
 
 #endif
diff --git a/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalMotherTrigMonTool.cxx b/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalMotherTrigMonTool.cxx
index bdfae3b2d9dfde3db3aca984455b4fb31ef3ef85..a4c5746f250685108d06a79948bde8f99d76a644 100755
--- a/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalMotherTrigMonTool.cxx
+++ b/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalMotherTrigMonTool.cxx
@@ -30,9 +30,9 @@ InDetGlobalMotherTrigMonTool::InDetGlobalMotherTrigMonTool(
     const std::string & name,
     const IInterface* parent)
   : InDetGlobalMotherMonTool(type, name, parent),
-    doTrigger(true)
+    m_doTrigger(true)
 {
-  declareProperty("doTrigger",doTrigger);
+  declareProperty("doTrigger",m_doTrigger);
 }
 
 StatusCode InDetGlobalMotherTrigMonTool::initialize(){
diff --git a/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalMotherTrigMonTool.h b/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalMotherTrigMonTool.h
index f11c2ceb369206a1f0adbe1913de83ddf38f26be..8c03a6b265994f0aa75c0410877e1ff653426c34 100755
--- a/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalMotherTrigMonTool.h
+++ b/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalMotherTrigMonTool.h
@@ -60,7 +60,7 @@ class InDetGlobalMotherTrigMonTool : public InDetGlobalMotherMonTool
     StatusCode fillTrigAwareHisto(TH2I_LW*, int);
     std::string m_triggerNames[8];  
     StatusCode PrintTriggers();
-    bool doTrigger;
+    bool m_doTrigger;
     
  private:
     int m_firedTriggers[8];
diff --git a/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalNoiseOccupancyMonTool.cxx b/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalNoiseOccupancyMonTool.cxx
index f2e5c2c9b691661e36fc7275053c3353e9725a5e..416c94c6af93b2056eaaa3538ae4ba5bdf29b8b2 100755
--- a/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalNoiseOccupancyMonTool.cxx
+++ b/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalNoiseOccupancyMonTool.cxx
@@ -398,10 +398,10 @@ StatusCode InDetGlobalNoiseOccupancyMonTool::fillHistograms( )
     int nPIX_trk_ECA = 0;
     int nPIX_trk_ECC = 0;
 
-    int m_TRT_nOnTrack_phi_BA[32] = {0};
-    int m_TRT_nOnTrack_phi_BC[32] = {0};
-    int m_TRT_nOnTrack_phi_ECA[32] = {0};
-    int m_TRT_nOnTrack_phi_ECC[32] = {0};
+    int TRT_nOnTrack_phi_BA[32] = {0};
+    int TRT_nOnTrack_phi_BC[32] = {0};
+    int TRT_nOnTrack_phi_ECA[32] = {0};
+    int TRT_nOnTrack_phi_ECC[32] = {0};
 
 
     if (m_tracks) {
@@ -443,16 +443,16 @@ StatusCode InDetGlobalNoiseOccupancyMonTool::fillHistograms( )
 			switch ( m_trtID->barrel_ec(rdoId) )
 			{
 			case 1:
-			    m_TRT_nOnTrack_phi_BA[m_trtID->phi_module(rdoId)]++;
+			    TRT_nOnTrack_phi_BA[m_trtID->phi_module(rdoId)]++;
 			    break;
 			case -1:
-			    m_TRT_nOnTrack_phi_BC[m_trtID->phi_module(rdoId)]++;
+			    TRT_nOnTrack_phi_BC[m_trtID->phi_module(rdoId)]++;
 			    break;
 			case -2:
-			    m_TRT_nOnTrack_phi_ECA[m_trtID->phi_module(rdoId)]++;
+			    TRT_nOnTrack_phi_ECA[m_trtID->phi_module(rdoId)]++;
 			    break;
 			case 2:
-			    m_TRT_nOnTrack_phi_ECC[m_trtID->phi_module(rdoId)]++;
+			    TRT_nOnTrack_phi_ECC[m_trtID->phi_module(rdoId)]++;
 			    break;
 			}
 	    
@@ -520,10 +520,10 @@ StatusCode InDetGlobalNoiseOccupancyMonTool::fillHistograms( )
     // loop over TRT RDOs collections
     //--*--*--*--*--*--*--*--*--*--*--*--*--*--*--*
 
-    int m_TRT_nRDOs_phi_BA[32] = {0};
-    int m_TRT_nRDOs_phi_BC[32] = {0};
-    int m_TRT_nRDOs_phi_ECA[32] = {0};
-    int m_TRT_nRDOs_phi_ECC[32] = {0};
+    int TRT_nRDOs_phi_BA[32] = {0};
+    int TRT_nRDOs_phi_BC[32] = {0};
+    int TRT_nRDOs_phi_ECA[32] = {0};
+    int TRT_nRDOs_phi_ECC[32] = {0};
 
     if(m_driftCircleContainer!=0){
 	TRT_DriftCircleContainer::const_iterator colIt =
@@ -552,16 +552,16 @@ StatusCode InDetGlobalNoiseOccupancyMonTool::fillHistograms( )
 		switch ( m_trtID->barrel_ec(rdoId) )
 		{
 		case 1:
-		    m_TRT_nRDOs_phi_BA[m_trtID->phi_module(rdoId)]++;
+		    TRT_nRDOs_phi_BA[m_trtID->phi_module(rdoId)]++;
 		    break;
 		case -1:
-		    m_TRT_nRDOs_phi_BC[m_trtID->phi_module(rdoId)]++;
+		    TRT_nRDOs_phi_BC[m_trtID->phi_module(rdoId)]++;
 		    break;
 		case -2:
-		    m_TRT_nRDOs_phi_ECA[m_trtID->phi_module(rdoId)]++;
+		    TRT_nRDOs_phi_ECA[m_trtID->phi_module(rdoId)]++;
 		    break;
 		case 2:
-		    m_TRT_nRDOs_phi_ECC[m_trtID->phi_module(rdoId)]++;
+		    TRT_nRDOs_phi_ECC[m_trtID->phi_module(rdoId)]++;
 		    break;
 		}
 	
@@ -740,9 +740,9 @@ StatusCode InDetGlobalNoiseOccupancyMonTool::fillHistograms( )
       
 	/*
 	 * add the current struct to end of the vector
-	 * NO - declared in header
+	 * m_NO - declared in header
 	 */
-	NO.push_back(noise_occupancy);
+	m_NO.push_back(noise_occupancy);
       
 	/* strem for debug
 	 * msg << "added strct to vector" << endl;
@@ -779,10 +779,10 @@ StatusCode InDetGlobalNoiseOccupancyMonTool::fillHistograms( )
 	m_TRT_NO->Fill(dTRTstraw);
 
 	for (int i = 0;i < 32;i++){
-	    m_TRT_NO_BA_phi->Fill(i,((float)m_TRT_nRDOs_phi_BA[i]-(float)m_TRT_nOnTrack_phi_BA[i])/(float)m_nStraws_B*32.0*2);
-	    m_TRT_NO_BC_phi->Fill(i,((float)m_TRT_nRDOs_phi_BC[i]-(float)m_TRT_nOnTrack_phi_BC[i])/(float)m_nStraws_B*32.0*2);
-	    m_TRT_NO_ECA_phi->Fill(i,((float)m_TRT_nRDOs_phi_ECA[i]-(float)m_TRT_nOnTrack_phi_ECA[i])/(float)m_nStraws_ECA*32.0 );
-	    m_TRT_NO_ECC_phi->Fill(i,((float)m_TRT_nRDOs_phi_ECC[i]-(float)m_TRT_nOnTrack_phi_ECC[i])/(float)m_nStraws_ECC*32.0 );
+	    m_TRT_NO_BA_phi->Fill(i,((float)TRT_nRDOs_phi_BA[i]-(float)TRT_nOnTrack_phi_BA[i])/(float)m_nStraws_B*32.0*2);
+	    m_TRT_NO_BC_phi->Fill(i,((float)TRT_nRDOs_phi_BC[i]-(float)TRT_nOnTrack_phi_BC[i])/(float)m_nStraws_B*32.0*2);
+	    m_TRT_NO_ECA_phi->Fill(i,((float)TRT_nRDOs_phi_ECA[i]-(float)TRT_nOnTrack_phi_ECA[i])/(float)m_nStraws_ECA*32.0 );
+	    m_TRT_NO_ECC_phi->Fill(i,((float)TRT_nRDOs_phi_ECC[i]-(float)TRT_nOnTrack_phi_ECC[i])/(float)m_nStraws_ECC*32.0 );
 	}
 
 	m_TRT_NO_nseg->Fill(nTRT_seg,dTRTstraw);
@@ -868,14 +868,14 @@ StatusCode InDetGlobalNoiseOccupancyMonTool::fillHistograms( )
      * Added by m
      */
     if(m_evt%10==0){
-	correlation_coeffs(NO);
+	correlation_coeffs(m_NO);
 
 	/* 
-	 * clear the NO occupancy vector as .push_back()
+	 * clear the m_NO occupancy vector as .push_back()
 	 * will continue to add onto the end even although
 	 * we're starting a new calcualtion
 	 */
-	NO.clear();
+	m_NO.clear();
     }
     
     //--*--*--*--*--*--*--*--*--*--*--*--*--*--*--*
diff --git a/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalNoiseOccupancyMonTool.h b/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalNoiseOccupancyMonTool.h
index 4b88b7d6a59c1a2727b7dfe18b1126239ba10da1..2b11f88c1ed994fd930f50b02b6c5665e2cb7a4b 100755
--- a/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalNoiseOccupancyMonTool.h
+++ b/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalNoiseOccupancyMonTool.h
@@ -237,7 +237,8 @@ class InDetGlobalNoiseOccupancyMonTool : public InDetGlobalMotherMonTool{
    * each time
    * Added by m
    */  
-  vector<struct noise> NO;
+
+  vector<struct noise> m_NO;
 };
 
 #endif
diff --git a/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalSynchMonTool.cxx b/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalSynchMonTool.cxx
index 5219110094b7436ed66ebc3015aa168cb9aafad5..ea596b0a312b6d03dd2d876ef7a73223bc65e5c9 100755
--- a/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalSynchMonTool.cxx
+++ b/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalSynchMonTool.cxx
@@ -352,12 +352,12 @@ StatusCode InDetGlobalSynchMonTool::fillHistograms()
     int prev_bcm_bcid = -1;
     int prev_bcm_lvl1id = -1;
 
-    if ( doTrigger == true && InDetGlobalMotherTrigMonTool::CheckTriggers() != StatusCode::SUCCESS ){
+    if ( m_doTrigger == true && InDetGlobalMotherTrigMonTool::CheckTriggers() != StatusCode::SUCCESS ){
 	if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Triggers not found!" << endmsg;
-	doTrigger = false;
+	m_doTrigger = false;
     }
       
-    //doTrigger = false;  // REMOVE
+    //m_doTrigger = false;  // REMOVE
 
     if ( m_BCM_RDO != 0 ) // Protection for when there is no BCM data
     {  
diff --git a/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalTrackMonTool.cxx b/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalTrackMonTool.cxx
index 2d0b0d08d58f5b7d48eba5540f2f1e26ddadf2dd..c2c667e2d5002926011c47cd180a050dc3ada6e3 100755
--- a/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalTrackMonTool.cxx
+++ b/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalTrackMonTool.cxx
@@ -72,12 +72,12 @@ InDetGlobalTrackMonTool::InDetGlobalTrackMonTool( const std::string & type,
       m_nBinsEta( 50 ),
       m_nBinsPhi( 50 ),
       m_trackBin( 100 ),
-      c_etaRange(2.5),
-      c_etaTrackletsMin(2.4),
-      c_etaTrackletsMax(2.7),
-      c_etaRangeTRT(2.0),
-      c_range_LB(3000),
-      c_detector_labels{ "IBL", "PIX", "SCT", "TRT" },
+      m_c_etaRange(2.5),
+      m_c_etaTrackletsMin(2.4),
+      m_c_etaTrackletsMax(2.7),
+      m_c_etaRangeTRT(2.0),
+      m_c_range_LB(3000),
+      m_c_detector_labels{ "IBL", "PIX", "SCT", "TRT" },
       m_IBLParameterSvc("IBLParameterSvc",name),
       m_holes_search_tool("InDet::InDetTrackHoleSearchTool/InDetHoleSearchTool"),
       m_trkSummaryTool("Trk::TrackSummaryTool/InDetTrackSummaryTool"),
@@ -87,14 +87,14 @@ InDetGlobalTrackMonTool::InDetGlobalTrackMonTool( const std::string & type,
       m_CombinedTracksName("Tracks"),
       m_ForwardTracksName("ResolvedForwardTracks"),
       m_JetsName("AntiKt4EMTopoJets"),
-      sct_holes(nullptr),
-      trt_holes(nullptr),
-      pixel_holes(nullptr),
-      comb_holes(nullptr),
-      silicon_vs_trt(nullptr),
-      sct_vs_pixels(nullptr),
-      holes_quality(nullptr),
-      holes_quality_profile(nullptr),
+      m_sct_holes(nullptr),
+      m_trt_holes(nullptr),
+      m_pixel_holes(nullptr),
+      m_comb_holes(nullptr),
+      m_silicon_vs_trt(nullptr),
+      m_sct_vs_pixels(nullptr),
+      m_holes_quality(nullptr),
+      m_holes_quality_profile(nullptr),
       m_Trk_eta_phi_Base(nullptr),
       m_Trk_eta_phi_Tight_ratio(nullptr),
       m_Trk_eta_phi_noIBLhit_ratio(nullptr),
@@ -227,25 +227,25 @@ StatusCode InDetGlobalTrackMonTool::bookHistograms()
     // Eta-phi maps
     registerManHist( m_Trk_eta_phi_Base, "InDetGlobal/Track", detailsInterval,
 		     "Trk_Base_eta_phi","Distribution of eta vs phi for combined tracks passing Loose Primary selection",
-                     m_nBinsEta, -c_etaRange, c_etaRange,
+                     m_nBinsEta, -m_c_etaRange, m_c_etaRange,
                      m_nBinsPhi, -M_PI, M_PI,
                      "eta", "#phi_{0}" ).ignore();
 
     registerManHist( m_Trk_eta_phi_Tight_ratio, "InDetGlobal/Track", detailsInterval,
 		     "Trk_Tight_eta_phi_ratio","Distribution of eta vs phi for combined tracks passing Tight selection",
-                     m_nBinsEta, -c_etaRange, c_etaRange,
+                     m_nBinsEta, -m_c_etaRange, m_c_etaRange,
                      m_nBinsPhi, -M_PI, M_PI,
                      "eta", "#phi_{0}" ).ignore();
     
     registerManHist( m_Trk_eta_phi_noTRText_ratio, "InDetGlobal/Track", detailsInterval,
 		     "Trk_noTRText_eta_phi_ratio","Distribution of eta vs phi for combined tracks with no TRT extension",
-		     20, -c_etaRangeTRT, c_etaRangeTRT, 
+		     20, -m_c_etaRangeTRT, m_c_etaRangeTRT, 
 		     m_nBinsPhi, -M_PI, M_PI,
 		     "eta", "#phi_{0}" ).ignore();
     
     registerManHist( m_Trk_eta_phi_noBLhit_ratio, "InDetGlobal/Track", detailsInterval,
 		     "Trk_noBLhit_eta_phi_ratio","Eta-phi of tracks with no b-layer hit but a hit is expected, ratio to total tracks",
-		     m_nBinsEta, -c_etaRange, c_etaRange, 
+		     m_nBinsEta, -m_c_etaRange, m_c_etaRange, 
 		     m_nBinsPhi, -M_PI, M_PI,
 		     "#eta", "#phi_{0}").ignore();
     
@@ -253,7 +253,7 @@ StatusCode InDetGlobalTrackMonTool::bookHistograms()
     {
 	registerManHist( m_Trk_eta_phi_noIBLhit_ratio, "InDetGlobal/Track", detailsInterval,
 			 "Trk_noIBLhit_eta_phi_ratio","Eta-phi of tracks with no IBL hit but a hit is expected, ratio to total tracks",
-			 m_nBinsEta, -c_etaRange, c_etaRange, 
+			 m_nBinsEta, -m_c_etaRange, m_c_etaRange, 
 			 m_nBinsPhi, -M_PI, M_PI,
 			 "#eta", "#phi_{0}").ignore();
     }
@@ -283,35 +283,35 @@ StatusCode InDetGlobalTrackMonTool::bookHistograms()
     for (unsigned int i = ( (m_doIBL) ? 0 : 1) ; i < m_trk_hits_eta_phi.size(); i++ )
     {
 	registerManHist( m_trk_hits_eta_phi[i],  "InDetGlobal/Hits", detailsInterval,
-			 "Trk_n"+c_detector_labels[i]+"hits_eta_phi","Number of "+c_detector_labels[i]+" hits per track, eta-phi profile",
-			 m_nBinsEta, -c_etaRange, c_etaRange,
+			 "Trk_n"+m_c_detector_labels[i]+"hits_eta_phi","Number of "+m_c_detector_labels[i]+" hits per track, eta-phi profile",
+			 m_nBinsEta, -m_c_etaRange, m_c_etaRange,
 			 m_nBinsPhi,-M_PI,M_PI,
 			 "#eta", "#phi" ).ignore();
     
 	registerManHist( m_trk_hits_LB[i], "InDetGlobal/Track", detailsInterval,
-			 "trk_n"+c_detector_labels[i]+"hits_LB","Average number of " + c_detector_labels[i] + " hits by LB",
-			 c_range_LB,0,c_range_LB,
+			 "trk_n"+m_c_detector_labels[i]+"hits_LB","Average number of " + m_c_detector_labels[i] + " hits by LB",
+			 m_c_range_LB,0,m_c_range_LB,
 			 "LB #", "Average number of hits in LB").ignore();
     }
     
     for (unsigned int i = 1; i < m_trk_disabled_eta_phi.size(); i++ )
     {
 	registerManHist( m_trk_disabled_eta_phi[i],  "InDetGlobal/Hits", detailsInterval,
-			 "Trk_n"+c_detector_labels[i]+"disabled_eta_phi","Number of "+c_detector_labels[i]+" disabled detector elements per track, eta-phi profile",
-			 m_nBinsEta, -c_etaRange, c_etaRange,
+			 "Trk_n"+m_c_detector_labels[i]+"disabled_eta_phi","Number of "+m_c_detector_labels[i]+" disabled detector elements per track, eta-phi profile",
+			 m_nBinsEta, -m_c_etaRange, m_c_etaRange,
 			 m_nBinsPhi,-M_PI,M_PI,
 			 "#eta", "#phi" ).ignore();
     }
     
     registerManHist( m_trk_shared_pix_eta_phi,  "InDetGlobal/Hits", detailsInterval,
 		     "Trk_nPixShared_eta_phi","Number of Pixel shared hits per track, eta-phi profile",
-		     m_nBinsEta, -c_etaRange, c_etaRange,
+		     m_nBinsEta, -m_c_etaRange, m_c_etaRange,
 		     m_nBinsPhi,-M_PI,M_PI,
 		     "#eta", "#phi" ).ignore();
 
     registerManHist( m_trk_split_pix_eta_phi,  "InDetGlobal/Hits", detailsInterval,
 		     "Trk_nPixSplit_eta_phi","Number of Pixel split hits per track, eta-phi profile",
-		     m_nBinsEta, -c_etaRange, c_etaRange,
+		     m_nBinsEta, -m_c_etaRange, m_c_etaRange,
 		     m_nBinsPhi,-M_PI,M_PI,
 		     "#eta", "#phi" ).ignore();
     
@@ -373,31 +373,31 @@ StatusCode InDetGlobalTrackMonTool::bookHistograms()
 
     registerManHist( m_trk_jetassoc_ip_reso_lb, "InDetGlobal/Hits", detailsInterval,
 		     "Trk_jetassoc_ip_reso_lb", "IP resolution  per ghost associated track vs LB",
-		     c_range_LB, 0, c_range_LB, "#Delta R", "Fraction" ).ignore();
+		     m_c_range_LB, 0, m_c_range_LB, "#Delta R", "Fraction" ).ignore();
 
     registerManHist( m_trk_jetassoc_split_pix_lb, "InDetGlobal/Hits", detailsInterval,
 		     "Trk_jetassoc_split_pix_lb", "Fraction of split Pixel hits vs LB",
-		     c_range_LB, 0, c_range_LB, "#Delta R", "Fraction" ).ignore();
+		     m_c_range_LB, 0, m_c_range_LB, "#Delta R", "Fraction" ).ignore();
 
     registerManHist( m_trk_jetassoc_shared_pix_lb, "InDetGlobal/Hits", detailsInterval,
 		     "Trk_jetassoc_shared_pix_lb", "Fraction of shared Pixel hits vs LB",
-		     c_range_LB, 0, c_range_LB, "#DeltaR", "Fraction" ).ignore();
+		     m_c_range_LB, 0, m_c_range_LB, "#DeltaR", "Fraction" ).ignore();
 
     registerManHist( m_trk_shared_sct_eta_phi,  "InDetGlobal/Hits", detailsInterval,
 		     "Trk_nSCTShared_eta_phi","Number of SCT shared hits per track, eta-phi profile",
-		     m_nBinsEta, -c_etaRange, c_etaRange,
+		     m_nBinsEta, -m_c_etaRange, m_c_etaRange,
 		     m_nBinsPhi,-M_PI,M_PI,
 		     "#eta", "#phi" ).ignore();
 
     registerManHist( m_trk_holes_pix_eta_phi,  "InDetGlobal/Hits", detailsInterval,
 		     "Trk_nPixHoles_eta_phi","Number of Pixel holes per track, eta-phi profile",
-		     m_nBinsEta, -c_etaRange, c_etaRange,
+		     m_nBinsEta, -m_c_etaRange, m_c_etaRange,
 		     m_nBinsPhi,-M_PI,M_PI,
 		     "#eta", "#phi" ).ignore();
 
     registerManHist( m_trk_holes_sct_eta_phi,  "InDetGlobal/Hits", detailsInterval,
 		     "Trk_nSCTHoles_eta_phi","Number of SCT holes per track, eta-phi profile",
-		     m_nBinsEta, -c_etaRange, c_etaRange,
+		     m_nBinsEta, -m_c_etaRange, m_c_etaRange,
 		     m_nBinsPhi,-M_PI,M_PI,
 		     "#eta", "#phi" ).ignore();
 
@@ -406,13 +406,13 @@ StatusCode InDetGlobalTrackMonTool::bookHistograms()
     {	
 	registerManHist( m_Trk_FORW_FA_eta_phi, "InDetGlobal/Track", detailsInterval,
 			 "Trk_FORW_FA_eta_phi", "Eta-phi for pixel tracklets in the forward region (positive eta)",
-			 5, c_etaTrackletsMin, c_etaTrackletsMax, 
+			 5, m_c_etaTrackletsMin, m_c_etaTrackletsMax, 
 			 m_nBinsPhi, -M_PI, M_PI, 
 			 "#eta", "#phi_{0}" ).ignore();
 	
 	registerManHist( m_Trk_FORW_FC_eta_phi, "InDetGlobal/Track", detailsInterval,
 			 "Trk_FORW_FC_eta_phi", "Eta-phi for pixel tracklets in the forward region (negative eta)",
-			 5, -c_etaTrackletsMax, -c_etaTrackletsMin, 
+			 5, -m_c_etaTrackletsMax, -m_c_etaTrackletsMin, 
 			 m_nBinsPhi, -M_PI, M_PI, 
 			 "#eta", "#phi_{0}" ).ignore();
 	
@@ -440,81 +440,81 @@ StatusCode InDetGlobalTrackMonTool::bookHistograms()
     // LB histograms
     registerManHist( m_Trk_nBase_LB, "InDetGlobal/Track", detailsInterval,
 		     "Trk_nBase_LB","Average number of baseline tracks per event in LB",
-		     c_range_LB,0,c_range_LB,
+		     m_c_range_LB,0,m_c_range_LB,
 		     "LB #", "Average number of loose primary tracks per event in LB").ignore();
 
     registerManHist( m_Trk_nTight_LB, "InDetGlobal/Track", detailsInterval,
 		     "Trk_nTight_LB","Average number of tight tracks per event in LB",
-		     c_range_LB,0,c_range_LB,
+		     m_c_range_LB,0,m_c_range_LB,
 		     "LB #", "Average number of tight tracks per event in LB").ignore();
     
     if ( m_doIBL )
     {
 	registerManHist( m_Trk_noIBLhits_LB, "InDetGlobal/Track", detailsInterval,
 			 "Trk_noIBLhits_LB","Average number of tracks with missing IBL hit per event in LB",
-			 c_range_LB,0,c_range_LB,
+			 m_c_range_LB,0,m_c_range_LB,
 			 "LB #", "Average number of tracks with missing IBL hit per event in LB").ignore();
 	registerManHist( m_Trk_noIBLhits_frac_LB, "InDetGlobal/Track", detailsInterval,
 			 "Trk_noIBLhits_frac_LB","Fraction of tracks with missing IBL hit per event in LB",
-			 c_range_LB,0,c_range_LB,
+			 m_c_range_LB,0,m_c_range_LB,
 			 "LB #", "Fraction of tracks with missing IBL hit per event in LB").ignore();
     }
     
     registerManHist( m_Trk_noBLhits_LB, "InDetGlobal/Track", detailsInterval,
 		     "Trk_noBLhits_LB","Average number of tracks with missing b-layer hit per event in LB",
-		     c_range_LB,0,c_range_LB,
+		     m_c_range_LB,0,m_c_range_LB,
 		     "LB #", "Average number of tracks with missing b-layer hit per event in LB").ignore();
 
     registerManHist( m_Trk_noBLhits_frac_LB, "InDetGlobal/Track", detailsInterval,
 		     "Trk_noBLhits_frac_LB","Fraction of tracks with missing b-layer hit per event in LB",
-		     c_range_LB,0,c_range_LB,
+		     m_c_range_LB,0,m_c_range_LB,
 		     "LB #", "Fraction of tracks with missing b-layer hit per event in LB").ignore();
 
     registerManHist( m_Trk_noTRText_LB, "InDetGlobal/Track", detailsInterval,
 		     "Trk_noTRText_LB","Average number of tracks without TRT extension per event in LB",
-		     c_range_LB,0,c_range_LB,
+		     m_c_range_LB,0,m_c_range_LB,
 		     "LB #", "Average number of tracks with without TRT extension per event in LB").ignore();
     registerManHist( m_Trk_noTRText_frac_LB, "InDetGlobal/Track", detailsInterval,
 		     "Trk_noTRText_frac_LB","Fraction of tracks without TRT extension per event in LB",
-		     c_range_LB,0,c_range_LB,
+		     m_c_range_LB,0,m_c_range_LB,
 		     "LB #", "Fraction of tracks with without TRT extension per event in LB").ignore();
 
     // Holes
     if ( m_doHolePlots )
     {
-	registerManHist( sct_holes, "InDetGlobal/Hits", detailsInterval,
+	registerManHist( m_sct_holes, "InDetGlobal/Hits", detailsInterval,
 			 "sct_holes", "Distribution of SCT Holes ",
 			 104,-3.5,100.5,
 			 "Number of SCT holes").ignore();	
 	
-	registerManHist( trt_holes, "InDetGlobal/Hits", detailsInterval,
+	registerManHist( m_trt_holes, "InDetGlobal/Hits", detailsInterval,
 			 "trt_holes", "Distribution of TRT Holes ",
 			 104,-3.5,100.5,
 			 "Number of TRT holes").ignore();
 	
-	registerManHist( pixel_holes, "InDetGlobal/Hits", detailsInterval,
+	registerManHist( m_pixel_holes, "InDetGlobal/Hits", detailsInterval,
 			 "pixel_holes", "Distribution of Pixel Holes ",
 			 104,-3.5,100.5,
 			 "Number of Pixel holes").ignore();
 	
-	registerManHist( comb_holes, "InDetGlobal/Hits", detailsInterval,
+	registerManHist( m_comb_holes, "InDetGlobal/Hits", detailsInterval,
 			 "comb_holes", "Distribution of Combined Holes ",
 			 104,-3.5,100.5,
 			 "Total number of holes").ignore();
 	
-	registerManHist( silicon_vs_trt, "InDetGlobal/Hits", detailsInterval,
+	registerManHist( m_silicon_vs_trt, "InDetGlobal/Hits", detailsInterval,
 			 "silicon_vs_trt", "Silicon vs TRT holes ",
 			 104,-3.5,100.5,
 			 104,-3.5,100.5,
 			 "Silicon Combined holes", "TRT holes").ignore();
 	
-	registerManHist( sct_vs_pixels, "InDetGlobal/Hits", detailsInterval,
+	registerManHist( m_sct_vs_pixels, "InDetGlobal/Hits", detailsInterval,
 			 "sct_vs_pixels", "SCT vs Pixels holes ",
 			 104,-3.5,100.5,
 			 104,-3.5,100.5,
 			 "SCT", "Pixels").ignore();
 	
-	registerManHist( holes_quality, "InDetGlobal/Hits", detailsInterval,
+	registerManHist( m_holes_quality, "InDetGlobal/Hits", detailsInterval,
 			 "holes_quality", "Number of holes/track vs #chi^{2}/ndf",
 			 160,-0.5,15.5,
 			 104,-3.5,100.5,
@@ -522,14 +522,14 @@ StatusCode InDetGlobalTrackMonTool::bookHistograms()
 	
 	registerManHist( m_holes_eta_phi, "InDetGlobal/Hits", detailsInterval,
 			 "holes_eta_phi", "Holes Map #eta #phi",
-			 m_nBinsEta,-c_etaRange,c_etaRange,
+			 m_nBinsEta,-m_c_etaRange,m_c_etaRange,
 			 m_nBinsPhi,-M_PI,M_PI,
 			 "#eta", "#phi").ignore();
 	
 	
 	registerManHist( m_holes_eta_pt,  "InDetGlobal/Hits", detailsInterval,
 			 "holes_eta_pt", "Holes #eta vs p_{t}",
-			 m_nBinsEta,-c_etaRange,c_etaRange,
+			 m_nBinsEta,-m_c_etaRange,m_c_etaRange,
 			 30,-0.,30.,
 			 "#eta", "#p_{t}").ignore();
 	
@@ -541,17 +541,17 @@ StatusCode InDetGlobalTrackMonTool::bookHistograms()
 	
 	registerManHist( m_holes_eta_phi_n,  "InDetGlobal/Hits", detailsInterval,
 			 "holes_eta_phi_n", "Holes Map (Norm) #eta #phi",
-			 m_nBinsEta,-c_etaRange,c_etaRange,
+			 m_nBinsEta,-m_c_etaRange,m_c_etaRange,
 			 m_nBinsPhi,-M_PI,M_PI,
 			 "#eta", "#phi").ignore();
 	
-	registerManHist( holes_quality_profile,  "InDetGlobal/Hits", detailsInterval,
+	registerManHist( m_holes_quality_profile,  "InDetGlobal/Hits", detailsInterval,
 			 "holes_quality_profile", "#chi^{2}/ndf vs Number of holes/track profile",
 			 104,-3.5,100.5,
 			 "<#chi^{2}/ndf> / comb hole", "Combined Holes").ignore();
-	holes_quality_profile->SetErrorOption("S");
-	holes_quality_profile->SetMaximum( 1000 );
-	holes_quality_profile->SetMinimum( 0 );
+	m_holes_quality_profile->SetErrorOption("S");
+	m_holes_quality_profile->SetMaximum( 1000 );
+	m_holes_quality_profile->SetMinimum( 0 );
     
 	
 	registerManHist( m_holes_hits,  "InDetGlobal/Hits", detailsInterval,
@@ -1124,26 +1124,26 @@ void InDetGlobalTrackMonTool::FillHoles( const Trk::Track * track, const std::un
     int trth   = summary->get(Trk::numberOfTRTHoles) >= 0 ? summary->get(Trk::numberOfTRTHoles) : 0;
     
     // Gaetano Added : 
-    pixel_holes->Fill(summary->get(Trk::numberOfPixelHoles));
-    sct_holes->Fill(summary->get(Trk::numberOfSCTHoles));
-    trt_holes->Fill(summary->get(Trk::numberOfTRTHoles));
+    m_pixel_holes->Fill(summary->get(Trk::numberOfPixelHoles));
+    m_sct_holes->Fill(summary->get(Trk::numberOfSCTHoles));
+    m_trt_holes->Fill(summary->get(Trk::numberOfTRTHoles));
     
     // Filling Combined Holes and Excluding # holes = -1 case Tracks on surface does not exist		
     if (summary->get(Trk::numberOfPixelHoles)>=0)
-	comb_holes->Fill(pixelh);
+	m_comb_holes->Fill(pixelh);
 
     if (summary->get(Trk::numberOfSCTHoles) >=0 )
-	comb_holes->Fill(scth);
+	m_comb_holes->Fill(scth);
 
     if (summary->get(Trk::numberOfTRTHoles)>=0)
-	comb_holes->Fill(trth);
+	m_comb_holes->Fill(trth);
 
-    silicon_vs_trt->Fill(pixelh+scth,trth);
-    sct_vs_pixels->Fill(scth,pixelh);	
+    m_silicon_vs_trt->Fill(pixelh+scth,trth);
+    m_sct_vs_pixels->Fill(scth,pixelh);	
 	    
     if ( track->fitQuality() && track->fitQuality()->numberDoF() > 0 ){
-	holes_quality->Fill(track->fitQuality()->chiSquared()/track->fitQuality()->numberDoF(),pixelh+scth+trth);
-	holes_quality_profile->Fill(scth+trth+pixelh,track->fitQuality()->chiSquared()/track->fitQuality()->numberDoF());
+	m_holes_quality->Fill(track->fitQuality()->chiSquared()/track->fitQuality()->numberDoF(),pixelh+scth+trth);
+	m_holes_quality_profile->Fill(scth+trth+pixelh,track->fitQuality()->chiSquared()/track->fitQuality()->numberDoF());
     }
     
     // Filling Number of holes vs number of hits for tracks with at least a hole. 			
diff --git a/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalTrackMonTool.h b/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalTrackMonTool.h
index e80744412bd8fed7eaa0e69a9d555e42425f544a..a4e9e33fac04eac600af49a3a5fa8641aa9d6910 100755
--- a/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalTrackMonTool.h
+++ b/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalTrackMonTool.h
@@ -127,14 +127,14 @@ private:
     unsigned int m_trackMax;
 
     /// Contants for various histogram properties
-    const float c_etaRange;
-    const float c_etaTrackletsMin;
-    const float c_etaTrackletsMax;
-    const float c_etaRangeTRT;
+    const float m_c_etaRange;
+    const float m_c_etaTrackletsMin;
+    const float m_c_etaTrackletsMax;
+    const float m_c_etaRangeTRT;
 
-    const float c_range_LB;
+    const float m_c_range_LB;
 
-    const std::array<std::string,4> c_detector_labels;
+    const std::array<std::string,4> m_c_detector_labels;
 
     ServiceHandle <IBLParameterSvc> m_IBLParameterSvc;
     ToolHandle <Trk::ITrackHoleSearchTool> m_holes_search_tool;
@@ -151,20 +151,20 @@ private:
     
     // Gaetano Holes : 
     // SCT Holes : 
-    TH1F * sct_holes;
+    TH1F * m_sct_holes;
     // TRT Holes : 
-    TH1F * trt_holes;
+    TH1F * m_trt_holes;
     // Pixel Holes : 
-    TH1F * pixel_holes;
+    TH1F * m_pixel_holes;
     // Combined Holes : 
-    TH1F * comb_holes;
+    TH1F * m_comb_holes;
     // Silicon  vs TRT holes 
-    TH2F  *silicon_vs_trt;
-    TH2F  *sct_vs_pixels;
+    TH2F  *m_silicon_vs_trt;
+    TH2F  *m_sct_vs_pixels;
     
     // Combined number of holes vs track quality
-    TH2F *holes_quality;
-    TProfile *holes_quality_profile;
+    TH2F *m_holes_quality;
+    TProfile *m_holes_quality_profile;
     
     TH1I * m_Trk_Base;
     ///Distribution of eta vs phi for combined tracks