diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/PixelMonitoring/DBMMon2DMaps.h b/InnerDetector/InDetMonitoring/PixelMonitoring/PixelMonitoring/DBMMon2DMaps.h
index 69b85784f927f2dddaf777e34b2ccb09c62564de..e68e619b8af0fd12d44591fd3f2a8294fa82dc31 100644
--- a/InnerDetector/InDetMonitoring/PixelMonitoring/PixelMonitoring/DBMMon2DMaps.h
+++ b/InnerDetector/InDetMonitoring/PixelMonitoring/PixelMonitoring/DBMMon2DMaps.h
@@ -30,7 +30,6 @@ class DBMMon2DMaps
void Scale(double number);
StatusCode regHist(ManagedMonitorToolBase::MonGroup &group);
private:
- StatusCode sc;
void formatHist();
};
diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/PixelMonitoring/PixelMainMon.h b/InnerDetector/InDetMonitoring/PixelMonitoring/PixelMonitoring/PixelMainMon.h
index 610e1e73bc5dbff1cc549df66664bbc9f0380841..5e736217baadb1e1cbdaa97bdd32dd13a3177332 100755
--- a/InnerDetector/InDetMonitoring/PixelMonitoring/PixelMonitoring/PixelMainMon.h
+++ b/InnerDetector/InDetMonitoring/PixelMonitoring/PixelMonitoring/PixelMainMon.h
@@ -190,8 +190,6 @@ private:
//StoreGateSvc* m_StoreGate;
//StoreGateSvc* m_detStore;
const PixelID* m_pixelid; // Pixel ID helper
- const InDetDD::PixelDetectorManager* pixelmgr;
- StatusCode sc;
uint64_t m_event;
uint64_t m_event2;
@@ -278,7 +276,7 @@ private:
bool m_doLumiBlock; //store module status, error etc for each lumiblock
bool m_doRefresh;
bool m_doRefresh5min;
- bool isFirstBook;
+ bool m_isFirstBook;
bool m_doDegFactorMap;
bool m_doHeavyIonMon; //modifications for heavy ion monitoring
diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/PixelMonitoring/PixelMon2DLumiMaps.h b/InnerDetector/InDetMonitoring/PixelMonitoring/PixelMonitoring/PixelMon2DLumiMaps.h
index 9115f2d615e753f012fdf2d461476e27a187ea2f..2ed6da6176cd33999796d7aea70045d97fb1569a 100644
--- a/InnerDetector/InDetMonitoring/PixelMonitoring/PixelMonitoring/PixelMon2DLumiMaps.h
+++ b/InnerDetector/InDetMonitoring/PixelMonitoring/PixelMonitoring/PixelMon2DLumiMaps.h
@@ -34,7 +34,6 @@ class PixelMon2DLumiMaps
void Scale(double number,bool doIBL,bool errorHist);
StatusCode regHist(ManagedMonitorToolBase::MonGroup &group,bool doIBL=false,bool errorHist=false);
private:
- StatusCode sc;
void formatHist(bool doIBL=false,bool errorHist=false);
};
diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/PixelMonitoring/PixelMon2DLumiProfiles.h b/InnerDetector/InDetMonitoring/PixelMonitoring/PixelMonitoring/PixelMon2DLumiProfiles.h
index aa09ba84d2d4690ad183b4b2b8689d337e682ebe..8bb61097462fe954ff1bea2cfc7e83e26e187aa6 100644
--- a/InnerDetector/InDetMonitoring/PixelMonitoring/PixelMonitoring/PixelMon2DLumiProfiles.h
+++ b/InnerDetector/InDetMonitoring/PixelMonitoring/PixelMonitoring/PixelMon2DLumiProfiles.h
@@ -33,7 +33,6 @@ class PixelMon2DLumiProfiles
void Fill(double LB, Identifier &id, const PixelID* pixID,double weight=1,bool doIBL=false,bool errorHist=false);
StatusCode regHist(ManagedMonitorToolBase::MonGroup &group,bool doIBL=false,bool errorHist=false);
private:
- StatusCode sc;
void formatHist(bool doIBL,bool errorHist);
};
diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/PixelMonitoring/PixelMon2DMaps.h b/InnerDetector/InDetMonitoring/PixelMonitoring/PixelMonitoring/PixelMon2DMaps.h
index 1b2f0cfea10b6a37081a696723e51b46914e599f..fce0150373c14e625df96cef3f248403bbe727b3 100644
--- a/InnerDetector/InDetMonitoring/PixelMonitoring/PixelMonitoring/PixelMon2DMaps.h
+++ b/InnerDetector/InDetMonitoring/PixelMonitoring/PixelMonitoring/PixelMon2DMaps.h
@@ -47,7 +47,6 @@ class PixelMon2DMaps
void Fill2DMon(PixelMon2DMaps* oldmap);
StatusCode regHist(ManagedMonitorToolBase::MonGroup &group);
private:
- StatusCode sc;
void formatHist();
};
diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/PixelMonitoring/PixelMon2DMapsLW.h b/InnerDetector/InDetMonitoring/PixelMonitoring/PixelMonitoring/PixelMon2DMapsLW.h
index 426c338dd8f751b99e91dc73035312178cbc3fb3..b7ae4f0a4cb10db3e06a7de4fa74798e8cd25f61 100644
--- a/InnerDetector/InDetMonitoring/PixelMonitoring/PixelMonitoring/PixelMon2DMapsLW.h
+++ b/InnerDetector/InDetMonitoring/PixelMonitoring/PixelMonitoring/PixelMon2DMapsLW.h
@@ -40,7 +40,6 @@ class PixelMon2DMapsLW
void Scale(double number);
StatusCode regHist(ManagedMonitorToolBase::MonGroup &group, bool doIBL, bool errorHist);
private:
- StatusCode sc;
void formatHist(bool doIBL, bool errorHist);
};
diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/PixelMonitoring/PixelMon2DProfilesLW.h b/InnerDetector/InDetMonitoring/PixelMonitoring/PixelMonitoring/PixelMon2DProfilesLW.h
index 7f1b40e86baf0288a54ef5abb3592189fd535301..b00b12da14f5eaac75c5ccee77020bb0f80aa67d 100644
--- a/InnerDetector/InDetMonitoring/PixelMonitoring/PixelMonitoring/PixelMon2DProfilesLW.h
+++ b/InnerDetector/InDetMonitoring/PixelMonitoring/PixelMonitoring/PixelMon2DProfilesLW.h
@@ -38,7 +38,6 @@ public:
void Fill2DMon(PixelMon2DProfilesLW* oldmap);
StatusCode regHist(ManagedMonitorToolBase::MonGroup &group, bool doIBL, bool errorHist);
private:
- StatusCode sc;
void formatHist(bool doIBL, bool errorHist);
};
diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/PixelMonitoring/PixelMonModules.h b/InnerDetector/InDetMonitoring/PixelMonitoring/PixelMonitoring/PixelMonModules.h
index 5c1d109fab1193ac5d00263d988a22470a28c891..1b4528bd7d99a6a1f168511c1dcc60f6e774825e 100644
--- a/InnerDetector/InDetMonitoring/PixelMonitoring/PixelMonitoring/PixelMonModules.h
+++ b/InnerDetector/InDetMonitoring/PixelMonitoring/PixelMonitoring/PixelMonModules.h
@@ -31,8 +31,7 @@ class PixelMonModules
virtual StatusCode regHist(ManagedMonitorToolBase* thisptr, std::string path, ManagedMonitorToolBase::Interval_t Run, bool doIBL)=0;
//virtual StatusCode regHist(ManagedMonitorToolBase* thisptr, std::string path, ManagedMonitorToolBase::Interval_t Run, ManagedMonitorToolBase::MgmtAttr_t m=ATTRIB_MANAGED, bool doIBL)=0;
protected:
- int nBins;
- StatusCode sc;
+ int m_nBins;
std::string getHistName(int i, bool forPath=false, bool doIBL=false);
};
@@ -57,7 +56,7 @@ virtual ~PixelMonModules1D();
virtual void Reset();
double GetBinContent(double value, Identifier &id, const PixelID* pixID);
private:
- TH1F* Dummy; //shouldn't be used unless messed up;
+ TH1F* m_Dummy; //shouldn't be used unless messed up;
TH1F* &getHist(int i); //make looping over all the histos easier.
};
@@ -81,7 +80,7 @@ virtual ~PixelMonModulesProf();
virtual void Reset();
//double GetBinContent(double value, Identifier &id, const PixelID* pixID);
private:
- TProfile_LW* Dummy; //shouldn't be used unless messed up;
+ TProfile_LW* m_Dummy; //shouldn't be used unless messed up;
TProfile_LW* &getHist(int i); //make looping over all the histos easier.
};
@@ -103,7 +102,7 @@ class PixelMonModules2D : public PixelMonModules
void Fill(double value0, double value1, Identifier &id, const PixelID* pixID,bool doIBL);
virtual void Reset();
private:
- TH2F* Dummy; //shouldn't be used unless messed up;
+ TH2F* m_Dummy; //shouldn't be used unless messed up;
TH2F* &getHist(int i); //make looping over all the histos easier.
};
diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/PixelMonitoring/PixelMonProfiles.h b/InnerDetector/InDetMonitoring/PixelMonitoring/PixelMonitoring/PixelMonProfiles.h
index 50e0e4f196d39ce7e6123b01a5e53784aeb350f2..a1cff59487d78f62288681f2f2a35f363db8fffd 100644
--- a/InnerDetector/InDetMonitoring/PixelMonitoring/PixelMonitoring/PixelMonProfiles.h
+++ b/InnerDetector/InDetMonitoring/PixelMonitoring/PixelMonitoring/PixelMonProfiles.h
@@ -36,7 +36,6 @@ class PixelMonProfiles
void Reset();
StatusCode regHist(ManagedMonitorToolBase::MonGroup &group);
private:
- StatusCode sc;
void formatHist();
};
diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/src/Clusters.cxx b/InnerDetector/InDetMonitoring/PixelMonitoring/src/Clusters.cxx
index 366c2692adea3feedeb36c1c0000bcdf7a589841..64d3159c0f81f2bd12e7e315e8691b2f59681027 100644
--- a/InnerDetector/InDetMonitoring/PixelMonitoring/src/Clusters.cxx
+++ b/InnerDetector/InDetMonitoring/PixelMonitoring/src/Clusters.cxx
@@ -104,12 +104,14 @@ StatusCode PixelMainMon::BookClustersMon(void)
modlabel2[9]="DBMA";modlabel2[10]="DBMC";
modlabel2[11]="IBL"; modlabel2[12]="IBL2D"; modlabel2[13]="IBL3D";
+ StatusCode sc;
+
hname = makeHistname("ClusterSize_vs_eta", false);
htitles = makeHisttitle("Average cluster size as a function of barrel module eta", (atext_eta+atext_cluw), false);
sc = clusterExpert.regHist(m_clusterSize_eta = TProfile_LW::create(hname.c_str(), htitles.c_str(), nbins_eta, min_eta, max_eta));
hname = makeHistname("LargeClusters_per_lumi", true);
- htitles = makeHisttitle("Avetarge number of large clusters (with >10 pixels) per event", (atext_LB+atext_clu), true);
+ htitles = makeHisttitle("Average number of large clusters (with >10 pixels) per event", (atext_LB+atext_clu), true);
sc = clusterShift.regHist(m_largeclusters_per_lumi = TProfile_LW::create(hname.c_str(), htitles.c_str(), nbins_LB, min_LB, max_LB));
hname = makeHistname("VeryLargeClusters_per_lumi", true);
@@ -554,6 +556,8 @@ StatusCode PixelMainMon::BookClustersLumiBlockMon(void)
if(m_doOnPixelTrack) path.replace(path.begin(), path.end(), "Pixel/LumiBlockOnPixelTrack");
MonGroup lumiBlockHist( this, path.c_str(), lowStat, ATTRIB_MANAGED); //declare a group of histograms
+ StatusCode sc;
+
sc = lumiBlockHist.regHist(m_cluster_ToT_LB = TH1F_LW::create("Cluster_ToT_LB", ("Cluster Time over Threshold" + m_histTitleExt + ";ToT;# clusters").c_str(), 300,-0.5,299.5));
if(m_do2DMaps) {
@@ -580,7 +584,7 @@ StatusCode PixelMainMon::BookClustersLumiBlockMon(void)
StatusCode PixelMainMon::FillClustersMon(void)
{
- sc = evtStore()->retrieve(m_Pixel_clcontainer, m_Pixel_SiClustersName);
+ 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;
diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/src/DBMMon2DMaps.cxx b/InnerDetector/InDetMonitoring/PixelMonitoring/src/DBMMon2DMaps.cxx
index ea2416edb32b2ccbda76bdaeb7007b3163a5843d..de1cd83d04e3af0adffba121b07242ec42108c39 100644
--- a/InnerDetector/InDetMonitoring/PixelMonitoring/src/DBMMon2DMaps.cxx
+++ b/InnerDetector/InDetMonitoring/PixelMonitoring/src/DBMMon2DMaps.cxx
@@ -90,8 +90,8 @@ void DBMMon2DMaps::formatHist()
StatusCode DBMMon2DMaps::regHist(ManagedMonitorToolBase::MonGroup &group)
{
- sc = group.regHist(DBMA);
- sc = group.regHist(DBMC);
-
+ StatusCode sc = StatusCode::SUCCESS;
+ if (group.regHist(DBMA).isFailure()) sc = StatusCode::FAILURE;
+ if (group.regHist(DBMC).isFailure()) sc = StatusCode::FAILURE;
return sc;
}
diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/src/Errors.cxx b/InnerDetector/InDetMonitoring/PixelMonitoring/src/Errors.cxx
index fd5b39bd0330953cf4dda75ffa2be21e47d7c865..2872a11c42cf447e4892d478128ac0e2181baa80 100644
--- a/InnerDetector/InDetMonitoring/PixelMonitoring/src/Errors.cxx
+++ b/InnerDetector/InDetMonitoring/PixelMonitoring/src/Errors.cxx
@@ -90,6 +90,7 @@ StatusCode PixelMainMon::BookRODErrorMon(void)
std::string hname;
std::string htitles;
+ StatusCode sc;
hname = makeHistname("SyncErrors_per_lumi_PIX", false);
htitles = makeHisttitle("Average Synchronization errors per event, PIXEL BARREL", (atext_LB+atext_err), false);
@@ -338,6 +339,8 @@ StatusCode PixelMainMon::BookRODErrorLumiBlockMon(void)
if(m_doOnTrack) path.replace(path.begin(), path.end(), "Pixel/LumiBlockOnTrack");
if(m_doOnPixelTrack) path.replace(path.begin(), path.end(), "Pixel/LumiBlockOnPixelTrack");
MonGroup lumiBlockHist( this, path.c_str(), lowStat, ATTRIB_MANAGED); //declare a group of histograms
+
+ StatusCode sc;
if (m_do2DMaps && !m_doOnline) {
m_errors_LB = new PixelMon2DMapsLW("Errors_LB", ("Errors" + m_histTitleExt).c_str(), m_doIBL, true);
diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/src/Hits.cxx b/InnerDetector/InDetMonitoring/PixelMonitoring/src/Hits.cxx
index b8f3d2f943588ff8445150a65e0eeea2a9935c35..89ca3d2cb689232fab91ccb5a9e849c2ecb62aae 100644
--- a/InnerDetector/InDetMonitoring/PixelMonitoring/src/Hits.cxx
+++ b/InnerDetector/InDetMonitoring/PixelMonitoring/src/Hits.cxx
@@ -88,6 +88,7 @@ StatusCode PixelMainMon::BookHitsMon(void)
std::string atext_tot = ";ToT [BC]";
std::string atext_lv1 = ";Level 1 Accept";
+ StatusCode sc;
hname = makeHistname("Hits_per_lumi", false);
htitles = makeHisttitle("Average number of pixel hits per event", (atext_LB+atext_hit), false);
@@ -360,6 +361,8 @@ StatusCode PixelMainMon::BookHitsLumiBlockMon(void)
std::string atext_tot = ";ToT [BC]";
std::string atext_lv1 = ";Level 1 Accept";
+ StatusCode sc;
+
if(m_doHighOccupancy) {
hname = makeHistname("num_hits_LB", false);
htitles = makeHisttitle("Number of pixel hits in an event", (atext_hit+atext_nevt), false);
@@ -406,6 +409,7 @@ StatusCode PixelMainMon::FillHitsMon(void) //Called once per event
msg(MSG::ERROR) << "No lumitool found in FillHitsMon!"<<endmsg;
}
+ StatusCode sc;
// get ROD BCID
const InDetTimeCollection *Pixel_BCIDColl = 0;
@@ -476,24 +480,24 @@ StatusCode PixelMainMon::FillHitsMon(void) //Called once per event
static constexpr int nmod_phi[PixLayer::COUNT] = {48, 48, 22, 38, 52, 14};
static constexpr int nmod_eta[PixLayer::COUNT] = {3, 3, 13, 13, 13, 20};
- int m_HitPerEventArray_disksA[ nmod_phi[PixLayer::kECA] ][ nmod_eta[PixLayer::kECA] ];
- int m_HitPerEventArray_disksC[ nmod_phi[PixLayer::kECC] ][ nmod_eta[PixLayer::kECC] ];
- int m_HitPerEventArray_l0[ nmod_phi[PixLayer::kB0] ][ nmod_eta[PixLayer::kB0] ];
- int m_HitPerEventArray_l1[ nmod_phi[PixLayer::kB1] ][ nmod_eta[PixLayer::kB1] ];
- int m_HitPerEventArray_l2[ nmod_phi[PixLayer::kB2] ][ nmod_eta[PixLayer::kB2] ];
- int m_HitPerEventArray_lI[ nmod_phi[PixLayer::kIBL] ][ nmod_eta[PixLayer::kIBL] ];
+ int HitPerEventArray_disksA[ nmod_phi[PixLayer::kECA] ][ nmod_eta[PixLayer::kECA] ];
+ int HitPerEventArray_disksC[ nmod_phi[PixLayer::kECC] ][ nmod_eta[PixLayer::kECC] ];
+ int HitPerEventArray_l0[ nmod_phi[PixLayer::kB0] ][ nmod_eta[PixLayer::kB0] ];
+ int HitPerEventArray_l1[ nmod_phi[PixLayer::kB1] ][ nmod_eta[PixLayer::kB1] ];
+ int HitPerEventArray_l2[ nmod_phi[PixLayer::kB2] ][ nmod_eta[PixLayer::kB2] ];
+ int HitPerEventArray_lI[ nmod_phi[PixLayer::kIBL] ][ nmod_eta[PixLayer::kIBL] ];
///if (m_doModules)
///{
for(int i=0; i<PixLayer::COUNT; i++){
for( int phi=0; phi<nmod_phi[i]; phi++){
for(int eta=0; eta<nmod_eta[i]; eta++){
- if(i==PixLayer::kECA) m_HitPerEventArray_disksA[phi][eta]=0;
- if(i==PixLayer::kECC) m_HitPerEventArray_disksC[phi][eta]=0;
- if(i==PixLayer::kB0) m_HitPerEventArray_l0[phi][eta]=0;
- if(i==PixLayer::kB1) m_HitPerEventArray_l1[phi][eta]=0;
- if(i==PixLayer::kB2) m_HitPerEventArray_l2[phi][eta]=0;
- if(i==PixLayer::kIBL) m_HitPerEventArray_lI[phi][eta]=0;
+ if(i==PixLayer::kECA) HitPerEventArray_disksA[phi][eta]=0;
+ if(i==PixLayer::kECC) HitPerEventArray_disksC[phi][eta]=0;
+ if(i==PixLayer::kB0) HitPerEventArray_l0[phi][eta]=0;
+ if(i==PixLayer::kB1) HitPerEventArray_l1[phi][eta]=0;
+ if(i==PixLayer::kB2) HitPerEventArray_l2[phi][eta]=0;
+ if(i==PixLayer::kIBL) HitPerEventArray_lI[phi][eta]=0;
}
}
}
@@ -682,16 +686,16 @@ StatusCode PixelMainMon::FillHitsMon(void) //Called once per event
///if (m_doModules)//fill module hit arrays so we can calculate the number of hits/event/module
///{
- if(m_pixelid->barrel_ec(rdoID)==2 ) m_HitPerEventArray_disksA[m_pixelid->phi_module(rdoID)][m_pixelid->layer_disk(rdoID)]++;
+ if(m_pixelid->barrel_ec(rdoID)==2 ) HitPerEventArray_disksA[m_pixelid->phi_module(rdoID)][m_pixelid->layer_disk(rdoID)]++;
- if(m_pixelid->barrel_ec(rdoID)==-2) m_HitPerEventArray_disksC[m_pixelid->phi_module(rdoID)][m_pixelid->layer_disk(rdoID)]++;
+ if(m_pixelid->barrel_ec(rdoID)==-2) HitPerEventArray_disksC[m_pixelid->phi_module(rdoID)][m_pixelid->layer_disk(rdoID)]++;
if(m_pixelid->barrel_ec(rdoID)==0 )
{
- if(m_doIBL && m_pixelid->layer_disk(rdoID)==0) m_HitPerEventArray_lI[m_pixelid->phi_module(rdoID)][m_pixelid->eta_module(rdoID)+10]++;
- if(m_pixelid->layer_disk(rdoID)==0+m_doIBL) m_HitPerEventArray_l0[m_pixelid->phi_module(rdoID)][m_pixelid->eta_module(rdoID)+6]++;
- if(m_pixelid->layer_disk(rdoID)==1+m_doIBL) m_HitPerEventArray_l1[m_pixelid->phi_module(rdoID)][m_pixelid->eta_module(rdoID)+6]++;
- if(m_pixelid->layer_disk(rdoID)==2+m_doIBL) m_HitPerEventArray_l2[m_pixelid->phi_module(rdoID)][m_pixelid->eta_module(rdoID)+6]++;
+ if(m_doIBL && m_pixelid->layer_disk(rdoID)==0) HitPerEventArray_lI[m_pixelid->phi_module(rdoID)][m_pixelid->eta_module(rdoID)+10]++;
+ if(m_pixelid->layer_disk(rdoID)==0+m_doIBL) HitPerEventArray_l0[m_pixelid->phi_module(rdoID)][m_pixelid->eta_module(rdoID)+6]++;
+ if(m_pixelid->layer_disk(rdoID)==1+m_doIBL) HitPerEventArray_l1[m_pixelid->phi_module(rdoID)][m_pixelid->eta_module(rdoID)+6]++;
+ if(m_pixelid->layer_disk(rdoID)==2+m_doIBL) HitPerEventArray_l2[m_pixelid->phi_module(rdoID)][m_pixelid->eta_module(rdoID)+6]++;
}
///}
@@ -701,7 +705,7 @@ StatusCode PixelMainMon::FillHitsMon(void) //Called once per event
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 ]++;
+ nhits_L0_B11_S2_C6[ (int)(16*fabs(6+m_pixelid->eta_module(rdoID)))+(8*fephi)+feeta ]++;
}
if( pixlayer == PixLayer::kB0 && GetFEID( pixlayer, m_pixelid->phi_index(rdoID), m_pixelid->eta_index(rdoID), fephi, feeta) ){
@@ -792,12 +796,12 @@ StatusCode PixelMainMon::FillHitsMon(void) //Called once per event
for(int i=0; i<PixLayer::COUNT; i++){
for(int phi=0; phi<nmod_phi[i]; phi++){
for(int eta=0; eta<nmod_eta[i]; eta++){
- if(i == PixLayer::kECA && m_nhits_mod[i]) m_nhits_mod[i]->Fill( m_HitPerEventArray_disksA[phi][eta] );
- if(i == PixLayer::kECC && m_nhits_mod[i]) m_nhits_mod[i]->Fill( m_HitPerEventArray_disksC[phi][eta] );
- if(i == PixLayer::kB0 && m_nhits_mod[i]) m_nhits_mod[i]->Fill( m_HitPerEventArray_l0[phi][eta]);
- if(i == PixLayer::kB1 && m_nhits_mod[i]) m_nhits_mod[i]->Fill( m_HitPerEventArray_l1[phi][eta]);
- if(i == PixLayer::kB2 && m_nhits_mod[i]) m_nhits_mod[i]->Fill( m_HitPerEventArray_l2[phi][eta]);
- if(i == PixLayer::kIBL && m_nhits_mod[i]) m_nhits_mod[i]->Fill( m_HitPerEventArray_lI[phi][eta]);
+ if(i == PixLayer::kECA && m_nhits_mod[i]) m_nhits_mod[i]->Fill( HitPerEventArray_disksA[phi][eta] );
+ if(i == PixLayer::kECC && m_nhits_mod[i]) m_nhits_mod[i]->Fill( HitPerEventArray_disksC[phi][eta] );
+ if(i == PixLayer::kB0 && m_nhits_mod[i]) m_nhits_mod[i]->Fill( HitPerEventArray_l0[phi][eta]);
+ if(i == PixLayer::kB1 && m_nhits_mod[i]) m_nhits_mod[i]->Fill( HitPerEventArray_l1[phi][eta]);
+ if(i == PixLayer::kB2 && m_nhits_mod[i]) m_nhits_mod[i]->Fill( HitPerEventArray_l2[phi][eta]);
+ if(i == PixLayer::kIBL && m_nhits_mod[i]) m_nhits_mod[i]->Fill( HitPerEventArray_lI[phi][eta]);
}
}
}
@@ -807,7 +811,7 @@ StatusCode PixelMainMon::FillHitsMon(void) //Called once per event
for( int i=0; i<PixLayer::COUNT-1+(int)(m_doIBL); i++){
m_hitocc_stock[i].push_back( avgocc_mod[i] );
}
- }else if( !newLumiBlock ){
+ }else if( !newLumiBlockFlag() ){
for( int i=0; i<PixLayer::COUNT-1+(int)(m_doIBL); i++){
m_hitocc_stock[i].push_back( avgocc_mod[i] );
}
@@ -834,30 +838,30 @@ StatusCode PixelMainMon::FillHitsMon(void) //Called once per event
for (; idIt != idItEnd; ++idIt) {
Identifier WaferID = *idIt;
if(m_pixelid->barrel_ec(WaferID)==2 ){
- m_hit_num_mod->Fill( m_HitPerEventArray_disksA[m_pixelid->phi_module(WaferID)][m_pixelid->layer_disk(WaferID)], WaferID, m_pixelid ,m_doIBL);
+ m_hit_num_mod->Fill( HitPerEventArray_disksA[m_pixelid->phi_module(WaferID)][m_pixelid->layer_disk(WaferID)], WaferID, m_pixelid ,m_doIBL);
}
- if(m_pixelid->barrel_ec(WaferID)==-2) m_hit_num_mod->Fill( m_HitPerEventArray_disksC[m_pixelid->phi_module(WaferID)][m_pixelid->layer_disk(WaferID)], WaferID, m_pixelid ,m_doIBL);
+ if(m_pixelid->barrel_ec(WaferID)==-2) m_hit_num_mod->Fill( HitPerEventArray_disksC[m_pixelid->phi_module(WaferID)][m_pixelid->layer_disk(WaferID)], WaferID, m_pixelid ,m_doIBL);
if(m_pixelid->barrel_ec(WaferID)==0 )
{
if(m_doIBL && m_pixelid->layer_disk(WaferID)==0) {
- m_hit_num_mod->Fill( m_HitPerEventArray_lI[m_pixelid->phi_module(WaferID)][m_pixelid->eta_module(WaferID)+10], WaferID, m_pixelid ,m_doIBL);
+ m_hit_num_mod->Fill( HitPerEventArray_lI[m_pixelid->phi_module(WaferID)][m_pixelid->eta_module(WaferID)+10], WaferID, m_pixelid ,m_doIBL);
}
if(m_pixelid->layer_disk(WaferID)==0+m_doIBL) {
- m_hit_num_mod->Fill( m_HitPerEventArray_l0[m_pixelid->phi_module(WaferID)][m_pixelid->eta_module(WaferID)+6], WaferID, m_pixelid ,m_doIBL);
+ m_hit_num_mod->Fill( HitPerEventArray_l0[m_pixelid->phi_module(WaferID)][m_pixelid->eta_module(WaferID)+6], WaferID, m_pixelid ,m_doIBL);
}
- if(m_pixelid->layer_disk(WaferID)==1+m_doIBL) m_hit_num_mod->Fill( m_HitPerEventArray_l1[m_pixelid->phi_module(WaferID)][m_pixelid->eta_module(WaferID)+6], WaferID, m_pixelid ,m_doIBL);
- if(m_pixelid->layer_disk(WaferID)==2+m_doIBL) m_hit_num_mod->Fill( m_HitPerEventArray_l2[m_pixelid->phi_module(WaferID)][m_pixelid->eta_module(WaferID)+6], WaferID, m_pixelid ,m_doIBL);
+ if(m_pixelid->layer_disk(WaferID)==1+m_doIBL) m_hit_num_mod->Fill( HitPerEventArray_l1[m_pixelid->phi_module(WaferID)][m_pixelid->eta_module(WaferID)+6], WaferID, m_pixelid ,m_doIBL);
+ if(m_pixelid->layer_disk(WaferID)==2+m_doIBL) m_hit_num_mod->Fill( HitPerEventArray_l2[m_pixelid->phi_module(WaferID)][m_pixelid->eta_module(WaferID)+6], WaferID, m_pixelid ,m_doIBL);
}
if (m_doLumiBlock) {
- if(m_pixelid->barrel_ec(WaferID)==2 ) m_hit_num_mod_LB->Fill( m_HitPerEventArray_disksA[m_pixelid->phi_module(WaferID)][m_pixelid->layer_disk(WaferID)], WaferID, m_pixelid ,m_doIBL);
- if(m_pixelid->barrel_ec(WaferID)==-2) m_hit_num_mod_LB->Fill( m_HitPerEventArray_disksC[m_pixelid->phi_module(WaferID)][m_pixelid->layer_disk(WaferID)], WaferID, m_pixelid ,m_doIBL);
+ if(m_pixelid->barrel_ec(WaferID)==2 ) m_hit_num_mod_LB->Fill( HitPerEventArray_disksA[m_pixelid->phi_module(WaferID)][m_pixelid->layer_disk(WaferID)], WaferID, m_pixelid ,m_doIBL);
+ if(m_pixelid->barrel_ec(WaferID)==-2) m_hit_num_mod_LB->Fill( HitPerEventArray_disksC[m_pixelid->phi_module(WaferID)][m_pixelid->layer_disk(WaferID)], WaferID, m_pixelid ,m_doIBL);
if(m_pixelid->barrel_ec(WaferID)==0 )
{
- if(m_doIBL && m_pixelid->layer_disk(WaferID)==0) m_hit_num_mod_LB->Fill( m_HitPerEventArray_lI[m_pixelid->phi_module(WaferID)][m_pixelid->eta_module(WaferID)+10], WaferID, m_pixelid ,m_doIBL);
- if(m_pixelid->layer_disk(WaferID)==0+m_doIBL) m_hit_num_mod_LB->Fill( m_HitPerEventArray_l0[m_pixelid->phi_module(WaferID)][m_pixelid->eta_module(WaferID)+6], WaferID, m_pixelid ,m_doIBL);
- if(m_pixelid->layer_disk(WaferID)==1+m_doIBL) m_hit_num_mod_LB->Fill( m_HitPerEventArray_l1[m_pixelid->phi_module(WaferID)][m_pixelid->eta_module(WaferID)+6], WaferID, m_pixelid ,m_doIBL);
- if(m_pixelid->layer_disk(WaferID)==2+m_doIBL) m_hit_num_mod_LB->Fill( m_HitPerEventArray_l2[m_pixelid->phi_module(WaferID)][m_pixelid->eta_module(WaferID)+6], WaferID, m_pixelid ,m_doIBL);
+ if(m_doIBL && m_pixelid->layer_disk(WaferID)==0) m_hit_num_mod_LB->Fill( HitPerEventArray_lI[m_pixelid->phi_module(WaferID)][m_pixelid->eta_module(WaferID)+10], WaferID, m_pixelid ,m_doIBL);
+ if(m_pixelid->layer_disk(WaferID)==0+m_doIBL) m_hit_num_mod_LB->Fill( HitPerEventArray_l0[m_pixelid->phi_module(WaferID)][m_pixelid->eta_module(WaferID)+6], WaferID, m_pixelid ,m_doIBL);
+ if(m_pixelid->layer_disk(WaferID)==1+m_doIBL) m_hit_num_mod_LB->Fill( HitPerEventArray_l1[m_pixelid->phi_module(WaferID)][m_pixelid->eta_module(WaferID)+6], WaferID, m_pixelid ,m_doIBL);
+ if(m_pixelid->layer_disk(WaferID)==2+m_doIBL) m_hit_num_mod_LB->Fill( HitPerEventArray_l2[m_pixelid->phi_module(WaferID)][m_pixelid->eta_module(WaferID)+6], WaferID, m_pixelid ,m_doIBL);
}
}
}
diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelDCSMon.cxx b/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelDCSMon.cxx
index b52d00a7c02527bec036d92e0872659ac6a4c877..93465c780357af17687b789d2626da2b0b9d838c 100644
--- a/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelDCSMon.cxx
+++ b/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelDCSMon.cxx
@@ -94,8 +94,9 @@ StatusCode PixelMainMon::BookPixelDCSMon(void)
TAxis *tyaxis;
LWHist::LWHistAxis *xaxis;
LWHist::LWHistAxis *yaxis;
+ StatusCode sc;
for( int ii = 0; ii < IBLStave::COUNT; ii++){
- // temprerature
+ // temperature
sc = dcsExpert.regHist(m_hist_moduleTemperature2Dscatter[ii]
= TH2F_LW::create(Form("moduleTemperature_ModuleNumber_S%02d",ii + 1), "Module Temprerature vs Module Number; Module Number;"+label_moduleTemp+";Number of LBs",
nbins_module,min_module,max_module,nbins_temperature,min_temperature,max_temperature));
@@ -628,7 +629,7 @@ StatusCode PixelMainMon::FillPixelDCSMon(void)
itr!=m_atrcollist.end();++itr) {
ATH_MSG_DEBUG("execute(): Reading the data from " << *itr );
//const CondAttrListCollection* atrlistcol;
- sc = StatusCode::FAILURE;
+ StatusCode sc = StatusCode::FAILURE;
if(*itr == "/PIXEL/DCS/TEMPERATURE") {
sc = detStore()->retrieve(atrlistcol_temperature,*itr);
atrlistcol = atrlistcol_temperature;
diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelMainMon.cxx b/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelMainMon.cxx
index 999561d86de180791cfc2cd2b4736cd769d34cf8..eb5af2595f472b8f0db8a546088047a0e6f24ab7 100755
--- a/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelMainMon.cxx
+++ b/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelMainMon.cxx
@@ -162,7 +162,7 @@ PixelMainMon::PixelMainMon(const std::string & type,
m_doRefresh5min = false;
m_firstBookTime = 0;
m_currentBCID = 0;
- isFirstBook = false;
+ m_isFirstBook = false;
m_nRefresh = 0;
m_nRefresh5min = 0;
m_ntracksPerEvent = 0;
@@ -352,7 +352,6 @@ PixelMainMon::PixelMainMon(const std::string & type,
m_errors_ModSync_mod = 0;
m_pixelid =0;
- pixelmgr =0;
m_event =0;
m_event2 =0;
m_startTime =0;
@@ -610,8 +609,7 @@ PixelMainMon::~PixelMainMon()
StatusCode PixelMainMon::initialize()
{
- sc = ManagedMonitorToolBase::initialize();
- if(!sc.isSuccess()) return sc;
+ ATH_CHECK( ManagedMonitorToolBase::initialize() );
time ( &m_startTime ); //mark time for start of run
//m_idHelper = new AtlasDetectorID; // not need "new"
@@ -623,11 +621,7 @@ StatusCode PixelMainMon::initialize()
// Get the dictionary manager from the detector store
- sc = detStore()->retrieve(m_idHelper, "AtlasID");
- if (sc.isFailure()) {
- msg(MSG::ERROR) << "Could not get ID helper !" << endmsg;
- return sc;
- }
+ ATH_CHECK( detStore()->retrieve(m_idHelper, "AtlasID") );
if ( m_pixelCondSummarySvc.retrieve().isFailure() ) {
if(msgLvl(MSG::FATAL)) msg(MSG::FATAL) << "Failed to retrieve tool " << m_pixelCondSummarySvc << endmsg;
@@ -818,26 +812,25 @@ StatusCode PixelMainMon::bookHistograms()
//m_doOnline = true;
const EventInfo* thisEventInfo;
- sc=evtStore()->retrieve(thisEventInfo);
- if(sc != StatusCode::SUCCESS) {
+ if(evtStore()->retrieve(thisEventInfo) != StatusCode::SUCCESS) {
if(msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "No EventInfo object found" << endmsg;
}else{
m_lumiBlockNum = thisEventInfo->event_ID()->lumi_block();
if(m_doOnline){
m_runNum = thisEventInfo->event_ID()->run_number();
- std::stringstream m_runNumStr;
- m_runNumStr << m_runNum;
- m_histTitleExt = " (Run " + m_runNumStr.str() + ")";
+ std::stringstream runNumStr;
+ runNumStr << m_runNum;
+ m_histTitleExt = " (Run " + runNumStr.str() + ")";
}else{
m_histTitleExt = "";
}
- if(newLumiBlock) {
+ if(newLumiBlockFlag()) {
m_LBstartTime = thisEventInfo->event_ID()->time_stamp();
}
- if( !isFirstBook ){
+ if( !m_isFirstBook ){
m_firstBookTime = thisEventInfo->event_ID()->time_stamp();
- isFirstBook = true;
+ m_isFirstBook = true;
}
}
@@ -880,23 +873,27 @@ StatusCode PixelMainMon::bookHistograms()
if(m_doLumiBlock){
if(m_doRDO){
- sc=BookHitsLumiBlockMon();
- if (sc.isFailure()) if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "Could not book lowStat histograms" << endmsg;
+ 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){
- sc=BookRODErrorLumiBlockMon();
- if (sc.isFailure()) if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "Could not book lowStat histograms" << endmsg;
+ 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){
- sc=BookClustersLumiBlockMon();
- if (sc.isFailure()) if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "Could not book lowStat histograms" << endmsg;
+ 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){
- sc=BookStatusLumiBlockMon();
- if (sc.isFailure()) if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "Could not book lowStat histograms" << endmsg;
+ 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;
}
}
@@ -909,6 +906,7 @@ StatusCode PixelMainMon::bookHistograms()
if(m_doOnTrack) path_hits.replace(path_hits.begin(), path_hits.end(), "Pixel/HitsOnTrack");
if(m_doOnPixelTrack) path_hits.replace(path_hits.begin(), path_hits.end(), "Pixel/HitsOnPixelTrack");
MonGroup hitsHistos( this, path_hits.c_str(), run, ATTRIB_MANAGED ); //declare a group of histograms
+ StatusCode sc;
sc = hitsHistos.regHist(m_mu_vs_bcid = TProfile_LW::create("Interactions_vs_bcid", "<Interactions> vs BCID;BCID;<#Interactions/event>" , m_bcidRange,-0.5,-0.5+(1.0*m_bcidRange)));
sc = hitsHistos.regHist(m_mu_vs_lumi = TProfile_LW::create("Interactions_vs_lumi", "<Interactions> vs LB;lumi block;<#Interactions/event>", m_lbRange,-0.5,-0.5+(1.0*m_lbRange)));
sc = hitsHistos.regHist(m_events_per_lumi = TH1F_LW::create("Events_per_lumi", "nEvents vs LB;lumi block;#events", m_lbRange,-0.5,-0.5+(1.0*m_lbRange)));
@@ -941,44 +939,51 @@ StatusCode PixelMainMon::bookHistograms()
///
if(m_doTrack)
{
- sc=BookTrackMon();
- if (sc.isFailure()) if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "Could not book histograms" << endmsg;
+ 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)
{
- sc=BookHitsMon();
- if (sc.isFailure()) if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "Could not book histograms" << endmsg;
+ 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)
{
- sc=BookRODErrorMon();
- if (sc.isFailure()) if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "Could not book histograms" << endmsg;
+ 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)
{
- sc=BookSpacePointMon();
- if (sc.isFailure()) if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "Could not book histograms" << endmsg;
+ 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)
{
- sc=BookClustersMon();
- if (sc.isFailure()) if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "Could not book histograms" << endmsg;
+ 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)
{
- sc=BookStatusMon();
- if (sc.isFailure()) if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "Could not book histograms" << endmsg;
+ 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)
{
- sc=BookPixelDCSMon();
- if (sc.isFailure()) if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "Could not book histograms" << endmsg;
+ 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;
}
@@ -996,8 +1001,7 @@ StatusCode PixelMainMon::fillHistograms() //get called twice per event
m_majorityDisabled = false;
const EventInfo* thisEventInfo;
- sc=evtStore()->retrieve(thisEventInfo);
- if(sc != StatusCode::SUCCESS) {
+ if(evtStore()->retrieve(thisEventInfo) != StatusCode::SUCCESS) {
if(msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "No EventInfo object found" << endmsg;
}else{
m_currentTime = thisEventInfo->event_ID()->time_stamp();
@@ -1082,15 +1086,17 @@ StatusCode PixelMainMon::fillHistograms() //get called twice per event
/// Pixel Info
///
if(m_doStatus) { //fill status histograms first, to check number of disabled modules
- sc=FillStatusMon();
- if(sc.isFailure()) if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "Could not fill histograms" << endmsg;
+ if(FillStatusMon().isFailure()) {
+ if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "Could not fill histograms" << endmsg;
+ }
}
//if(m_doRODError&&evtStore()->contains<PixelRODErrorCollection>(m_detector_error_name))
if(m_doRODError)
{
- sc=FillRODErrorMon();
- if (sc.isFailure()) if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "Could not fill histograms" << endmsg;
+ if (FillRODErrorMon().isFailure()) {
+ if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "Could not fill histograms" << endmsg;
+ }
}else{
if(m_storegate_errors) m_storegate_errors->Fill(5.,1.);
}
@@ -1098,8 +1104,9 @@ StatusCode PixelMainMon::fillHistograms() //get called twice per event
/// Track
if(m_doTrack){
if(evtStore()->contains< TrackCollection >(m_TracksName)){
- sc=FillTrackMon();
- if(sc.isFailure()) if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "Could not fill histograms" << endmsg;
+ if (FillTrackMon().isFailure()) {
+ if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "Could not fill histograms" << endmsg;
+ }
}else if(m_storegate_errors) m_storegate_errors->Fill(4.,2.);
}else{
if(m_storegate_errors) m_storegate_errors->Fill(4.,1.);
@@ -1107,7 +1114,11 @@ StatusCode PixelMainMon::fillHistograms() //get called twice per event
/// Hits
if(m_doRDO){
- if(evtStore()->contains<PixelRDO_Container>(m_Pixel_RDOName) ) sc=FillHitsMon();
+ if(evtStore()->contains<PixelRDO_Container>(m_Pixel_RDOName) ) {
+ if (FillHitsMon().isFailure()) {
+ if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "Could not fill histograms" << endmsg;
+ }
+ }
else if(m_storegate_errors) m_storegate_errors->Fill(1.,2.);
}else{
if(m_storegate_errors) m_storegate_errors->Fill(1.,1.);
@@ -1116,8 +1127,9 @@ StatusCode PixelMainMon::fillHistograms() //get called twice per event
/// Cluster
if(m_doCluster){
if(evtStore()->contains<InDet::PixelClusterContainer>(m_Pixel_SiClustersName)){
- sc=FillClustersMon();
- if (sc.isFailure()) if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "Could not fill histograms" << endmsg;
+ if (FillClustersMon().isFailure()) {
+ if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "Could not fill histograms" << endmsg;
+ }
}else if(m_storegate_errors) m_storegate_errors->Fill(3.,2.);
}else{
if(m_storegate_errors) m_storegate_errors->Fill(3.,1.);
@@ -1127,8 +1139,9 @@ StatusCode PixelMainMon::fillHistograms() //get called twice per event
if(m_doSpacePoint)
{
if(evtStore()->contains<SpacePointContainer>(m_Pixel_SpacePointsName)){
- sc=FillSpacePointMon();
- if (sc.isFailure()) if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "Could not fill histograms" << endmsg;
+ if (FillSpacePointMon().isFailure()) {
+ if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "Could not fill histograms" << endmsg;
+ }
}else if(m_storegate_errors) m_storegate_errors->Fill(2.,2.);
}else{
if(m_storegate_errors) m_storegate_errors->Fill(2.,1.);
@@ -1137,8 +1150,9 @@ StatusCode PixelMainMon::fillHistograms() //get called twice per event
/// DCS
if(m_doDCS){
- sc=FillPixelDCSMon();
- if (sc.isFailure()) if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "Could not fill histograms" << endmsg;
+ if (FillPixelDCSMon().isFailure()) {
+ if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "Could not fill histograms" << endmsg;
+ }
}else{
if(m_storegate_errors)m_storegate_errors->Fill(6.,1.);
}
@@ -1155,26 +1169,45 @@ StatusCode PixelMainMon::procHistograms()
// Part 1: Get the messaging service, print where you are
if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "finalize()" << endmsg;
//if(endOfEventsBlock){}
- if(endOfLumiBlock)
+ if(endOfLumiBlockFlag())
{
m_LBendTime = m_currentTime;
- //if (m_doTrack) { sc=ProcTrackMon(); }
- if (sc.isFailure()) if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "Could not proc histograms" << endmsg;
+ //if (m_doTrack) { m_sc=ProcTrackMon(); }
+ //if (m_sc.isFailure()) if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "Could not proc histograms" << endmsg;
}
if( m_doOnline ){
- // if(m_doRDO){ sc=ProcHitsMon(); }
- // if (m_doCluster) { sc=ProcClustersMon(); }
+ // if(m_doRDO){ m_sc=ProcHitsMon(); }
+ // if (m_doCluster) { m_sc=ProcClustersMon(); }
}
- if(!m_doOnline && endOfRun)
+ if(!m_doOnline && endOfRunFlag())
{
- if (m_doRDO) { sc=ProcHitsMon(); }
- if (m_doCluster) { sc=ProcClustersMon(); }
- if (m_doStatus) { sc=ProcStatusMon(); }
- if (m_doDCS) { sc=ProcPixelDCSMon(); }
- if (m_doTrack) { sc=ProcTrackMon(); }
- if (sc.isFailure()) if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "Could not proc histograms" << endmsg;
+ if (m_doRDO) {
+ if (ProcHitsMon().isFailure()) {
+ if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "Could not proc histograms" << endmsg;
+ }
+ }
+ if (m_doCluster) {
+ if (ProcClustersMon().isFailure()) {
+ if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "Could not proc histograms" << endmsg;
+ }
+ }
+ if (m_doStatus) {
+ if (ProcStatusMon().isFailure()) {
+ if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "Could not proc histograms" << endmsg;
+ }
+ }
+ if (m_doDCS) {
+ if (ProcPixelDCSMon().isFailure()) {
+ if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "Could not proc histograms" << endmsg;
+ }
+ }
+ if (m_doTrack) {
+ if (ProcTrackMon().isFailure()) {
+ if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "Could not proc histograms" << endmsg;
+ }
+ }
}
return StatusCode::SUCCESS;
diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelMon2DLumiMaps.cxx b/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelMon2DLumiMaps.cxx
index 4ab38872aca079455bdf5d61dd63a083da4130de..91fc43f9119d6a7e952836f3663ae67c8c9c1b1d 100644
--- a/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelMon2DLumiMaps.cxx
+++ b/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelMon2DLumiMaps.cxx
@@ -214,12 +214,15 @@ void PixelMon2DLumiMaps::formatHist(bool doIBL, bool errorHist)
StatusCode PixelMon2DLumiMaps::regHist(ManagedMonitorToolBase::MonGroup &group,bool doIBL,bool errorHist)
{
- if(!errorHist && doIBL)sc = group.regHist(IBLlbm);
- sc = group.regHist(B0lbm);
- sc = group.regHist(B1lbm);
- sc = group.regHist(B2lbm);
- sc = group.regHist(Albm);
- sc = group.regHist(Clbm);
+ StatusCode sc = StatusCode::SUCCESS;
+ if(!errorHist && doIBL) {
+ if (group.regHist(IBLlbm).isFailure()) sc = StatusCode::FAILURE;
+ }
+ if (group.regHist(B0lbm).isFailure()) sc = StatusCode::FAILURE;
+ if (group.regHist(B1lbm).isFailure()) sc = StatusCode::FAILURE;
+ if (group.regHist(B2lbm).isFailure()) sc = StatusCode::FAILURE;
+ if (group.regHist(Albm).isFailure()) sc = StatusCode::FAILURE;
+ if (group.regHist(Clbm).isFailure()) sc = StatusCode::FAILURE;
return sc;
}
diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelMon2DLumiProfiles.cxx b/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelMon2DLumiProfiles.cxx
index f02b082425e2da9a798afc380ad688b8a4d246d9..fba64c168dd27af66d1e69651311696e2c6cf250 100644
--- a/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelMon2DLumiProfiles.cxx
+++ b/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelMon2DLumiProfiles.cxx
@@ -210,12 +210,15 @@ void PixelMon2DLumiProfiles::formatHist(bool doIBL,bool errorHist)
StatusCode PixelMon2DLumiProfiles::regHist(ManagedMonitorToolBase::MonGroup &group,bool doIBL,bool errorHist)
{
- if(!errorHist && doIBL)sc = group.regHist(IBLlbp);
- sc = group.regHist(B0lbp);
- sc = group.regHist(B1lbp);
- sc = group.regHist(B2lbp);
- sc = group.regHist(Albp);
- sc = group.regHist(Clbp);
-
+ StatusCode sc = StatusCode::SUCCESS;
+ if(!errorHist && doIBL) {
+ if (group.regHist(IBLlbp).isFailure()) sc = StatusCode::FAILURE;
+ }
+ if (group.regHist(B0lbp).isFailure()) sc = StatusCode::FAILURE;
+ if (group.regHist(B1lbp).isFailure()) sc = StatusCode::FAILURE;
+ if (group.regHist(B2lbp).isFailure()) sc = StatusCode::FAILURE;
+ if (group.regHist(Albp).isFailure()) sc = StatusCode::FAILURE;
+ if (group.regHist(Clbp).isFailure()) sc = StatusCode::FAILURE;
+
return sc;
}
diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelMon2DMaps.cxx b/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelMon2DMaps.cxx
index d1890d07d7a325c47fe8abeb880f22a85c8678d1..886ba648df339fcbf80976e9f46af9f1483819cd 100644
--- a/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelMon2DMaps.cxx
+++ b/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelMon2DMaps.cxx
@@ -548,16 +548,16 @@ void PixelMon2DMaps::formatHist()
StatusCode PixelMon2DMaps::regHist(ManagedMonitorToolBase::MonGroup &group)
{
- sc = group.regHist(IBL2D);
- sc = group.regHist(IBL3D);
- sc = group.regHist(IBL);
- sc = group.regHist(B0);
- sc = group.regHist(B1);
- sc = group.regHist(B2);
- sc = group.regHist(A);
- sc = group.regHist(C);
- sc = group.regHist(DBMA);
- sc = group.regHist(DBMC);
-
+ StatusCode sc = StatusCode::SUCCESS;
+ if (group.regHist(IBL2D).isFailure()) sc = StatusCode::FAILURE;
+ if (group.regHist(IBL3D).isFailure()) sc = StatusCode::FAILURE;
+ if (group.regHist(IBL).isFailure()) sc = StatusCode::FAILURE;
+ if (group.regHist(B0).isFailure()) sc = StatusCode::FAILURE;
+ if (group.regHist(B1).isFailure()) sc = StatusCode::FAILURE;
+ if (group.regHist(B2).isFailure()) sc = StatusCode::FAILURE;
+ if (group.regHist(A).isFailure()) sc = StatusCode::FAILURE;
+ if (group.regHist(C).isFailure()) sc = StatusCode::FAILURE;
+ if (group.regHist(DBMA).isFailure()) sc = StatusCode::FAILURE;
+ if (group.regHist(DBMC).isFailure()) sc = StatusCode::FAILURE;
return sc;
}
diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelMon2DMapsLW.cxx b/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelMon2DMapsLW.cxx
index e9f33e1cef9f30011782e6d438f5a5efd4849a0b..59d90a3ca91c9c3bf557467ddc2c41adf8f9f3eb 100644
--- a/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelMon2DMapsLW.cxx
+++ b/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelMon2DMapsLW.cxx
@@ -400,18 +400,20 @@ void PixelMon2DMapsLW::formatHist(bool doIBL, bool errorHist)
StatusCode PixelMon2DMapsLW::regHist(ManagedMonitorToolBase::MonGroup &group, bool doIBL, bool errorHist)
{
- if(doIBL && !errorHist){
- sc = group.regHist(IBL);
- sc = group.regHist(IBL2D);
- sc = group.regHist(IBL3D);
- }
- sc = group.regHist(B0);
- sc = group.regHist(B1);
- sc = group.regHist(B2);
- sc = group.regHist(A);
- sc = group.regHist(C);
- sc = group.regHist(DBMA);
- sc = group.regHist(DBMC);
+ StatusCode sc = StatusCode::SUCCESS;
+
+ if(doIBL && !errorHist){
+ if (group.regHist(IBL).isFailure()) sc = StatusCode::FAILURE;
+ if (group.regHist(IBL2D).isFailure()) sc = StatusCode::FAILURE;
+ if (group.regHist(IBL3D).isFailure()) sc = StatusCode::FAILURE;
+ }
+ if (group.regHist(B0).isFailure()) sc = StatusCode::FAILURE;
+ if (group.regHist(B1).isFailure()) sc = StatusCode::FAILURE;
+ if (group.regHist(B2).isFailure()) sc = StatusCode::FAILURE;
+ if (group.regHist(A).isFailure()) sc = StatusCode::FAILURE;
+ if (group.regHist(C).isFailure()) sc = StatusCode::FAILURE;
+ if (group.regHist(DBMA).isFailure()) sc = StatusCode::FAILURE;
+ if (group.regHist(DBMC).isFailure()) sc = StatusCode::FAILURE;
return sc;
}
diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelMon2DProfilesLW.cxx b/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelMon2DProfilesLW.cxx
index 575799832afb06c52fcb3e286245538dd169103c..a64b4f9b742555c9b0e61da2e251c2744e4f5262 100644
--- a/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelMon2DProfilesLW.cxx
+++ b/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelMon2DProfilesLW.cxx
@@ -360,18 +360,19 @@ void PixelMon2DProfilesLW::Fill2DMon(PixelMon2DProfilesLW* oldmap)
StatusCode PixelMon2DProfilesLW::regHist(ManagedMonitorToolBase::MonGroup &group, bool doIBL, bool errorHist)
{
+ StatusCode sc = StatusCode::SUCCESS;
if(doIBL && !errorHist){
- sc = group.regHist(IBL);
- sc = group.regHist(IBL2D);
- sc = group.regHist(IBL3D);
+ if (group.regHist(IBL).isFailure()) sc = StatusCode::FAILURE;
+ if (group.regHist(IBL2D).isFailure()) sc = StatusCode::FAILURE;
+ if (group.regHist(IBL3D).isFailure()) sc = StatusCode::FAILURE;
}
- sc = group.regHist(B0);
- sc = group.regHist(B1);
- sc = group.regHist(B2);
- sc = group.regHist(A);
- sc = group.regHist(C);
- //sc = group.regHist(DBMA);
- //sc = group.regHist(DBMC);
+ if (group.regHist(B0).isFailure()) sc = StatusCode::FAILURE;
+ if (group.regHist(B1).isFailure()) sc = StatusCode::FAILURE;
+ if (group.regHist(B2).isFailure()) sc = StatusCode::FAILURE;
+ if (group.regHist(A).isFailure()) sc = StatusCode::FAILURE;
+ if (group.regHist(C).isFailure()) sc = StatusCode::FAILURE;
+ //m_sc = group.regHist(DBMA);
+ //m_sc = group.regHist(DBMC);
return sc;
}
diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelMonModules.cxx b/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelMonModules.cxx
index 309b55099386891c08b2161ecc46761180c30780..ae118e19dd56dcaa24f66fe2442c2253970a53df 100644
--- a/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelMonModules.cxx
+++ b/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelMonModules.cxx
@@ -24,55 +24,55 @@ PixelMonModules::~PixelMonModules()
PixelMonModulesProf::PixelMonModulesProf(std::string name, std::string title, int nbins, double* arr, bool doIBL)
{
- nBins=nbins;
+ m_nBins=nbins;
for(int i=0; i < 1744 +280*doIBL; i++)
- {
- //getHist(i) = new TProfile((getHistName(i,false,doIBL)+"_"+name).c_str(), (getHistName(i,false,doIBL)+" "+title).c_str(), nbins, arr);
- getHist(i) = TProfile_LW::create((getHistName(i,false,doIBL)+"_"+name).c_str(), (getHistName(i,false,doIBL)+" "+title).c_str(), nbins, arr);
- }
+ {
+ //getHist(i) = new TProfile((getHistName(i,false,doIBL)+"_"+name).c_str(), (getHistName(i,false,doIBL)+" "+title).c_str(), nbins, arr);
+ getHist(i) = TProfile_LW::create((getHistName(i,false,doIBL)+"_"+name).c_str(), (getHistName(i,false,doIBL)+" "+title).c_str(), nbins, arr);
+ }
if(doIBL==false){
for(int i=1744; i < 2024; i++){
getHist(i)=0;
}
}
formatHist("",doIBL);
- Dummy=0;
+ m_Dummy=0;
}
PixelMonModulesProf::PixelMonModulesProf(std::string name, std::string title, int nbins, double low, double high, bool doIBL)
{
- nBins=nbins;
+ m_nBins=nbins;
for(int i=0; i < 1744 +280*doIBL; i++)
- {
- //getHist(i) = new TProfile((getHistName(i,false,doIBL)+"_"+name).c_str(), (getHistName(i,false,doIBL)+" "+title).c_str(), nbins, low, high);
- getHist(i) = TProfile_LW::create((getHistName(i,false,doIBL)+"_"+name).c_str(), (getHistName(i,false,doIBL)+" "+title).c_str(), nbins, low, high);
- }
+ {
+ //getHist(i) = new TProfile((getHistName(i,false,doIBL)+"_"+name).c_str(), (getHistName(i,false,doIBL)+" "+title).c_str(), nbins, low, high);
+ getHist(i) = TProfile_LW::create((getHistName(i,false,doIBL)+"_"+name).c_str(), (getHistName(i,false,doIBL)+" "+title).c_str(), nbins, low, high);
+ }
if(doIBL==false){
for(int i=1744; i < 2024; i++){
getHist(i)=0;
}
}
formatHist("",doIBL);
- Dummy=0;
+ m_Dummy=0;
}
PixelMonModulesProf::~PixelMonModulesProf()
{
for(int i=0; i < 2024; i++)
{
- //if(getHist(i)){ delete getHist(i); }
- if(getHist(i)){ LWHist::safeDelete( getHist(i) ); }
+ //if(getHist(i)){ delete getHist(i); }
+ if(getHist(i)){ LWHist::safeDelete( getHist(i) ); }
}
}
PixelMonModules1D::PixelMonModules1D(std::string name, std::string title, int nbins, double* arr, bool doIBL)
{
- nBins=nbins;
+ m_nBins=nbins;
for(int i=0; i < 1744 +280*doIBL; i++)
- {
- getHist(i) = new TH1F((getHistName(i,false,doIBL)+"_"+name).c_str(), (getHistName(i,false,doIBL)+" "+title).c_str(), nbins, arr);
- //getHist(i) = TH1F_LW::create((getHistName(i,false,doIBL)+"_"+name).c_str(), (getHistName(i,false,doIBL)+" "+title).c_str(), nbins, arr);
- }
+ {
+ getHist(i) = new TH1F((getHistName(i,false,doIBL)+"_"+name).c_str(), (getHistName(i,false,doIBL)+" "+title).c_str(), nbins, arr);
+ //getHist(i) = TH1F_LW::create((getHistName(i,false,doIBL)+"_"+name).c_str(), (getHistName(i,false,doIBL)+" "+title).c_str(), nbins, arr);
+ }
if(doIBL==false){
for(int i=1744; i < 2024; i++){
getHist(i)=0;
@@ -80,17 +80,17 @@ PixelMonModules1D::PixelMonModules1D(std::string name, std::string title, int nb
}
formatHist("",doIBL);
//formatHist(doIBL);
- Dummy=0;
+ m_Dummy=0;
}
PixelMonModules1D::PixelMonModules1D(std::string name, std::string title, int nbins, double low, double high, bool doIBL)
{
- nBins=nbins;
+ m_nBins=nbins;
for(int i=0; i < 1744 +280*doIBL; i++)
- {
- getHist(i) = new TH1F((getHistName(i,false,doIBL)+"_"+name).c_str(), (getHistName(i,false,doIBL)+" "+title).c_str(), nbins, low, high);
- //getHist(i) = TH1F_LW::create((getHistName(i,false,doIBL)+"_"+name).c_str(), (getHistName(i,false,doIBL)+" "+title).c_str(), nbins, low, high);
- }
+ {
+ getHist(i) = new TH1F((getHistName(i,false,doIBL)+"_"+name).c_str(), (getHistName(i,false,doIBL)+" "+title).c_str(), nbins, low, high);
+ //getHist(i) = TH1F_LW::create((getHistName(i,false,doIBL)+"_"+name).c_str(), (getHistName(i,false,doIBL)+" "+title).c_str(), nbins, low, high);
+ }
if(doIBL==false){
for(int i=1744; i < 2024; i++){
getHist(i)=0;
@@ -98,52 +98,52 @@ PixelMonModules1D::PixelMonModules1D(std::string name, std::string title, int nb
}
formatHist("",doIBL);
//formatHist(doIBL);
- Dummy=0;
+ m_Dummy=0;
}
PixelMonModules1D::~PixelMonModules1D()
{
for(int i=0; i < 2024; i++)
{
- if(getHist(i)){ delete getHist(i); }
- //if(getHist(i)){ LWHist::safeDelete( getHist(i) ); }
+ if(getHist(i)){ delete getHist(i); }
+ //if(getHist(i)){ LWHist::safeDelete( getHist(i) ); }
}
}
PixelMonModules2D::PixelMonModules2D(std::string name, std::string title, int nbins0, double low0, double high0, int nbins1, double low1, double high1, bool doIBL)
{
- nBins=nbins0*nbins1;
+ m_nBins=nbins0*nbins1;
for(int i=0; i < 1744 +280*doIBL; i++)
- {
- getHist(i) = new TH2F((getHistName(i,false,doIBL)+"_"+name).c_str(), (getHistName(i,false,doIBL)+" "+title).c_str(), nbins0, low0, high0, nbins1, low1, high1);
- }
+ {
+ getHist(i) = new TH2F((getHistName(i,false,doIBL)+"_"+name).c_str(), (getHistName(i,false,doIBL)+" "+title).c_str(), nbins0, low0, high0, nbins1, low1, high1);
+ }
if(doIBL==false){
for(int i=1744; i < 2024; i++){
getHist(i)=0;
}
}
formatHist("",doIBL);
- Dummy=0;
+ m_Dummy=0;
}
PixelMonModules2D::~PixelMonModules2D()
{
for(int i=0; i < 2024; i++)
- {
- if(getHist(i)){
- delete getHist(i);
- }
+ {
+ if(getHist(i)){
+ delete getHist(i);
}
+ }
}
void PixelMonModulesProf::Reset()
{
for(int i=0; i < 2024; i++)
- {
- if(getHist(i)){
- getHist(i)->Reset();
- }
+ {
+ if(getHist(i)){
+ getHist(i)->Reset();
}
+ }
}
//double PixelMonModulesProf::GetBinContent(double value, Identifier &id, const PixelID* pixID)
@@ -168,13 +168,14 @@ void PixelMonModulesProf::Reset()
StatusCode PixelMonModulesProf::regHist(ManagedMonitorToolBase* thisptr, std::string path, ManagedMonitorToolBase::Interval_t Run, bool doIBL)
{
for(int i=0; i<1744 +280*doIBL; i++)
- {
- ManagedMonitorToolBase::MonGroup mgroup(thisptr, (path+"/"+getHistName(i,true,doIBL)).c_str(),Run);
- sc = mgroup.regHist(getHist(i));
- if(sc.isFailure() ) return StatusCode::FAILURE;
+ {
+ ManagedMonitorToolBase::MonGroup mgroup(thisptr, (path+"/"+getHistName(i,true,doIBL)).c_str(),Run);
+ if (mgroup.regHist(getHist(i)).isFailure()) {
+ return StatusCode::FAILURE;
+ }
}
- return sc;
+ return StatusCode::SUCCESS;
}
@@ -294,11 +295,12 @@ StatusCode PixelMonModules1D::regHist(ManagedMonitorToolBase* thisptr, std::stri
for(int i=0; i<1744 +280*doIBL; i++)
{
ManagedMonitorToolBase::MonGroup mgroup(thisptr, (path+"/"+getHistName(i,true,doIBL)).c_str(),Run);
- sc = mgroup.regHist(getHist(i));
- if(sc.isFailure() ) return StatusCode::FAILURE;
+ if (mgroup.regHist(getHist(i)).isFailure()) {
+ return StatusCode::FAILURE;
+ }
}
- return sc;
+ return StatusCode::SUCCESS;
}
StatusCode PixelMonModules2D::regHist(ManagedMonitorToolBase* thisptr, std::string path, ManagedMonitorToolBase::Interval_t Run, bool doIBL)
@@ -306,11 +308,12 @@ StatusCode PixelMonModules2D::regHist(ManagedMonitorToolBase* thisptr, std::stri
for(int i=0; i<1744 +280*doIBL; i++)
{
ManagedMonitorToolBase::MonGroup mgroup(thisptr, (path+"/"+getHistName(i,true,doIBL)).c_str(),Run);
- sc = mgroup.regHist(getHist(i));
- if(sc.isFailure() ) return StatusCode::FAILURE;
+ if (mgroup.regHist(getHist(i)).isFailure()) {
+ return StatusCode::FAILURE;
+ }
}
- return sc;
+ return StatusCode::SUCCESS;
}
void PixelMonModules1D::formatHist(std::string opt, bool doIBL)
@@ -344,7 +347,7 @@ void PixelMonModules2D::formatHist(std::string opt, bool doIBL)
void PixelMonModules1D::SetBinLabel(const char* label, int binN)
{
- if(binN > nBins) return;
+ if(binN > m_nBins) return;
for(int i=0; i < 2024; i++)
{
if(getHist(i)){getHist(i)->GetXaxis()->SetBinLabel(binN,label);}
@@ -366,7 +369,7 @@ TProfile_LW* &PixelMonModulesProf::getHist(int i)
if(i<280){
return IBL[i/14][i%14];
}
- return Dummy;
+ return m_Dummy;
}
TH1F* &PixelMonModules1D::getHist(int i)
@@ -384,7 +387,7 @@ TH1F* &PixelMonModules1D::getHist(int i)
if(i<280){
return IBL[i/14][i%14];
}
- return Dummy;
+ return m_Dummy;
}
TH2F* &PixelMonModules2D::getHist(int i)
@@ -402,7 +405,7 @@ TH2F* &PixelMonModules2D::getHist(int i)
if(i<280){
return IBL[i/14][i%14];
}
- return Dummy;
+ return m_Dummy;
}
std::string PixelMonModules::getHistName(int i, bool forPath, bool doIBL)
diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelMonProfiles.cxx b/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelMonProfiles.cxx
index 7266c63dea7435daa57f9c7cec3b13d4011b6009..ab3a2661943eb2f2576812521e34e00b672c0948 100644
--- a/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelMonProfiles.cxx
+++ b/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelMonProfiles.cxx
@@ -280,14 +280,14 @@ void PixelMonProfiles::formatHist()
StatusCode PixelMonProfiles::regHist(ManagedMonitorToolBase::MonGroup &group)
{
- sc = group.regHist(IBL2D);
- sc = group.regHist(IBL3D);
- sc = group.regHist(IBL);
- sc = group.regHist(B0);
- sc = group.regHist(B1);
- sc = group.regHist(B2);
- sc = group.regHist(A);
- sc = group.regHist(C);
-
+ StatusCode sc = StatusCode::SUCCESS;
+ if (group.regHist(IBL2D).isFailure()) sc = StatusCode::FAILURE;
+ if (group.regHist(IBL3D).isFailure()) sc = StatusCode::FAILURE;
+ if (group.regHist(IBL).isFailure()) sc = StatusCode::FAILURE;
+ if (group.regHist(B0).isFailure()) sc = StatusCode::FAILURE;
+ if (group.regHist(B1).isFailure()) sc = StatusCode::FAILURE;
+ if (group.regHist(B2).isFailure()) sc = StatusCode::FAILURE;
+ if (group.regHist(A).isFailure()) sc = StatusCode::FAILURE;
+ if (group.regHist(C).isFailure()) sc = StatusCode::FAILURE;
return sc;
}
diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/src/SpacePoints.cxx b/InnerDetector/InDetMonitoring/PixelMonitoring/src/SpacePoints.cxx
index 827649a1e0d7addf5cbfdabc6e8a92873d3732dd..a7b1ab8ad23ea5681cdbaf79ab6824941069980d 100644
--- a/InnerDetector/InDetMonitoring/PixelMonitoring/src/SpacePoints.cxx
+++ b/InnerDetector/InDetMonitoring/PixelMonitoring/src/SpacePoints.cxx
@@ -45,6 +45,7 @@ StatusCode PixelMainMon::BookSpacePointMon(void)
if(m_doOnTrack) path.replace(path.begin(), path.end(), "Pixel/SpacePointOnTrack");
if(m_doOnPixelTrack) path.replace(path.begin(), path.end(), "Pixel/SpacePointOnPixelTrack");
+ StatusCode sc;
MonGroup spacePointHistos( this, path.c_str(),run,ATTRIB_MANAGED ); //declare a group of histograms
if(m_doHighOccupancy)
{
@@ -69,7 +70,7 @@ StatusCode PixelMainMon::BookSpacePointMon(void)
StatusCode PixelMainMon::FillSpacePointMon(void)
{
- sc = evtStore()->retrieve(m_Pixel_spcontainer, m_Pixel_SpacePointsName );
+ StatusCode sc = evtStore()->retrieve(m_Pixel_spcontainer, m_Pixel_SpacePointsName );
if (sc.isFailure() || !m_Pixel_spcontainer)
{
if(msgLvl(MSG::INFO)) msg(MSG::INFO) <<"SpacePoint container for Pixels not found"<< endmsg;
diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/src/Status.cxx b/InnerDetector/InDetMonitoring/PixelMonitoring/src/Status.cxx
index 51f73d4c76752315a29679d080b86683351e586b..cb3b64d53b607698964e328643af1121811b41f5 100644
--- a/InnerDetector/InDetMonitoring/PixelMonitoring/src/Status.cxx
+++ b/InnerDetector/InDetMonitoring/PixelMonitoring/src/Status.cxx
@@ -43,6 +43,8 @@ StatusCode PixelMainMon::BookStatusMon(void)
// DISABLED "BAD" = active + bad
// DISABLED "INACTIVE" = inactive + good/bad (inactive implicitely means bad though)
+ StatusCode sc;
+
m_status = new PixelMonProfiles("Map_Of_Modules_Status", ("Modules Status (0=Active+Good, 1=Active+Bad, 2=Inactive)" + m_histTitleExt).c_str());
sc = m_status->regHist(statusHistos);
m_status->SetMaxValue( 2.0 );
@@ -109,7 +111,7 @@ StatusCode PixelMainMon::BookStatusLumiBlockMon(void)
MonGroup lumiBlockHist(this, path.c_str(), lowStat, ATTRIB_MANAGED); //declare a group of histograms
m_status_LB = new PixelMonProfiles("Map_Of_Modules_Status_LB", ("Module Status (0=Active+Good, 1=Active+Bad, 2=Inactive)"+ m_histTitleExt).c_str());
- sc = m_status_LB->regHist(lumiBlockHist);
+ StatusCode sc = m_status_LB->regHist(lumiBlockHist);
m_status_LB->SetMaxValue( 2.0 );
if(sc.isFailure())if(msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "histograms not booked" << endmsg;
diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/src/Track.cxx b/InnerDetector/InDetMonitoring/PixelMonitoring/src/Track.cxx
index bf7d9c49b181ee52c08f667b4b3adc1bba83ec84..c7aef3543c85cef040f921a54cdc52915b7c3a47 100644
--- a/InnerDetector/InDetMonitoring/PixelMonitoring/src/Track.cxx
+++ b/InnerDetector/InDetMonitoring/PixelMonitoring/src/Track.cxx
@@ -70,6 +70,8 @@ StatusCode PixelMainMon::BookTrackMon(void)
std::string hname;
std::string htitles;
+ StatusCode sc;
+
sc=trackHistos.regHist(m_track_res_phi = TH1F_LW::create("Track_res_phi", ("Pixel Residual LocX(phi)" + m_histTitleExt).c_str(),100,-0.1,0.1));
sc=trackHistos.regHist(m_track_res_eta = TH1F_LW::create("Track_res_eta", ("Pixel Residual LocY(eta)" + m_histTitleExt).c_str(),100,-0.3,0.3));
sc=trackHistos.regHist(m_track_pull_phi = TH1F_LW::create("Track_pull_phi", ("Pixel pull LocX(phi)" + m_histTitleExt).c_str(),100,-1.2,1.2));
@@ -218,7 +220,8 @@ StatusCode PixelMainMon::FillTrackMon(void)
{
const Trk::Track *track0=(*m_tracks)[i];
if (track0 == 0) {
- if (msgLvl(MSG::ERROR) ) msg(MSG::ERROR) << "no pointer to track!!!" << endmsg; break;
+ if (msgLvl(MSG::ERROR) ) msg(MSG::ERROR) << "no pointer to track!!!" << endmsg;
+ break;
}
@@ -242,7 +245,8 @@ StatusCode PixelMainMon::FillTrackMon(void)
if(summary){
if (summary->get(Trk::numberOfPixelHits)==0) continue;
} else {
- if (msgLvl(MSG::INFO)) msg(MSG::INFO) << "No Track Summary Found" << endmsg; continue;
+ if (msgLvl(MSG::INFO)) msg(MSG::INFO) << "No Track Summary Found" << endmsg;
+ continue;
}
const Trk::Track* track = track0;