diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/PixelMonitoring/PixelMainMon.h b/InnerDetector/InDetMonitoring/PixelMonitoring/PixelMonitoring/PixelMainMon.h
index ff433e3f13d532ac2a360a0c68bc0185f8ddb909..8d82f149baf87a9ad02541cf7901c772fc111a4b 100755
--- a/InnerDetector/InDetMonitoring/PixelMonitoring/PixelMonitoring/PixelMainMon.h
+++ b/InnerDetector/InDetMonitoring/PixelMonitoring/PixelMonitoring/PixelMainMon.h
@@ -109,55 +109,52 @@ class PixelMainMon : public ManagedMonitorToolBase {
virtual StatusCode fillHistograms(); //!< Runs at every event, bulk of the code is inside here. Fills the histograms.
virtual StatusCode procHistograms(); //!
- int GetPixLayerID(int ec, int ld, bool ibl);
- int GetPixLayerIDIBL2D3D(int ec, int ld, int eta, bool ibl);
- int GetPixLayerIDIBL2D3DDBM(int ec, int ld, int eta, bool ibl);
- int GetPixLayerIDDBM(int ec, int ld, bool ibl);
- int GetPixLayerDiskID(int ec, int ld, bool ibl);
- int GetPhiID(Identifier& id, const PixelID* pixID);
- int GetEtaID(Identifier& id, const PixelID* pixID, bool doIBL, bool doIBL2D3D);
- void TH1FFillMonitoring(TH1F_LW* mon, TH1F_LW* tmp);
- void TH2FSetBinScaled(TH2F_LW* mon, TH2F_LW* tmp, int nevent);
- void FillTimeHisto(double, TProfile*, TProfile*, TProfile*, double, double, double);
- void FillSummaryHistos(PixelMon2DMapsLW* occupancy, TH1F_LW* A, TH1F_LW* C, TH1F_LW* IBL, TH1F_LW* B0, TH1F_LW* B1, TH1F_LW* B2);
- int ParseDetailsString(std::string& detailsMod);
- bool OnTrack(Identifier id, bool isCluster);
+ int getPixLayerID(int ec, int ld, bool ibl);
+ int getPixLayerIDIBL2D3D(int ec, int ld, int eta, bool ibl);
+ int getPixLayerIDIBL2D3DDBM(int ec, int ld, int eta, bool ibl);
+ int getPixLayerIDDBM(int ec, int ld, bool ibl);
+ int getPixLayerDiskID(int ec, int ld, bool ibl);
+ void th1FillMonitoring(TH1F_LW* mon, TH1F_LW* tmp);
+ void fillTimeHisto(double, TProfile*, TProfile*, TProfile*, double, double, double);
+ void fillSummaryHistos(PixelMon2DMapsLW* occupancy, TH1F_LW* A, TH1F_LW* C, TH1F_LW* IBL, TH1F_LW* B0, TH1F_LW* B1, TH1F_LW* B2);
+ int parseDetailsString(std::string& detailsMod);
+ bool isOnTrack(Identifier id, bool isCluster);
double getErrorBitFraction(const Identifier& WaferID, const unsigned int& num_femcc_errorwords);
int getErrorState(int bit, bool isibl);
std::string makeHistname(std::string set, bool ontrk);
std::string makeHisttitle(std::string set, std::string axis, bool ontrk);
- bool GetFEID(int pixlayer, int phiid, int etaid, int& oufephi, int& outfeeta);
-
- StatusCode BookClustersMon(void);
- StatusCode BookClustersLumiBlockMon(void);
- StatusCode FillClustersMon(void);
- StatusCode ProcClustersMon(void);
-
- StatusCode BookHitsMon(void);
- StatusCode BookHitsLumiBlockMon(void);
- StatusCode FillHitsMon(void);
- StatusCode ProcHitsMon(void);
-
- StatusCode BookStatusMon(void);
- StatusCode BookStatusLumiBlockMon(void);
- StatusCode FillStatusMon(void);
- StatusCode ProcStatusMon(void);
-
- StatusCode BookTrackMon(void);
- StatusCode BookTrackLumiBlockMon(void);
- StatusCode FillTrackMon(void);
- StatusCode ProcTrackMon(void);
-
- StatusCode BookRODErrorMon(void);
- StatusCode BookRODErrorLumiBlockMon(void);
- StatusCode FillRODErrorMon(void);
-
- StatusCode BookSpacePointMon(void);
- StatusCode FillSpacePointMon(void);
-
- StatusCode BookPixelDCSMon(void);
- StatusCode FillPixelDCSMon(void);
- StatusCode ProcPixelDCSMon(void);
+ bool getFEID(int pixlayer, int phiid, int etaid, int& oufephi, int& outfeeta);
+
+ StatusCode bookClustersMon(void);
+ StatusCode bookClustersLumiBlockMon(void);
+ StatusCode fillClustersMon(void);
+ StatusCode procClustersMon(void);
+
+ StatusCode bookHitsMon(void);
+ StatusCode bookHitsLumiBlockMon(void);
+ StatusCode fillHitsMon(void);
+ StatusCode procHitsMon(void);
+
+ StatusCode bookStatusMon(void);
+ StatusCode bookStatusLumiBlockMon(void);
+ StatusCode fillStatusMon(void);
+ StatusCode procStatusMon(void);
+
+ StatusCode bookTrackMon(void);
+ StatusCode bookTrackLumiBlockMon(void);
+ StatusCode fillTrackMon(void);
+ StatusCode procTrackMon(void);
+
+ StatusCode bookRODErrorMon(void);
+ StatusCode bookRODErrorLumiBlockMon(void);
+ StatusCode fillRODErrorMon(void);
+
+ StatusCode bookSpacePointMon(void);
+ StatusCode fillSpacePointMon(void);
+
+ StatusCode bookPixelDCSMon(void);
+ StatusCode fillPixelDCSMon(void);
+ StatusCode procPixelDCSMon(void);
private:
ServiceHandle<IInDetConditionsSvc> m_pixelCondSummarySvc;
diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/src/Clusters.cxx b/InnerDetector/InDetMonitoring/PixelMonitoring/src/Clusters.cxx
index ef165fe5504d52e255d036cb7a34272b98b6ba4e..b1bc6f91a38cc0d90ffc1089d653462e326a19a4 100644
--- a/InnerDetector/InDetMonitoring/PixelMonitoring/src/Clusters.cxx
+++ b/InnerDetector/InDetMonitoring/PixelMonitoring/src/Clusters.cxx
@@ -36,7 +36,7 @@
//////////////////////booking methods//////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////
-StatusCode PixelMainMon::BookClustersMon(void) {
+StatusCode PixelMainMon::bookClustersMon(void) {
if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "start booking pixel cluster monitoring histograms" << endmsg;
std::string path = "Pixel/Clusters";
@@ -413,7 +413,7 @@ StatusCode PixelMainMon::BookClustersMon(void) {
return StatusCode::SUCCESS;
}
-StatusCode PixelMainMon::BookClustersLumiBlockMon(void) {
+StatusCode PixelMainMon::bookClustersLumiBlockMon(void) {
if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "starting Book Clusters for lowStat" << endmsg;
std::string path = "Pixel/LumiBlock";
@@ -451,7 +451,7 @@ StatusCode PixelMainMon::BookClustersLumiBlockMon(void) {
return StatusCode::SUCCESS;
}
-StatusCode PixelMainMon::FillClustersMon(void) {
+StatusCode PixelMainMon::fillClustersMon(void) {
StatusCode sc = evtStore()->retrieve(m_Pixel_clcontainer, m_Pixel_SiClustersName);
if (sc.isFailure() || !m_Pixel_clcontainer) {
if (msgLvl(MSG::INFO)) msg(MSG::INFO) << "Pixel Cluster container for Pixels not found" << endmsg;
@@ -510,16 +510,16 @@ StatusCode PixelMainMon::FillClustersMon(void) {
}
for (p_clus = ClusterCollection->begin(); p_clus != ClusterCollection->end(); ++p_clus) {
clusID = (*p_clus)->identify();
- int pixlayer = GetPixLayerID(m_pixelid->barrel_ec(clusID), m_pixelid->layer_disk(clusID), m_doIBL);
+ int pixlayer = getPixLayerID(m_pixelid->barrel_ec(clusID), m_pixelid->layer_disk(clusID), m_doIBL);
int pixlayeribl2d3d = pixlayer;
if (pixlayeribl2d3d == PixLayerIBL2D3D::kIBL) {
- pixlayeribl2d3d = GetPixLayerIDIBL2D3D(m_pixelid->barrel_ec(clusID), m_pixelid->layer_disk(clusID), m_pixelid->eta_module(clusID), m_doIBL);
+ pixlayeribl2d3d = getPixLayerIDIBL2D3D(m_pixelid->barrel_ec(clusID), m_pixelid->layer_disk(clusID), m_pixelid->eta_module(clusID), m_doIBL);
}
- int pixlayerdbm = GetPixLayerIDDBM(m_pixelid->barrel_ec(clusID), m_pixelid->layer_disk(clusID), m_doIBL);
+ int pixlayerdbm = getPixLayerIDDBM(m_pixelid->barrel_ec(clusID), m_pixelid->layer_disk(clusID), m_doIBL);
int pixlayeribl2d3ddbm = pixlayerdbm;
if (pixlayeribl2d3ddbm == PixLayerDBM::kIBL) {
- pixlayeribl2d3ddbm = GetPixLayerIDIBL2D3DDBM(m_pixelid->barrel_ec(clusID), m_pixelid->layer_disk(clusID), m_pixelid->eta_module(clusID), m_doIBL);
+ pixlayeribl2d3ddbm = getPixLayerIDIBL2D3DDBM(m_pixelid->barrel_ec(clusID), m_pixelid->layer_disk(clusID), m_pixelid->eta_module(clusID), m_doIBL);
}
int lumiblock = m_manager->lumiBlockNumber();
@@ -540,10 +540,10 @@ StatusCode PixelMainMon::FillClustersMon(void) {
int fephi = 0;
int feeta = 0;
if (m_doOfflineAnalysis) {
- if (pixlayer == PixLayer::kB0 && GetFEID(pixlayer, m_pixelid->phi_index(clusID), m_pixelid->eta_index(clusID), fephi, feeta)) {
+ if (pixlayer == PixLayer::kB0 && getFEID(pixlayer, m_pixelid->phi_index(clusID), m_pixelid->eta_index(clusID), fephi, feeta)) {
if (m_doOnTrack) {
if (m_pixelid->phi_module(clusID) == 0 && m_pixelid->eta_module(clusID) < 0) {
- if (OnTrack(clusID, true)) {
+ if (isOnTrack(clusID, true)) {
if (m_clusters_onTrack_L0_B11_S2_C6) m_clusters_onTrack_L0_B11_S2_C6->Fill(m_manager->lumiBlockNumber(), (16 * fabs(6 + m_pixelid->eta_module(clusID))) + (8.0 * fephi) + feeta);
} else {
if (m_clusters_offTrack_L0_B11_S2_C6) m_clusters_offTrack_L0_B11_S2_C6->Fill(m_manager->lumiBlockNumber(), (16 * fabs(6 + m_pixelid->eta_module(clusID))) + (8.0 * fephi) + feeta);
@@ -555,7 +555,7 @@ StatusCode PixelMainMon::FillClustersMon(void) {
if (pixlayer != 99) nclusters_all++; // count all (no DBM) clusters on and off track
- if (m_doOnTrack && !OnTrack(clusID, true)) {
+ if (m_doOnTrack && !isOnTrack(clusID, true)) {
continue;
// if we only want hits on track, and the hit is NOT on the track, skip filling.
// true means doing clusters, false means rdos
@@ -599,7 +599,7 @@ StatusCode PixelMainMon::FillClustersMon(void) {
if (cluster.rdoList().size() == 3 && m_3cluster_Q_mod[pixlayer]) m_3cluster_Q_mod[pixlayer]->Fill(cluster.totalCharge());
if (cluster.rdoList().size() > 3 && m_bigcluster_Q_mod[pixlayer]) m_bigcluster_Q_mod[pixlayer]->Fill(cluster.totalCharge());
- if (OnTrack(clusID, true)) {
+ if (isOnTrack(clusID, true)) {
if (m_cluseff_mod) m_cluseff_mod->Fill(m_manager->lumiBlockNumber(), 1., clusID, m_pixelid);
if (m_clusize_ontrack_mod[pixlayer]) m_clusize_ontrack_mod[pixlayer]->Fill(cluster.rdoList().size());
if (pixlayer == PixLayer::kIBL && m_clusize_ontrack_mod[pixlayeribl2d3d]) m_clusize_ontrack_mod[pixlayeribl2d3d]->Fill(npixHitsInClusterRaw);
@@ -674,7 +674,7 @@ StatusCode PixelMainMon::FillClustersMon(void) {
// Quick Status
fephi = 0;
feeta = 0;
- if (pixlayer == PixLayer::kB0 && GetFEID(pixlayer, m_pixelid->phi_index(clusID), m_pixelid->eta_index(clusID), fephi, feeta)) {
+ if (pixlayer == PixLayer::kB0 && getFEID(pixlayer, m_pixelid->phi_index(clusID), m_pixelid->eta_index(clusID), fephi, feeta)) {
if (m_doOnline) {
if (m_cluster_occupancy_FE_B0_mon) m_cluster_occupancy_FE_B0_mon->Fill((8.0 * m_pixelid->eta_module(clusID)) + (1.0 * feeta), (2.0 * m_pixelid->phi_module(clusID)) + (1.0 * fephi));
if (m_doRefresh5min && m_cluster_occupancy_FE_B0_mon) m_cluster_occupancy_FE_B0_mon->Reset();
@@ -684,7 +684,7 @@ StatusCode PixelMainMon::FillClustersMon(void) {
} //end of event loop
if (m_doOnline) {
- FillSummaryHistos(m_cluster_occupancy.get(),
+ fillSummaryHistos(m_cluster_occupancy.get(),
m_cluster_occupancy_summary_mod[PixLayer::kECA],
m_cluster_occupancy_summary_mod[PixLayer::kECC],
m_cluster_occupancy_summary_mod[PixLayer::kIBL],
@@ -720,7 +720,7 @@ StatusCode PixelMainMon::FillClustersMon(void) {
}
if (m_cluster_occupancy_time1 && m_cluster_occupancy_time2 && m_cluster_occupancy_time3) {
- FillTimeHisto(double(nclusters / (1744.0 + 280 * m_doIBL)), m_cluster_occupancy_time1, m_cluster_occupancy_time2, m_cluster_occupancy_time3, 10., 60., 360.);
+ fillTimeHisto(double(nclusters / (1744.0 + 280 * m_doIBL)), m_cluster_occupancy_time1, m_cluster_occupancy_time2, m_cluster_occupancy_time3, 10., 60., 360.);
}
if (m_doLumiBlock && m_num_clusters_LB) m_num_clusters_LB->Fill(nclusters);
@@ -756,9 +756,9 @@ StatusCode PixelMainMon::FillClustersMon(void) {
return StatusCode::SUCCESS;
}
-StatusCode PixelMainMon::ProcClustersMon(void) {
+StatusCode PixelMainMon::procClustersMon(void) {
if (m_doOffline) {
- FillSummaryHistos(m_cluster_occupancy.get(),
+ fillSummaryHistos(m_cluster_occupancy.get(),
m_cluster_occupancy_summary_mod[PixLayer::kECA],
m_cluster_occupancy_summary_mod[PixLayer::kECC],
m_cluster_occupancy_summary_mod[PixLayer::kIBL],
diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/src/Errors.cxx b/InnerDetector/InDetMonitoring/PixelMonitoring/src/Errors.cxx
index a85bcb38e65e5a88f867d257191ed80c88080dc5..7125a99e0a081be1882122477ec224360b125f2f 100644
--- a/InnerDetector/InDetMonitoring/PixelMonitoring/src/Errors.cxx
+++ b/InnerDetector/InDetMonitoring/PixelMonitoring/src/Errors.cxx
@@ -35,7 +35,7 @@
//////////////////////booking methods//////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////
-StatusCode PixelMainMon::BookRODErrorMon(void) {
+StatusCode PixelMainMon::bookRODErrorMon(void) {
if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "starting Book Errors" << endmsg;
std::string path = "Pixel/Errors";
@@ -314,7 +314,7 @@ StatusCode PixelMainMon::BookRODErrorMon(void) {
return StatusCode::SUCCESS;
}
-StatusCode PixelMainMon::BookRODErrorLumiBlockMon(void) {
+StatusCode PixelMainMon::bookRODErrorLumiBlockMon(void) {
if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "starting Book Errors for lowStat" << endmsg;
std::string path = "Pixel/LumiBlock";
@@ -338,7 +338,7 @@ StatusCode PixelMainMon::BookRODErrorLumiBlockMon(void) {
return StatusCode::SUCCESS;
}
-StatusCode PixelMainMon::FillRODErrorMon(void) {
+StatusCode PixelMainMon::fillRODErrorMon(void) {
const int kLumiBlock = m_manager->lumiBlockNumber();
const int kNumFEs{16};
@@ -378,8 +378,8 @@ StatusCode PixelMainMon::FillRODErrorMon(void) {
if (m_ErrorSvc->isActive(id_hash) && m_pixelid->barrel_ec(WaferID) == 0 && m_pixelid->layer_disk(WaferID) == 0 && m_doIBL) is_ibl = true;
// Determine layer; functions return '99' for non-sensible IDs.
- const int kLayer = GetPixLayerID(m_pixelid->barrel_ec(WaferID), m_pixelid->layer_disk(WaferID), m_doIBL);
- const int kLayerIBL = GetPixLayerIDIBL2D3D(m_pixelid->barrel_ec(WaferID), m_pixelid->layer_disk(WaferID), m_pixelid->eta_module(WaferID), m_doIBL);
+ const int kLayer = getPixLayerID(m_pixelid->barrel_ec(WaferID), m_pixelid->layer_disk(WaferID), m_doIBL);
+ const int kLayerIBL = getPixLayerIDIBL2D3D(m_pixelid->barrel_ec(WaferID), m_pixelid->layer_disk(WaferID), m_pixelid->eta_module(WaferID), m_doIBL);
if (kLayer == 99) continue;
// Boolean whether current module has an error of type/category.
@@ -453,19 +453,19 @@ StatusCode PixelMainMon::FillRODErrorMon(void) {
if (bit == 4) { // EoC trunc error
int fephi = 0;
int feeta = 0;
- if (kLayer == PixLayer::kB0 && GetFEID(kLayer, m_pixelid->phi_index(WaferID), m_pixelid->eta_index(WaferID), fephi, feeta)) {
+ if (kLayer == PixLayer::kB0 && getFEID(kLayer, m_pixelid->phi_index(WaferID), m_pixelid->eta_index(WaferID), fephi, feeta)) {
num_errorFEs_B0[m_pixelid->phi_module(WaferID)][(int)(fabs(6 + m_pixelid->eta_module(WaferID)))][(int)((8 * fephi) + feeta)] = 1;
}
- if (kLayer == PixLayer::kB1 && GetFEID(kLayer, m_pixelid->phi_index(WaferID), m_pixelid->eta_index(WaferID), fephi, feeta)) {
+ if (kLayer == PixLayer::kB1 && getFEID(kLayer, m_pixelid->phi_index(WaferID), m_pixelid->eta_index(WaferID), fephi, feeta)) {
num_errorFEs_B1[m_pixelid->phi_module(WaferID)][(int)(fabs(6 + m_pixelid->eta_module(WaferID)))][(int)((8 * fephi) + feeta)] = 1;
}
- if (kLayer == PixLayer::kB2 && GetFEID(kLayer, m_pixelid->phi_index(WaferID), m_pixelid->eta_index(WaferID), fephi, feeta)) {
+ if (kLayer == PixLayer::kB2 && getFEID(kLayer, m_pixelid->phi_index(WaferID), m_pixelid->eta_index(WaferID), fephi, feeta)) {
num_errorFEs_B2[m_pixelid->phi_module(WaferID)][(int)(fabs(6 + m_pixelid->eta_module(WaferID)))][(int)((8 * fephi) + feeta)] = 1;
}
- if (kLayer == PixLayer::kECA && GetFEID(kLayer, m_pixelid->phi_index(WaferID), m_pixelid->eta_index(WaferID), fephi, feeta)) {
+ if (kLayer == PixLayer::kECA && getFEID(kLayer, m_pixelid->phi_index(WaferID), m_pixelid->eta_index(WaferID), fephi, feeta)) {
num_errorFEs_EA[m_pixelid->phi_module(WaferID)][(int)m_pixelid->layer_disk(WaferID)][(int)((8 * fephi) + feeta)] = 1;
}
- if (kLayer == PixLayer::kECC && GetFEID(kLayer, m_pixelid->phi_index(WaferID), m_pixelid->eta_index(WaferID), fephi, feeta)) {
+ if (kLayer == PixLayer::kECC && getFEID(kLayer, m_pixelid->phi_index(WaferID), m_pixelid->eta_index(WaferID), fephi, feeta)) {
num_errorFEs_EC[m_pixelid->phi_module(WaferID)][(int)m_pixelid->layer_disk(WaferID)][(int)((8 * fephi) + feeta)] = 1;
}
}
@@ -568,7 +568,7 @@ StatusCode PixelMainMon::FillRODErrorMon(void) {
total_errors += num_errors[i];
}
if (m_error_time1 && m_error_time2 && m_error_time3) {
- FillTimeHisto(total_errors, m_error_time1, m_error_time2, m_error_time3, 10., 60., 360.);
+ fillTimeHisto(total_errors, m_error_time1, m_error_time2, m_error_time3, 10., 60., 360.);
}
for (int i = 0; i < PixLayer::COUNT - 1; i++) {
@@ -657,7 +657,7 @@ double PixelMainMon::getErrorBitFraction(const Identifier& WaferID, const unsign
// otherwise calculate max(number of hits, number of error words).
// - 22 bits for each hit word
// - 22 bits for each error word
- const int layer = GetPixLayerID(m_pixelid->barrel_ec(WaferID), m_pixelid->layer_disk(WaferID), m_doIBL);
+ const int layer = getPixLayerID(m_pixelid->barrel_ec(WaferID), m_pixelid->layer_disk(WaferID), m_doIBL);
if (layer == PixLayer::kIBL) return 0.;
unsigned int num_hits = 0;
diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/src/HelperFunctions.cxx b/InnerDetector/InDetMonitoring/PixelMonitoring/src/HelperFunctions.cxx
index ddecaf72b94e3a6b183948899256f436c3d41118..0cbf0fab10b8a881727b65343661442d65bb4e2c 100644
--- a/InnerDetector/InDetMonitoring/PixelMonitoring/src/HelperFunctions.cxx
+++ b/InnerDetector/InDetMonitoring/PixelMonitoring/src/HelperFunctions.cxx
@@ -34,7 +34,7 @@ std::string PixelMainMon::makeHisttitle(std::string set, std::string axis, bool
return name;
}
-int PixelMainMon::GetPixLayerID(int ec, int ld, bool ibl) {
+int PixelMainMon::getPixLayerID(int ec, int ld, bool ibl) {
int layer = 99;
if (ec == 2) {
layer = PixLayer::kECA;
@@ -49,7 +49,7 @@ int PixelMainMon::GetPixLayerID(int ec, int ld, bool ibl) {
return layer;
}
-int PixelMainMon::GetPixLayerIDDBM(int ec, int ld, bool ibl) {
+int PixelMainMon::getPixLayerIDDBM(int ec, int ld, bool ibl) {
int layer = 99;
if (ec == 2) {
layer = PixLayerDBM::kECA;
@@ -67,7 +67,7 @@ int PixelMainMon::GetPixLayerIDDBM(int ec, int ld, bool ibl) {
return layer;
}
-int PixelMainMon::GetPixLayerIDIBL2D3D(int ec, int ld, int eta, bool ibl) {
+int PixelMainMon::getPixLayerIDIBL2D3D(int ec, int ld, int eta, bool ibl) {
int layer = 99;
if (ec == 0) {
if (ibl && ld == 0 && eta < 6 && eta > -7) layer = PixLayerIBL2D3D::kIBL2D;
@@ -76,7 +76,7 @@ int PixelMainMon::GetPixLayerIDIBL2D3D(int ec, int ld, int eta, bool ibl) {
return layer;
}
-int PixelMainMon::GetPixLayerIDIBL2D3DDBM(int ec, int ld, int eta, bool ibl) {
+int PixelMainMon::getPixLayerIDIBL2D3DDBM(int ec, int ld, int eta, bool ibl) {
int layer = 99;
if (ec == 0) {
if (ibl && ld == 0 && eta < 6 && eta > -7) layer = PixLayerIBL2D3DDBM::kIBL2D;
@@ -85,7 +85,7 @@ int PixelMainMon::GetPixLayerIDIBL2D3DDBM(int ec, int ld, int eta, bool ibl) {
return layer;
}
-int PixelMainMon::GetPixLayerDiskID(int ec, int ld, bool ibl) {
+int PixelMainMon::getPixLayerDiskID(int ec, int ld, bool ibl) {
int layer = 99;
if (ec == 2) {
layer = PixLayerDisk::kECA0 + ld;
@@ -100,45 +100,7 @@ int PixelMainMon::GetPixLayerDiskID(int ec, int ld, bool ibl) {
return layer;
}
-int PixelMainMon::GetPhiID(Identifier& id, const PixelID* pixID) {
- int phiid = pixID->phi_module(id);
- return phiid;
-}
-
-int PixelMainMon::GetEtaID(Identifier& id, const PixelID* pixID, bool doIBL, bool doIBL2D3D) {
- int etaid = -1;
-
- int bec = pixID->barrel_ec(id);
- int ld = pixID->layer_disk(id);
-
- if (bec == 2 || bec == -2) {
- etaid = ld;
- } else if (bec == 0) {
- if (doIBL) ld--;
- int em = pixID->eta_module(id);
- if (ld == 0 || ld == 1 || ld == 2) {
- etaid = em;
- } else if (ld == -1) {
- int feid = 0;
- int emf = 0;
- if (em < 6 && em > -7) {
- if (pixID->eta_index(id) >= 80) feid = 1;
- emf = 2 * em + feid;
- etaid = em;
- } else if (em < -6) {
- emf = em - 6;
- etaid = em + 10;
- } else {
- emf = em + 6;
- etaid = em - 2;
- }
- if (!doIBL2D3D) etaid = emf;
- }
- }
- return etaid;
-}
-
-void PixelMainMon::TH1FFillMonitoring(TH1F_LW* mon, TH1F_LW* tmp) {
+void PixelMainMon::th1FillMonitoring(TH1F_LW* mon, TH1F_LW* tmp) {
for (unsigned int i = 1; i <= tmp->GetNbinsX(); i++) {
float content = tmp->GetBinContent(i);
mon->SetBinContent(i, content);
@@ -146,15 +108,7 @@ void PixelMainMon::TH1FFillMonitoring(TH1F_LW* mon, TH1F_LW* tmp) {
tmp->Reset();
}
-void PixelMainMon::TH2FSetBinScaled(TH2F_LW* mon, TH2F_LW* tmp, int nevent) {
- for (unsigned int i = 1; i <= tmp->GetXaxis()->GetNbins(); i++) {
- for (unsigned int j = 1; j <= tmp->GetYaxis()->GetNbins(); j++) {
- mon->SetBinContent(i, j, tmp->GetBinContent(i, j) / (1.0 * nevent));
- }
- }
-}
-
-void PixelMainMon::FillTimeHisto(double value, TProfile* one = 0, TProfile* two = 0, TProfile* three = 0, double time1 = 10., double time2 = 60., double time3 = 360.) {
+void PixelMainMon::fillTimeHisto(double value, TProfile* one = 0, TProfile* two = 0, TProfile* three = 0, double time1 = 10., double time2 = 60., double time3 = 360.) {
// This function fills time profile histograms
time_t rawtime;
struct tm* timeinfo;
@@ -266,7 +220,7 @@ void PixelMainMon::FillTimeHisto(double value, TProfile* one = 0, TProfile* two
}
}
-void PixelMainMon::FillSummaryHistos(PixelMon2DMapsLW* occupancy, TH1F_LW* A, TH1F_LW* C, TH1F_LW* IBL, TH1F_LW* B0, TH1F_LW* B1, TH1F_LW* B2) {
+void PixelMainMon::fillSummaryHistos(PixelMon2DMapsLW* occupancy, TH1F_LW* A, TH1F_LW* C, TH1F_LW* IBL, TH1F_LW* B0, TH1F_LW* B1, TH1F_LW* B2) {
// if the histos don't exist, dont' fill them
if (!(A && C && B0 && B1 && B2 && occupancy)) return;
double events = m_event;
@@ -312,7 +266,7 @@ void PixelMainMon::FillSummaryHistos(PixelMon2DMapsLW* occupancy, TH1F_LW* A, TH
}
}
-bool PixelMainMon::OnTrack(Identifier id, bool isCluster) {
+bool PixelMainMon::isOnTrack(Identifier id, bool isCluster) {
bool onTrack = false;
// search through vector of ID's on track to see if there is a match
if (isCluster) {
@@ -324,7 +278,7 @@ bool PixelMainMon::OnTrack(Identifier id, bool isCluster) {
}
// Not yet updated to include IBL:
-int PixelMainMon::ParseDetailsString(std::string& detailsMod) {
+int PixelMainMon::parseDetailsString(std::string& detailsMod) {
int modID[4] = {0, 0, 0, 0};
char* pch;
pch = new char[detailsMod.size() + 1];
@@ -439,7 +393,7 @@ int PixelMainMon::ParseDetailsString(std::string& detailsMod) {
return (1000000 + (modID[0] + 2) * 100000 + (modID[1]) * 10000 + (modID[2]) * 100 + (modID[3] + 6));
}
-bool PixelMainMon::GetFEID(int pixlayer, int phiid, int etaid, int& oufephi, int& outfeeta) {
+bool PixelMainMon::getFEID(int pixlayer, int phiid, int etaid, int& oufephi, int& outfeeta) {
bool isValid = true;
int npixPerFe_phi, npixPerFe_eta;
if (pixlayer == PixLayer::kECA || pixlayer == PixLayer::kECC) {
diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/src/Hits.cxx b/InnerDetector/InDetMonitoring/PixelMonitoring/src/Hits.cxx
index 0b40fce554cc1c5223a8a0c1774bd8ceaee73c52..471d1b5c985796fa83cd1eda672945eb9fbd9e02 100644
--- a/InnerDetector/InDetMonitoring/PixelMonitoring/src/Hits.cxx
+++ b/InnerDetector/InDetMonitoring/PixelMonitoring/src/Hits.cxx
@@ -41,7 +41,7 @@
//////////////////////booking methods//////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////
-StatusCode PixelMainMon::BookHitsMon(void) {
+StatusCode PixelMainMon::bookHitsMon(void) {
ATH_MSG_DEBUG("Start booking Hit histogtams..");
std::string path = "Pixel/Hits";
if (m_doOnTrack) path.replace(path.begin(), path.end(), "Pixel/HitsOnTrack");
@@ -337,7 +337,7 @@ StatusCode PixelMainMon::BookHitsMon(void) {
return StatusCode::SUCCESS;
}
-StatusCode PixelMainMon::BookHitsLumiBlockMon(void) {
+StatusCode PixelMainMon::bookHitsLumiBlockMon(void) {
ATH_MSG_DEBUG("Start booking Hits histograms per LB (low stat)");
std::string path = "Pixel/LumiBlock";
@@ -395,7 +395,7 @@ StatusCode PixelMainMon::BookHitsLumiBlockMon(void) {
return StatusCode::SUCCESS;
}
-StatusCode PixelMainMon::FillHitsMon(void) // Called once per event
+StatusCode PixelMainMon::fillHitsMon(void) // Called once per event
{
int DetailsMod1 = 0;
int DetailsMod2 = 0;
@@ -406,10 +406,10 @@ StatusCode PixelMainMon::FillHitsMon(void) // Called once per event
int nhitsM3 = 0;
int nhitsM4 = 0;
if (m_doDetails) {
- DetailsMod1 = ParseDetailsString(m_DetailsMod1);
- DetailsMod2 = ParseDetailsString(m_DetailsMod2);
- DetailsMod3 = ParseDetailsString(m_DetailsMod3);
- DetailsMod4 = ParseDetailsString(m_DetailsMod4);
+ DetailsMod1 = parseDetailsString(m_DetailsMod1);
+ DetailsMod2 = parseDetailsString(m_DetailsMod2);
+ DetailsMod3 = parseDetailsString(m_DetailsMod3);
+ DetailsMod4 = parseDetailsString(m_DetailsMod4);
}
static constexpr int nmod_phi[PixLayer::COUNT] = {48, 48, 22, 38, 52, 14};
@@ -507,20 +507,20 @@ StatusCode PixelMainMon::FillHitsMon(void) // Called once per event
for (p_rdo = PixelCollection->begin(); p_rdo != PixelCollection->end(); ++p_rdo) {
rdoID = (*p_rdo)->identify();
- if (m_doOnTrack && !OnTrack(rdoID, false)) {
+ if (m_doOnTrack && !isOnTrack(rdoID, false)) {
// if we only want hits on track, and the hit is NOT on the track, skip filling
continue;
}
- int pixlayer = GetPixLayerID(m_pixelid->barrel_ec(rdoID), m_pixelid->layer_disk(rdoID), m_doIBL);
- int pixlayerdbm = GetPixLayerIDDBM(m_pixelid->barrel_ec(rdoID), m_pixelid->layer_disk(rdoID), m_doIBL);
+ int pixlayer = getPixLayerID(m_pixelid->barrel_ec(rdoID), m_pixelid->layer_disk(rdoID), m_doIBL);
+ int pixlayerdbm = getPixLayerIDDBM(m_pixelid->barrel_ec(rdoID), m_pixelid->layer_disk(rdoID), m_doIBL);
int pixlayeribl2d3d = pixlayer;
if (pixlayeribl2d3d == PixLayer::kIBL) {
- pixlayeribl2d3d = GetPixLayerIDIBL2D3D(m_pixelid->barrel_ec(rdoID), m_pixelid->layer_disk(rdoID), m_pixelid->eta_module(rdoID), m_doIBL);
+ pixlayeribl2d3d = getPixLayerIDIBL2D3D(m_pixelid->barrel_ec(rdoID), m_pixelid->layer_disk(rdoID), m_pixelid->eta_module(rdoID), m_doIBL);
}
int pixlayeribl2d3ddbm = pixlayerdbm;
if (pixlayeribl2d3ddbm == PixLayerDBM::kIBL) {
- pixlayeribl2d3ddbm = GetPixLayerIDIBL2D3DDBM(m_pixelid->barrel_ec(rdoID), m_pixelid->layer_disk(rdoID), m_pixelid->eta_module(rdoID), m_doIBL);
+ pixlayeribl2d3ddbm = getPixLayerIDIBL2D3DDBM(m_pixelid->barrel_ec(rdoID), m_pixelid->layer_disk(rdoID), m_pixelid->eta_module(rdoID), m_doIBL);
}
bool isIBL = false;
if (m_pixelid->barrel_ec(rdoID) == 0 && m_doIBL && m_Lvl1A_mod[PixLayerDBM::kIBL] && m_pixelid->layer_disk(rdoID) == 0) isIBL = true;
@@ -559,7 +559,7 @@ StatusCode PixelMainMon::FillHitsMon(void) // Called once per event
if (m_FE_chip_hit_summary) m_FE_chip_hit_summary->Fill(m_pixelCableSvc->getFE(&rdoID, rdoID), rdoID, m_pixelid);
if (m_hiteff_mod) {
- if (OnTrack(rdoID, false)) {
+ if (isOnTrack(rdoID, false)) {
m_hiteff_mod->Fill(m_manager->lumiBlockNumber(), 1., rdoID, m_pixelid);
} else {
m_hiteff_mod->Fill(m_manager->lumiBlockNumber(), 0., rdoID, m_pixelid);
@@ -614,7 +614,7 @@ StatusCode PixelMainMon::FillHitsMon(void) // Called once per event
int fephi = 0;
int feeta = 0;
if (m_doOfflineAnalysis) {
- if (pixlayer == PixLayer::kB0 && GetFEID(pixlayer, m_pixelid->phi_index(rdoID), m_pixelid->eta_index(rdoID), fephi, feeta)) {
+ if (pixlayer == PixLayer::kB0 && getFEID(pixlayer, m_pixelid->phi_index(rdoID), m_pixelid->eta_index(rdoID), fephi, feeta)) {
if (m_pixelid->phi_module(rdoID) == 0 && m_pixelid->eta_module(rdoID) < 0 && m_nhits_L0_B11_S2_C6) {
m_nhits_L0_B11_S2_C6->Fill(m_manager->lumiBlockNumber(), (16 * fabs(6 + m_pixelid->eta_module(rdoID))) + (8.0 * fephi) + feeta);
nhits_L0_B11_S2_C6[(int)(16 * fabs(6 + m_pixelid->eta_module(rdoID))) + (8 * fephi) + feeta]++;
@@ -628,26 +628,26 @@ StatusCode PixelMainMon::FillHitsMon(void) // Called once per event
m_hit_ToT_per_lumi_mod[pixlayeribl2d3d]->Fill(m_manager->lumiBlockNumber(), (*p_rdo)->getToT(), 1.0 / nGoodChannels_layer[pixlayeribl2d3d]);
}
}
- if (pixlayer == PixLayer::kB0 && GetFEID(pixlayer, m_pixelid->phi_index(rdoID), m_pixelid->eta_index(rdoID), fephi, feeta)) {
+ if (pixlayer == PixLayer::kB0 && getFEID(pixlayer, m_pixelid->phi_index(rdoID), m_pixelid->eta_index(rdoID), fephi, feeta)) {
fewithHits_B0[m_pixelid->phi_module(rdoID)][(int)(fabs(6 + m_pixelid->eta_module(rdoID)))][(int)((8 * fephi) + feeta)] = 1;
}
- if (pixlayer == PixLayer::kB1 && GetFEID(pixlayer, m_pixelid->phi_index(rdoID), m_pixelid->eta_index(rdoID), fephi, feeta)) {
+ if (pixlayer == PixLayer::kB1 && getFEID(pixlayer, m_pixelid->phi_index(rdoID), m_pixelid->eta_index(rdoID), fephi, feeta)) {
fewithHits_B1[m_pixelid->phi_module(rdoID)][(int)(fabs(6 + m_pixelid->eta_module(rdoID)))][(int)((8 * fephi) + feeta)] = 1;
}
- if (pixlayer == PixLayer::kB2 && GetFEID(pixlayer, m_pixelid->phi_index(rdoID), m_pixelid->eta_index(rdoID), fephi, feeta)) {
+ if (pixlayer == PixLayer::kB2 && getFEID(pixlayer, m_pixelid->phi_index(rdoID), m_pixelid->eta_index(rdoID), fephi, feeta)) {
fewithHits_B2[m_pixelid->phi_module(rdoID)][(int)(fabs(6 + m_pixelid->eta_module(rdoID)))][(int)((8 * fephi) + feeta)] = 1;
}
- if (pixlayer == PixLayer::kECA && GetFEID(pixlayer, m_pixelid->phi_index(rdoID), m_pixelid->eta_index(rdoID), fephi, feeta)) {
+ if (pixlayer == PixLayer::kECA && getFEID(pixlayer, m_pixelid->phi_index(rdoID), m_pixelid->eta_index(rdoID), fephi, feeta)) {
fewithHits_EA[m_pixelid->phi_module(rdoID)][(int)m_pixelid->layer_disk(rdoID)][(int)((8 * fephi) + feeta)] = 1;
}
- if (pixlayer == PixLayer::kECC && GetFEID(pixlayer, m_pixelid->phi_index(rdoID), m_pixelid->eta_index(rdoID), fephi, feeta)) {
+ if (pixlayer == PixLayer::kECC && getFEID(pixlayer, m_pixelid->phi_index(rdoID), m_pixelid->eta_index(rdoID), fephi, feeta)) {
fewithHits_EC[m_pixelid->phi_module(rdoID)][(int)m_pixelid->layer_disk(rdoID)][(int)((8 * fephi) + feeta)] = 1;
}
}
} // end of RDO (hit) loop
if (m_doOnline) {
- FillSummaryHistos(m_occupancy.get(),
+ fillSummaryHistos(m_occupancy.get(),
m_occupancy_summary_mod[PixLayer::kECA],
m_occupancy_summary_mod[PixLayer::kECC],
m_occupancy_summary_mod[PixLayer::kIBL],
@@ -655,11 +655,11 @@ StatusCode PixelMainMon::FillHitsMon(void) // Called once per event
m_occupancy_summary_mod[PixLayer::kB1],
m_occupancy_summary_mod[PixLayer::kB2]);
if (m_occupancy_time1 && m_occupancy_time2 && m_occupancy_time3) {
- FillTimeHisto(double(nhits / (1744.0 + 280 * m_doIBL)), m_occupancy_time1, m_occupancy_time2, m_occupancy_time3, 10., 60., 360.);
+ fillTimeHisto(double(nhits / (1744.0 + 280 * m_doIBL)), m_occupancy_time1, m_occupancy_time2, m_occupancy_time3, 10., 60., 360.);
}
if (m_doRefresh) {
for (int i = 0; i < PixLayer::COUNT; i++) {
- if (m_hit_ToT_Mon_mod[i] && m_hit_ToT_tmp_mod[i]) TH1FFillMonitoring(m_hit_ToT_Mon_mod[i], m_hit_ToT_tmp_mod[i]);
+ if (m_hit_ToT_Mon_mod[i] && m_hit_ToT_tmp_mod[i]) th1FillMonitoring(m_hit_ToT_Mon_mod[i], m_hit_ToT_tmp_mod[i]);
}
if (m_hitmap_tmp && m_hitmap_mon) {
if (m_occupancy_pix_evt) m_occupancy_pix_evt->FillFromMap(m_hitmap_tmp.get(), false);
@@ -822,7 +822,7 @@ StatusCode PixelMainMon::FillHitsMon(void) // Called once per event
return StatusCode::SUCCESS;
}
-StatusCode PixelMainMon::ProcHitsMon(void) {
+StatusCode PixelMainMon::procHitsMon(void) {
double events = m_event;
if (events == 0) {
// if no events, the rest of the test is pointless and would divide by 0
@@ -830,7 +830,7 @@ StatusCode PixelMainMon::ProcHitsMon(void) {
}
if (m_doOffline) {
- FillSummaryHistos(m_occupancy.get(),
+ fillSummaryHistos(m_occupancy.get(),
m_occupancy_summary_mod[PixLayer::kECA],
m_occupancy_summary_mod[PixLayer::kECC],
m_occupancy_summary_mod[PixLayer::kIBL],
diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelDCSMon.cxx b/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelDCSMon.cxx
index 42f250523ebde9c2d479d10515d3abb2fa0f7c13..b468f9501a92b227832424e17013545cc435d668 100644
--- a/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelDCSMon.cxx
+++ b/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelDCSMon.cxx
@@ -33,7 +33,7 @@
//////////////////////booking methods//////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////
-StatusCode PixelMainMon::BookPixelDCSMon(void) {
+StatusCode PixelMainMon::bookPixelDCSMon(void) {
if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "starting Book Status" << endmsg;
msg(MSG::DEBUG) << "[BookPixelDCSMon]" << endmsg;
@@ -496,7 +496,7 @@ StatusCode PixelMainMon::BookPixelDCSMon(void) {
return StatusCode::SUCCESS;
}
-StatusCode PixelMainMon::FillPixelDCSMon(void) {
+StatusCode PixelMainMon::fillPixelDCSMon(void) {
// see only the first event of LB
if (m_lumiBlockNum != m_currentLumiBlockNumber) {
ATH_MSG_DEBUG("Current LB Number has been changed from " << m_currentLumiBlockNumber << " to " << m_lumiBlockNum);
@@ -639,7 +639,7 @@ StatusCode PixelMainMon::FillPixelDCSMon(void) {
return StatusCode::SUCCESS;
}
-StatusCode PixelMainMon::ProcPixelDCSMon(void) {
+StatusCode PixelMainMon::procPixelDCSMon(void) {
msg(MSG::DEBUG) << "[ProcPixelDCSMon]" << endmsg;
//---------------------------------------
diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelMainMon.cxx b/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelMainMon.cxx
index 8aaec3b67a14572de678361952181958b7ebb759..56c2ca7d2b7974bb8f7dd8a6bb346da5796e2875 100755
--- a/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelMainMon.cxx
+++ b/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelMainMon.cxx
@@ -637,25 +637,25 @@ StatusCode PixelMainMon::bookHistograms() {
// Book histograms
if (m_doLumiBlock) {
if (m_doRDO) {
- if (BookHitsLumiBlockMon().isFailure()) {
+ if (bookHitsLumiBlockMon().isFailure()) {
if (msgLvl(MSG::INFO)) msg(MSG::INFO) << "Could not book lowStat histograms" << endmsg;
}
if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Done booking RDO for lowStat" << endmsg;
}
if (m_doRODError) {
- if (BookRODErrorLumiBlockMon().isFailure()) {
+ if (bookRODErrorLumiBlockMon().isFailure()) {
if (msgLvl(MSG::INFO)) msg(MSG::INFO) << "Could not book lowStat histograms" << endmsg;
}
if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Done booking ROD Error for lowStat" << endmsg;
}
if (m_doCluster) {
- if (BookClustersLumiBlockMon().isFailure()) {
+ if (bookClustersLumiBlockMon().isFailure()) {
if (msgLvl(MSG::INFO)) msg(MSG::INFO) << "Could not book lowStat histograms" << endmsg;
}
if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Done booking Cluster for lowStat" << endmsg;
}
if (m_doStatus) {
- if (BookStatusLumiBlockMon().isFailure()) {
+ if (bookStatusLumiBlockMon().isFailure()) {
if (msgLvl(MSG::INFO)) msg(MSG::INFO) << "Could not book lowStat histograms" << endmsg;
}
if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Done booking Status for lowStat" << endmsg;
@@ -692,43 +692,43 @@ StatusCode PixelMainMon::bookHistograms() {
// Initialize histograms
if (m_doTrack) {
- if (BookTrackMon().isFailure()) {
+ if (bookTrackMon().isFailure()) {
if (msgLvl(MSG::INFO)) msg(MSG::INFO) << "Could not book histograms" << endmsg;
}
if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Done booking Track" << endmsg;
}
if (m_doRDO) {
- if (BookHitsMon().isFailure()) {
+ if (bookHitsMon().isFailure()) {
if (msgLvl(MSG::INFO)) msg(MSG::INFO) << "Could not book histograms" << endmsg;
}
if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Done booking RDO" << endmsg;
}
if (m_doRODError) {
- if (BookRODErrorMon().isFailure()) {
+ if (bookRODErrorMon().isFailure()) {
if (msgLvl(MSG::INFO)) msg(MSG::INFO) << "Could not book histograms" << endmsg;
}
if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Done booking ROD Error" << endmsg;
}
if (m_doSpacePoint) {
- if (BookSpacePointMon().isFailure()) {
+ if (bookSpacePointMon().isFailure()) {
if (msgLvl(MSG::INFO)) msg(MSG::INFO) << "Could not book histograms" << endmsg;
}
if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Done booking SP" << endmsg;
}
if (m_doCluster) {
- if (BookClustersMon().isFailure()) {
+ if (bookClustersMon().isFailure()) {
if (msgLvl(MSG::INFO)) msg(MSG::INFO) << "Could not book histograms" << endmsg;
}
if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Done booking Cluster" << endmsg;
}
if (m_doStatus) {
- if (BookStatusMon().isFailure()) {
+ if (bookStatusMon().isFailure()) {
if (msgLvl(MSG::INFO)) msg(MSG::INFO) << "Could not book histograms" << endmsg;
}
if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Done booking Status" << endmsg;
}
if (m_doDCS) {
- if (BookPixelDCSMon().isFailure()) {
+ if (bookPixelDCSMon().isFailure()) {
if (msgLvl(MSG::INFO)) msg(MSG::INFO) << "Could not book histograms" << endmsg;
}
if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Done booking DCS" << endmsg;
@@ -780,9 +780,9 @@ StatusCode PixelMainMon::fillHistograms() {
Identifier WaferID = *idIt;
IdentifierHash id_hash = m_pixelid->wafer_hash(WaferID);
- int pixlayeribl2d3d = GetPixLayerID(m_pixelid->barrel_ec(WaferID), m_pixelid->layer_disk(WaferID), m_doIBL);
+ int pixlayeribl2d3d = getPixLayerID(m_pixelid->barrel_ec(WaferID), m_pixelid->layer_disk(WaferID), m_doIBL);
if (pixlayeribl2d3d == PixLayer::kIBL) {
- pixlayeribl2d3d = GetPixLayerIDIBL2D3D(m_pixelid->barrel_ec(WaferID), m_pixelid->layer_disk(WaferID), m_pixelid->eta_module(WaferID), m_doIBL);
+ pixlayeribl2d3d = getPixLayerIDIBL2D3D(m_pixelid->barrel_ec(WaferID), m_pixelid->layer_disk(WaferID), m_pixelid->eta_module(WaferID), m_doIBL);
}
if (pixlayeribl2d3d == 99) continue;
if (m_pixelCondSummarySvc->isActive(id_hash) == true) {
@@ -804,7 +804,7 @@ StatusCode PixelMainMon::fillHistograms() {
// pixel info
if (m_doStatus) {
- if (FillStatusMon().isFailure()) {
+ if (fillStatusMon().isFailure()) {
if (msgLvl(MSG::INFO)) msg(MSG::INFO) << "Could not fill histograms" << endmsg;
}
}
@@ -812,7 +812,7 @@ StatusCode PixelMainMon::fillHistograms() {
// hits
if (m_doRDO) {
if (evtStore()->contains<PixelRDO_Container>(m_Pixel_RDOName)) {
- if (FillHitsMon().isFailure()) {
+ if (fillHitsMon().isFailure()) {
if (msgLvl(MSG::INFO)) {
msg(MSG::INFO) << "Could not fill histograms" << endmsg;
}
@@ -825,7 +825,7 @@ StatusCode PixelMainMon::fillHistograms() {
}
if (m_doRODError) {
- if (FillRODErrorMon().isFailure()) {
+ if (fillRODErrorMon().isFailure()) {
if (msgLvl(MSG::INFO)) {
msg(MSG::INFO) << "Could not fill histograms" << endmsg;
}
@@ -837,7 +837,7 @@ StatusCode PixelMainMon::fillHistograms() {
// track
if (m_doTrack) {
if (evtStore()->contains<TrackCollection>(m_TracksName)) {
- if (FillTrackMon().isFailure()) {
+ if (fillTrackMon().isFailure()) {
if (msgLvl(MSG::INFO)) msg(MSG::INFO) << "Could not fill histograms" << endmsg;
}
} else if (m_storegate_errors) {
@@ -850,7 +850,7 @@ StatusCode PixelMainMon::fillHistograms() {
// cluster
if (m_doCluster) {
if (evtStore()->contains<InDet::PixelClusterContainer>(m_Pixel_SiClustersName)) {
- if (FillClustersMon().isFailure()) {
+ if (fillClustersMon().isFailure()) {
if (msgLvl(MSG::INFO)) msg(MSG::INFO) << "Could not fill histograms" << endmsg;
}
} else if (m_storegate_errors) {
@@ -863,7 +863,7 @@ StatusCode PixelMainMon::fillHistograms() {
// space point
if (m_doSpacePoint) {
if (evtStore()->contains<SpacePointContainer>(m_Pixel_SpacePointsName)) {
- if (FillSpacePointMon().isFailure()) {
+ if (fillSpacePointMon().isFailure()) {
if (msgLvl(MSG::INFO)) msg(MSG::INFO) << "Could not fill histograms" << endmsg;
}
} else if (m_storegate_errors) {
@@ -875,7 +875,7 @@ StatusCode PixelMainMon::fillHistograms() {
// DCS
if (m_doDCS) {
- if (FillPixelDCSMon().isFailure()) {
+ if (fillPixelDCSMon().isFailure()) {
if (msgLvl(MSG::INFO)) msg(MSG::INFO) << "Could not fill histograms" << endmsg;
}
} else {
@@ -891,27 +891,27 @@ StatusCode PixelMainMon::procHistograms() {
if (!m_doOnline && endOfRunFlag()) {
if (m_doRDO) {
- if (ProcHitsMon().isFailure()) {
+ if (procHitsMon().isFailure()) {
if (msgLvl(MSG::INFO)) msg(MSG::INFO) << "Could not proc histograms" << endmsg;
}
}
if (m_doCluster) {
- if (ProcClustersMon().isFailure()) {
+ if (procClustersMon().isFailure()) {
if (msgLvl(MSG::INFO)) msg(MSG::INFO) << "Could not proc histograms" << endmsg;
}
}
if (m_doStatus) {
- if (ProcStatusMon().isFailure()) {
+ if (procStatusMon().isFailure()) {
if (msgLvl(MSG::INFO)) msg(MSG::INFO) << "Could not proc histograms" << endmsg;
}
}
if (m_doDCS) {
- if (ProcPixelDCSMon().isFailure()) {
+ if (procPixelDCSMon().isFailure()) {
if (msgLvl(MSG::INFO)) msg(MSG::INFO) << "Could not proc histograms" << endmsg;
}
}
if (m_doTrack) {
- if (ProcTrackMon().isFailure()) {
+ if (procTrackMon().isFailure()) {
if (msgLvl(MSG::INFO)) msg(MSG::INFO) << "Could not proc histograms" << endmsg;
}
}
diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/src/SpacePoints.cxx b/InnerDetector/InDetMonitoring/PixelMonitoring/src/SpacePoints.cxx
index 67fcc54dd8c6ef95aa1b5f31a1cdfc6a1fc0ec6b..759041704be9e2471f410b3428470edfe87dd7be 100644
--- a/InnerDetector/InDetMonitoring/PixelMonitoring/src/SpacePoints.cxx
+++ b/InnerDetector/InDetMonitoring/PixelMonitoring/src/SpacePoints.cxx
@@ -26,7 +26,7 @@
//////////////////////booking methods//////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////
-StatusCode PixelMainMon::BookSpacePointMon(void) {
+StatusCode PixelMainMon::bookSpacePointMon(void) {
ATH_MSG_DEBUG("Start booking SpacePoint histogtams..");
std::string path = "Pixel/SpacePoint";
if (m_doOnTrack) path.replace(path.begin(), path.end(), "Pixel/SpacePointOnTrack");
@@ -51,7 +51,7 @@ StatusCode PixelMainMon::BookSpacePointMon(void) {
return StatusCode::SUCCESS;
}
-StatusCode PixelMainMon::FillSpacePointMon(void) {
+StatusCode PixelMainMon::fillSpacePointMon(void) {
StatusCode sc = evtStore()->retrieve(m_Pixel_spcontainer, m_Pixel_SpacePointsName);
if (sc.isFailure() || !m_Pixel_spcontainer) {
ATH_MSG_WARNING("SpacePoint container for Pixels not found");
@@ -76,7 +76,7 @@ StatusCode PixelMainMon::FillSpacePointMon(void) {
const SpacePoint& sp = **p_sp;
PixelModuleId = sp.clusterList().first->identify();
- if (m_doOnTrack && !OnTrack(PixelModuleId, true)) {
+ if (m_doOnTrack && !isOnTrack(PixelModuleId, true)) {
// if we only want hits on track, and the hit is NOT on the track, skip filling
continue;
}
diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/src/Status.cxx b/InnerDetector/InDetMonitoring/PixelMonitoring/src/Status.cxx
index 08f70e55e852dbc42d8f84eb9960919c606b03b1..bd1f3891a4437dbc0b02832cd88f163987908cce 100644
--- a/InnerDetector/InDetMonitoring/PixelMonitoring/src/Status.cxx
+++ b/InnerDetector/InDetMonitoring/PixelMonitoring/src/Status.cxx
@@ -31,7 +31,7 @@
//////////////////////booking methods//////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////
-StatusCode PixelMainMon::BookStatusMon(void) {
+StatusCode PixelMainMon::bookStatusMon(void) {
if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "starting Book Status" << endmsg;
std::string path = "Pixel/Status";
@@ -93,7 +93,7 @@ StatusCode PixelMainMon::BookStatusMon(void) {
return StatusCode::SUCCESS;
}
-StatusCode PixelMainMon::BookStatusLumiBlockMon(void) {
+StatusCode PixelMainMon::bookStatusLumiBlockMon(void) {
if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "starting Book Status for lowStat" << endmsg;
std::string path = "Pixel/LumiBlock";
@@ -110,7 +110,7 @@ StatusCode PixelMainMon::BookStatusLumiBlockMon(void) {
return StatusCode::SUCCESS;
}
-StatusCode PixelMainMon::FillStatusMon(void) {
+StatusCode PixelMainMon::fillStatusMon(void) {
int Index = -1;
PixelID::const_id_iterator idIt = m_pixelid->wafer_begin();
PixelID::const_id_iterator idItEnd = m_pixelid->wafer_end();
@@ -126,10 +126,10 @@ StatusCode PixelMainMon::FillStatusMon(void) {
for (; idIt != idItEnd; ++idIt) {
Identifier WaferID = *idIt;
IdentifierHash id_hash = m_pixelid->wafer_hash(WaferID);
- int pixlayer = GetPixLayerID(m_pixelid->barrel_ec(WaferID), m_pixelid->layer_disk(WaferID), m_doIBL);
+ int pixlayer = getPixLayerID(m_pixelid->barrel_ec(WaferID), m_pixelid->layer_disk(WaferID), m_doIBL);
int pixlayeribl2d3d = 0;
if (pixlayer == PixLayer::kIBL) {
- pixlayeribl2d3d = GetPixLayerIDIBL2D3D(m_pixelid->barrel_ec(WaferID), m_pixelid->layer_disk(WaferID), m_pixelid->eta_module(WaferID), m_doIBL);
+ pixlayeribl2d3d = getPixLayerIDIBL2D3D(m_pixelid->barrel_ec(WaferID), m_pixelid->layer_disk(WaferID), m_pixelid->eta_module(WaferID), m_doIBL);
}
if (pixlayer == 99) continue;
@@ -199,7 +199,7 @@ StatusCode PixelMainMon::FillStatusMon(void) {
return StatusCode::SUCCESS;
}
-StatusCode PixelMainMon::ProcStatusMon(void) {
+StatusCode PixelMainMon::procStatusMon(void) {
if (m_status && m_dqStatus && m_occupancy) {
if (m_doIBL) {
for (int i = 1; i <= 12; i++) {
diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/src/Track.cxx b/InnerDetector/InDetMonitoring/PixelMonitoring/src/Track.cxx
index c6814238c01a5203ac4d768b3481c1e2ef7ddb21..e1066e3c54a43db09f94445b8dee17f3228c6f15 100644
--- a/InnerDetector/InDetMonitoring/PixelMonitoring/src/Track.cxx
+++ b/InnerDetector/InDetMonitoring/PixelMonitoring/src/Track.cxx
@@ -45,7 +45,7 @@
///////////////////////////////////////////////////////////////////////////////
//////////////////////booking methods//////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////
-StatusCode PixelMainMon::BookTrackMon(void) {
+StatusCode PixelMainMon::bookTrackMon(void) {
ATH_MSG_DEBUG("Start booking Track histogtams..");
std::string path = "Pixel/Track";
@@ -152,7 +152,7 @@ StatusCode PixelMainMon::BookTrackMon(void) {
return StatusCode::SUCCESS;
}
-StatusCode PixelMainMon::FillTrackMon(void) {
+StatusCode PixelMainMon::fillTrackMon(void) {
ATH_MSG_DEBUG("Filling Track Monitoring Histograms");
StatusCode sc;
@@ -259,11 +259,11 @@ StatusCode PixelMainMon::FillTrackMon(void) {
if (!m_idHelper->is_pixel(surfaceID)) continue;
- int pixlayer = GetPixLayerID(m_pixelid->barrel_ec(surfaceID), m_pixelid->layer_disk(surfaceID), m_doIBL);
- int pixlayerdisk = GetPixLayerDiskID(m_pixelid->barrel_ec(surfaceID), m_pixelid->layer_disk(surfaceID), m_doIBL);
+ int pixlayer = getPixLayerID(m_pixelid->barrel_ec(surfaceID), m_pixelid->layer_disk(surfaceID), m_doIBL);
+ int pixlayerdisk = getPixLayerDiskID(m_pixelid->barrel_ec(surfaceID), m_pixelid->layer_disk(surfaceID), m_doIBL);
int pixlayeribl2d3d = pixlayer;
if (pixlayeribl2d3d == PixLayer::kIBL) {
- pixlayeribl2d3d = GetPixLayerIDIBL2D3D(m_pixelid->barrel_ec(surfaceID), m_pixelid->layer_disk(surfaceID), m_pixelid->eta_module(surfaceID), m_doIBL);
+ pixlayeribl2d3d = getPixLayerIDIBL2D3D(m_pixelid->barrel_ec(surfaceID), m_pixelid->layer_disk(surfaceID), m_pixelid->eta_module(surfaceID), m_doIBL);
}
if (pixlayer == 99) continue;
@@ -450,7 +450,7 @@ StatusCode PixelMainMon::FillTrackMon(void) {
return StatusCode::SUCCESS;
}
-StatusCode PixelMainMon::ProcTrackMon(void) {
+StatusCode PixelMainMon::procTrackMon(void) {
double lengthLB = 0;
lengthLB = m_LBendTime - m_LBstartTime;
if (lengthLB <= 0) {