Commit 018086a1 authored by Daiki Yamaguchi's avatar Daiki Yamaguchi Committed by Graeme Stewart
Browse files

Removed memory leakage reported from valgrind (PixelMonitoring-00-06-14)

	* Track.cxx: Added hit efficiency vs LB plots

2016-05-09 Daiki Yamaguchi <daiki.yamaguchi@cern.ch>
	* Errors.cxx: Debug the double counting error flags in Error_per_lumi

2016-05-06 Daiki Yamaguchi <daiki.yamaguchi@cern.ch>
	* PixelMainMon.h: Removed unsued pointers
	* Track.cxx: Added the phi information of tracks

2016-05-03 Daiki Yamaguchi <daiki.yamaguchi@cern.ch>
	* PixelMainMon.h: small change

2016-04-29 Daiki Yamaguchi <daiki.yamaguchi@cern.ch>
	* Cluster.cxx: removed unused pointers
	* Errors.cxx: removed unused pointers

2016-04-22 Daiki Yamaguchi <daiki.yamaguchi@cern.ch>
	* Track.cxx: removed unused histograms
parent 536c3a85
......@@ -279,49 +279,47 @@ class PixelMainMon:public ManagedMonitorToolBase
//Reconstruction Error Monitoring (mostly storegate error monitoring)
TH2S* m_storegate_errors;
//Hitmap histograms
///
/// Hitmap histograms
///
TH1F_LW* m_mu_vs_lumi;
PixelMonModulesProf* m_hiteff_mod;
TH1F_LW* m_events_per_lumi;
TProfile_LW* m_hits_per_lumi;
TProfile_LW* m_avgocc_per_lumi;
TProfile_LW* m_avgocc_ratioIBLB0_per_lumi;
TH1F_LW* m_Lvl1A;
TH1I_LW* m_Lvl1ID_PIX;
TH1I_LW* m_Lvl1ID_IBL;
TH1I_LW* m_BCID;
TH1F_LW* m_Atlas_BCID;
TH2F_LW* m_Atlas_BCID_hits;
TProfile_LW* m_BCID_Profile;
PixelMon2DLumiProfiles* m_Lvl1ID_diff_mod_ATLAS_per_LB;
PixelMon2DLumiProfiles* m_Lvl1ID_absdiff_mod_ATLAS_per_LB;
PixelMon2DMaps* m_occupancy;
PixelMon2DMaps* m_occupancy_10min;
PixelMon2DMapsLW* m_average_pixocc;
PixelMon2DMaps* m_hitmap_mon;
PixelMon2DMaps* m_hitmap_tmp;
PixelMonModulesProf* m_hiteff_mod;
TProfile_LW* m_hiteff_incl_mod[PixLayer::COUNT];
TProfile_LW* m_hiteff_actv_mod[PixLayer::COUNT];
TProfile_LW* m_hits_per_lumi_mod[PixLayer::COUNT];
TProfile_LW* m_avgocc_per_lumi_mod[PixLayer::COUNT];
TH2F_LW* m_maxocc_per_lumi_mod[PixLayer::COUNT];
TH1F_LW* m_nlargeevt_per_lumi_mod[PixLayer::COUNT];
//TH1F_LW* m_hit_ToT[PixLayerIBL2D3D::COUNT];
TH1F_LW* m_hit_ToT[PixLayerIBL2D3DDBM::COUNT];
TH1F_LW* m_hit_ToT_Mon_mod[PixLayer::COUNT];
TH1F_LW* m_hit_ToT_tmp_mod[PixLayer::COUNT];
TProfile2D_LW* m_ToT_etaphi_mod[PixLayer::COUNT];
TH2F_LW* m_nlowToT_vs_clussize_mod[PixLayer::COUNT];
TH1I_LW* m_Lvl1ID_PIX;
TH1I_LW* m_Lvl1ID_IBL;
TH1F_LW* m_Lvl1A;
TH1I_LW* m_BCID;
TH1F_LW* m_Atlas_BCID;
TH2F_LW* m_Atlas_BCID_hits;
TProfile_LW* m_BCID_Profile;
PixelMon2DLumiProfiles* m_Lvl1ID_diff_mod_ATLAS_per_LB;
PixelMon2DLumiProfiles* m_Lvl1ID_absdiff_mod_ATLAS_per_LB;
TH1F_LW* m_Lvl1A_mod[PixLayerDBM::COUNT];
TH1F_LW* m_Lvl1A_10min_mod[PixLayer::COUNT];
TH1I_LW* m_Lvl1ID_diff_mod_ATLAS_mod[PixLayer::COUNT];
TH1I_LW* m_diff_ROD_vs_Module_BCID_mod[PixLayer::COUNT];
TH2I_LW* m_diff_ROD_BCID;
PixelMon2DMaps* m_occupancy;
PixelMon2DMaps* m_occupancy_10min;
PixelMon2DMapsLW* m_average_pixocc;
PixelMon2DMaps* m_hitmap_mon;
PixelMon2DMaps* m_hitmap_tmp;
//TH2I_LW* m_diff_ROD_BCID;
PixelMonModules1D* m_FE_chip_hit_summary;
TH1F_LW* m_occupancy_summary_low_mod[PixLayer::COUNT];
TH1F_LW* m_occupancy_summary_mod[PixLayer::COUNT];
......@@ -347,8 +345,8 @@ class PixelMainMon:public ManagedMonitorToolBase
TH1F_LW* m_Details_mod3_ToT;
TH1F_LW* m_Details_mod4_ToT;
PixelMonModules2D* m_pixel_occupancy;
PixelMonModules2D* m_pixel_noise_map;
PixelMonModules1D* m_pixel_occupancy_spectrum;
//PixelMonModules2D* m_pixel_noise_map;
//PixelMonModules1D* m_pixel_occupancy_spectrum;
PixelMonModules1D* m_hit_num_mod;
//-----------------
......@@ -375,10 +373,10 @@ class PixelMainMon:public ManagedMonitorToolBase
//TH1F_LW* m_track_phi0;
//TH1F_LW* m_track_theta;
//TH1F_LW* m_track_eta;
TH1I_LW* m_tracks_per_lumi;
TH1F_LW* m_trackRate_per_lumi;
TProfile_LW* m_tracksPerEvt_per_lumi;
TProfile_LW* m_tracksPerEvtPerMu_per_lumi;
//TH1I_LW* m_tracks_per_lumi;
//TH1F_LW* m_trackRate_per_lumi;
//TProfile_LW* m_tracksPerEvt_per_lumi;
//TProfile_LW* m_tracksPerEvtPerMu_per_lumi;
//TH2F_LW* m_track_dedx;
//TH1F_LW* m_track_mass_dedx;
TH2F_LW* m_clustot_vs_pt;
......@@ -399,7 +397,10 @@ class PixelMainMon:public ManagedMonitorToolBase
TProfile2D_LW* m_degFactorMap_eta_per_lumi;
//TProfile2D_LW* m_degFactorMap_phi_per_lumi;
//cluster histograms
///
/// Cluster histograms
///
TH2F_LW* m_nlowToT_vs_clussize_mod[PixLayer::COUNT];
TProfile_LW* m_clusters_per_lumi;
TProfile_LW* m_clusters_per_lumi_mod[PixLayer::COUNT];
TProfile_LW* m_largeclusters_per_lumi;
......@@ -413,35 +414,34 @@ class PixelMainMon:public ManagedMonitorToolBase
TH1F_LW* m_3cluster_ToT_mod[PixLayer::COUNT];
TH1F_LW* m_bigcluster_ToT_mod[PixLayer::COUNT];
///////////////
TH1F_LW* m_cluster_Q_mod[PixLayerIBL2D3D::COUNT];
TH1F_LW* m_1cluster_Q_mod[PixLayer::COUNT];
TH1F_LW* m_2cluster_Q_mod[PixLayer::COUNT];
TH1F_LW* m_3cluster_Q_mod[PixLayer::COUNT];
TH1F_LW* m_bigcluster_Q_mod[PixLayer::COUNT];
PixelMonProfiles* m_clussize_map;
PixelMonProfiles* m_cluscharge_map;
PixelMonProfiles* m_clusToT_map;
PixelMonProfiles* m_clussize_map;
PixelMonProfiles* m_cluscharge_map;
PixelMonProfiles* m_clusToT_map;
TH1F_LW* m_cluster_groupsize;
TH1F_LW* m_cluster_col_width;
TH1F_LW* m_cluster_row_width;
TH1F_LW* m_cluster_row_width_IBL;
//TH1F_LW* m_cluster_row_width_IBL;
TH1F_LW* m_cluster_col_width_mod[PixLayer::COUNT];
TH1F_LW* m_cluster_row_width_mod[PixLayer::COUNT];
TH1F_LW* m_cluster_groupsize_mod[PixLayer::COUNT];
TH1F_LW* m_cluster_LVL1A;
TH1F_LW* m_cluster_LVL1A_highToT;
//TH1F_LW* m_cluster_LVL1A_highToT;
TH1F_LW* m_cluster_LVL1A1d_mod[PixLayer::COUNT];
TProfile_LW* m_clusterSize_eta;
TH2F_LW* m_clusToT_vs_eta_mod[PixLayer::COUNT];
TH2F_LW* m_clusQ_vs_eta_mod[PixLayer::COUNT];
//TH2F_LW* m_clusQ_vs_eta_mod[PixLayer::COUNT];
TH2F_LW* m_ToT_vs_clussize_mod[PixLayer::COUNT];
TH2F_LW* m_Q_vs_clussize_mod[PixLayer::COUNT];
//TH2F_LW* m_Q_vs_clussize_mod[PixLayer::COUNT];
TH2F_LW* m_clussize_vs_eta_mod[PixLayer::COUNT];
//TH2F_LW* m_clussize_vs_eta_mod[PixLayer::COUNT];
PixelMon2DMaps* m_cluster_occupancy;
DBMMon2DMaps * m_clusocc_DBM;
//DBMMon2DMaps * m_clusocc_DBM;
PixelMon2DMaps* m_clusocc_sizenot1;
PixelMonModulesProf* m_cluseff_mod;
PixelMonModules1D* m_cluster_ToT_mod;
......@@ -451,7 +451,7 @@ class PixelMainMon:public ManagedMonitorToolBase
TProfile* m_cluster_occupancy_time2;
TProfile* m_cluster_occupancy_time3;
TH1I_LW* m_num_clusters;
TH1I_LW* m_num_clusters_PIX;
//TH1I_LW* m_num_clusters_PIX;
TH1I_LW* m_num_clusters_low;
TH1I_LW* m_num_clusters_ECA;
TH1I_LW* m_num_clusters_ECC;
......@@ -481,7 +481,9 @@ class PixelMainMon:public ManagedMonitorToolBase
PixelMonProfiles* m_clus_LVL1A_sizenot1;
TProfile_LW* m_clustersOnOffTrack_per_lumi;
//Status histograms
///
///Status histograms
///
PixelMonModules1D* m_Status_modules;
PixelMonProfiles* m_status;
PixelMon2DMaps* m_dqStatus;
......@@ -490,12 +492,12 @@ class PixelMainMon:public ManagedMonitorToolBase
TProfile_LW* m_baddisabledModules_per_lumi_mod[PixLayerIBL2D3D::COUNT];
//ROD Error histograms
TH1F_LW* m_error1;
TH1F_LW* m_errorTypes;
//TH1F_LW* m_error1;
//TH1F_LW* m_errorTypes;
TProfile_LW* m_ErrorFraction_per_evt[ErrorCategory::COUNT][PixLayerIBL2D3D::COUNT];
TProfile_LW* m_errors_per_lumi_mod[PixLayerIBL2D3D::COUNT];
TProfile_LW* m_otherROD_per_lumi_IBL;
TProfile_LW* m_chip_per_lumi_IBL;
//TProfile_LW* m_otherROD_per_lumi_IBL;
//TProfile_LW* m_chip_per_lumi_IBL;
TProfile_LW* m_SyncErrors_per_lumi_mod[PixLayerIBL2D3D::COUNT];
TProfile_LW* m_OpticalErrors_per_lumi_mod[PixLayerIBL2D3D::COUNT];
TProfile_LW* m_SEU_Errors_per_lumi_mod[PixLayerIBL2D3D::COUNT];
......@@ -508,23 +510,23 @@ class PixelMainMon:public ManagedMonitorToolBase
PixelMon2DMapsLW* m_ErrorTypeMap[ErrorCategoryMODROD::COUNT];
PixelMon2DMapsLW* m_ErrorCategoryMap[ErrorCategory::COUNT];
PixelMon2DMapsLW* m_ErrorStateMap[16];
PixelMon2DLumiProfiles* m_ErrorStateMap_per_LB[16];
PixelMon2DMapsLW* m_OpticalErrors;
//PixelMon2DLumiProfiles* m_ErrorStateMap_per_LB[16];
//PixelMon2DMapsLW* m_OpticalErrors;
//PixelMon2DMapsLW* m_OpticalErrors_per_evt;
PixelMon2DMapsLW* m_SEU_Errors;
//PixelMon2DMapsLW* m_SEU_Errors;
//PixelMon2DMapsLW* m_SEU_Errors_per_evt;
PixelMon2DMapsLW* m_TimeoutErrors;
//PixelMon2DMapsLW* m_TimeoutErrors;
//PixelMon2DMapsLW* m_TimeoutErrors_per_evt;
TH2F_LW* m_SyncErrorsIBL;
//TH2F_LW* m_SyncErrorsIBL;
//PixelMon2DMapsLW* m_SyncErrors_per_evt;
PixelMon2DMapsLW* m_SyncErrors; //to be removed ?
PixelMon2DMapsLW* m_SyncCategory;
PixelMon2DMapsLW* m_TruncationCategory;
PixelMon2DMapsLW* m_OpticalCategory;
PixelMon2DMapsLW* m_SEUCategory;
PixelMon2DMapsLW* m_TimeoutCategory;
//PixelMon2DMapsLW* m_SyncErrors; //to be removed ?
//PixelMon2DMapsLW* m_SyncCategory;
//PixelMon2DMapsLW* m_TruncationCategory;
//PixelMon2DMapsLW* m_OpticalCategory;
//PixelMon2DMapsLW* m_SEUCategory;
//PixelMon2DMapsLW* m_TimeoutCategory;
//PixelMon2DMapsLW* m_TruncationErrors_per_evt;
PixelMon2DMapsLW* m_TruncationErrors; //to be removed ?
//PixelMon2DMapsLW* m_TruncationErrors; //to be removed ?
TProfile_LW* m_errorStates_per_lumi_mod[PixLayer::COUNT-1][16];
TProfile2D_LW* m_ErrorBit_per_lumi_mod[PixLayerIBL2D3D::COUNT];
......@@ -534,40 +536,40 @@ class PixelMainMon:public ManagedMonitorToolBase
PixelMon2DLumiMaps* m_errors_int_LB[16];
PixelMon2DLumiProfiles* m_sync_mod_BCID1_per_LB;
PixelMon2DLumiMaps* m_sync_mod_BCID1_int_LB;
PixelMon2DLumiProfiles* m_sync_mod_BCID2_per_LB;
PixelMon2DLumiMaps* m_sync_mod_BCID2_int_LB;
PixelMon2DLumiProfiles* m_sync_mod_LVL1ID_per_LB;
PixelMon2DLumiMaps* m_sync_mod_LVL1ID_int_LB;
PixelMon2DLumiProfiles* m_sync_rod_BCID_per_LB;
PixelMon2DLumiMaps* m_sync_rod_BCID_int_LB;
PixelMon2DLumiProfiles* m_sync_rod_LVL1ID_per_LB;
PixelMon2DLumiMaps* m_sync_rod_LVL1ID_int_LB;
PixelMon2DLumiProfiles* m_trunc_mod_EOC_per_LB;
PixelMon2DLumiMaps* m_trunc_mod_EOC_int_LB;
PixelMon2DLumiProfiles* m_trunc_mod_hitOF_per_LB;
PixelMon2DLumiMaps* m_trunc_mod_hitOF_int_LB;
PixelMon2DLumiProfiles* m_trunc_mod_EoEOF_per_LB;
PixelMon2DLumiMaps* m_trunc_mod_EoEOF_int_LB;
PixelMon2DLumiProfiles* m_trunc_rod_HTlim_per_LB;
PixelMon2DLumiMaps* m_trunc_rod_HTlim_int_LB;
PixelMon2DLumiProfiles* m_trunc_rod_FIFOOF_per_LB;
PixelMon2DLumiMaps* m_trunc_rod_FIFOOF_int_LB;
PixelMon2DLumiProfiles* m_optical_error_per_LB;
PixelMon2DLumiMaps* m_optical_error_int_LB;
PixelMon2DLumiProfiles* m_seu_hit_parity_per_LB;
PixelMon2DLumiMaps* m_seu_hit_parity_int_LB;
PixelMon2DLumiProfiles* m_seu_reg_parity_per_LB;
PixelMon2DLumiMaps* m_seu_reg_parity_int_LB;
PixelMon2DLumiProfiles* m_seu_hamming_per_LB;
PixelMon2DLumiMaps* m_seu_hamming_int_LB;
PixelMon2DLumiProfiles* m_timeout_per_LB;
PixelMon2DLumiMaps* m_timeout_int_LB;
PixelMon2DLumiProfiles* m_FEwarning_per_LB;
PixelMon2DLumiMaps* m_FEwarning_int_LB;
PixelMon2DLumiProfiles* m_sync_mod_corr_LVL1ID_BCID2_per_LB;
PixelMon2DLumiProfiles* m_sync_rod_corr_LVL1ID_BCID_per_LB;
//PixelMon2DLumiProfiles* m_sync_mod_BCID1_per_LB;
//PixelMon2DLumiMaps* m_sync_mod_BCID1_int_LB;
//PixelMon2DLumiProfiles* m_sync_mod_BCID2_per_LB;
//PixelMon2DLumiMaps* m_sync_mod_BCID2_int_LB;
//PixelMon2DLumiProfiles* m_sync_mod_LVL1ID_per_LB;
//PixelMon2DLumiMaps* m_sync_mod_LVL1ID_int_LB;
//PixelMon2DLumiProfiles* m_sync_rod_BCID_per_LB;
//PixelMon2DLumiMaps* m_sync_rod_BCID_int_LB;
//PixelMon2DLumiProfiles* m_sync_rod_LVL1ID_per_LB;
//PixelMon2DLumiMaps* m_sync_rod_LVL1ID_int_LB;
//PixelMon2DLumiProfiles* m_trunc_mod_EOC_per_LB;
//PixelMon2DLumiMaps* m_trunc_mod_EOC_int_LB;
//PixelMon2DLumiProfiles* m_trunc_mod_hitOF_per_LB;
//PixelMon2DLumiMaps* m_trunc_mod_hitOF_int_LB;
//PixelMon2DLumiProfiles* m_trunc_mod_EoEOF_per_LB;
//PixelMon2DLumiMaps* m_trunc_mod_EoEOF_int_LB;
//PixelMon2DLumiProfiles* m_trunc_rod_HTlim_per_LB;
//PixelMon2DLumiMaps* m_trunc_rod_HTlim_int_LB;
//PixelMon2DLumiProfiles* m_trunc_rod_FIFOOF_per_LB;
//PixelMon2DLumiMaps* m_trunc_rod_FIFOOF_int_LB;
//PixelMon2DLumiProfiles* m_optical_error_per_LB;
//PixelMon2DLumiMaps* m_optical_error_int_LB;
//PixelMon2DLumiProfiles* m_seu_hit_parity_per_LB;
//PixelMon2DLumiMaps* m_seu_hit_parity_int_LB;
//PixelMon2DLumiProfiles* m_seu_reg_parity_per_LB;
//PixelMon2DLumiMaps* m_seu_reg_parity_int_LB;
//PixelMon2DLumiProfiles* m_seu_hamming_per_LB;
//PixelMon2DLumiMaps* m_seu_hamming_int_LB;
//PixelMon2DLumiProfiles* m_timeout_per_LB;
//PixelMon2DLumiMaps* m_timeout_int_LB;
//PixelMon2DLumiProfiles* m_FEwarning_per_LB;
//PixelMon2DLumiMaps* m_FEwarning_int_LB;
//PixelMon2DLumiProfiles* m_sync_mod_corr_LVL1ID_BCID2_per_LB;
//PixelMon2DLumiProfiles* m_sync_rod_corr_LVL1ID_BCID_per_LB;
//SP Histograms
TH1I_LW* m_num_spacepoints;
......@@ -582,7 +584,7 @@ class PixelMainMon:public ManagedMonitorToolBase
//Histograms stored for certain number of LB at a time
PixelMon2DMaps* m_cluster_occupancy_LB; //cluster occupancy (shows module status)
PixelMon2DMapsLW* m_errors_LB; //errors
PixelMon2DMapsLW* m_errors_LB; //errors
PixelMonProfiles* m_status_LB; //status of modules (shows disabled modules)
PixelMonModules1D* m_cluster_ToT_mod_LB;
PixelMonModules1D* m_cluster_num_mod_LB;
......
......@@ -202,11 +202,11 @@ StatusCode PixelMainMon::BookClustersMon(void)
if(m_doESD && !m_doOnline){
hname = makeHistname(("ClusterQ_vs_eta_"+modlabel[i]), false);
htitles = makeHisttitle(("Cluster charge vs eta, "+modlabel[i]), (atext_eta+atext_Q), false);
sc = clusterExpert.regHist(m_clusQ_vs_eta_mod[i] = TH2F_LW::create(hname.c_str(), htitles.c_str(), nbins_eta, min_eta, max_eta, nbins_Q, min_Q, max_Q));
//sc = clusterExpert.regHist(m_clusQ_vs_eta_mod[i] = TH2F_LW::create(hname.c_str(), htitles.c_str(), nbins_eta, min_eta, max_eta, nbins_Q, min_Q, max_Q));
hname = makeHistname(("Cluster_groupsize_vs_eta_"+modlabel[i]), false);
htitles = makeHisttitle(("Number of pixels per cluster vs eta, "+modlabel[i]), (atext_eta+atext_npix), false);
sc = clusterExpert.regHist(m_clussize_vs_eta_mod[i] = TH2F_LW::create(hname.c_str(), htitles.c_str(), nbins_eta, min_eta, max_eta, nbins_npix, min_npix, max_npix));
//sc = clusterExpert.regHist(m_clussize_vs_eta_mod[i] = TH2F_LW::create(hname.c_str(), htitles.c_str(), nbins_eta, min_eta, max_eta, nbins_npix, min_npix, max_npix));
hname = makeHistname(("ClusterToT_vs_eta_"+modlabel[i]), false);
htitles = makeHisttitle(("Cluster ToT vs eta, "+modlabel[i]), (atext_eta+atext_tot), false);
......@@ -218,7 +218,7 @@ StatusCode PixelMainMon::BookClustersMon(void)
hname = makeHistname(("ClusterQ_vs_groupsize_"+modlabel[i]), false);
htitles = makeHisttitle(("Cluster Charge vs groupsize, "+modlabel[i]), (atext_tot+atext_npix), false);
sc= clusterExpert.regHist(m_Q_vs_clussize_mod[i] = TH2F_LW::create(hname.c_str(), htitles.c_str(), nbins_Q, min_Q, max_Q, nbins_npix, min_npix, max_npix));
//sc= clusterExpert.regHist(m_Q_vs_clussize_mod[i] = TH2F_LW::create(hname.c_str(), htitles.c_str(), nbins_Q, min_Q, max_Q, nbins_npix, min_npix, max_npix));
hname = makeHistname(("nlowToT_vs_clussize_"+modlabel[i]), false);
htitles = makeHisttitle(("# Low ToT Hits vs groupsize, "+modlabel[i]), (atext_npix+atext_nevt), false);
......@@ -347,8 +347,8 @@ StatusCode PixelMainMon::BookClustersMon(void)
sc = clusterExpert.regHist(m_bar_lay2_cluster_occupancy_summary_low = TH1F_LW::create((tmp + "_B2").c_str(), (tmp2 + ", B2" + m_histTitleExt + ";average # of clusters per module per event;# modules").c_str(), 50,0.,2.));
}
if(m_doPixelOccupancy){ }
if(m_doDetails){ }
//if(m_doPixelOccupancy){ }
//if(m_doDetails){ }
if(sc.isFailure())if(msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "histograms not booked" << endreq;
return StatusCode::SUCCESS;
......@@ -520,7 +520,7 @@ StatusCode PixelMainMon::FillClustersMon(void)
/// Fill Occupancy
if(m_cluster_occupancy) m_cluster_occupancy->Fill(clusID,m_pixelid,m_doIBL);
if(m_clusocc_DBM && m_doIBL) m_clusocc_DBM->Fill(clusID,m_pixelid);
//if(m_clusocc_DBM && m_doIBL) m_clusocc_DBM->Fill(clusID,m_pixelid);
//if(m_average_cluster_occupancy) m_average_cluster_occupancy->Fill(clusID,m_pixelid,m_doIBL);
if(cluster.rdoList().size()>1 && m_clusocc_sizenot1) m_clusocc_sizenot1->Fill(clusID,m_pixelid,m_doIBL);
......
......@@ -367,6 +367,7 @@ StatusCode PixelMainMon::FillRODErrorMon(void)
bool isIBL=false;
//bool isError[16] = {false};
bool hasError[ErrorCategory::COUNT] = {false};
bool hasErrorMODROD[ErrorCategoryMODROD::COUNT] = {false};
if (m_ErrorSvc->isActive(id_hash) && m_pixelid->barrel_ec(WaferID)==0 && m_pixelid->layer_disk(WaferID)==0 && m_doIBL){isIBL=true;}
......@@ -444,8 +445,11 @@ StatusCode PixelMainMon::FillRODErrorMon(void)
}
/// Count the each error
nErrorTypes_mod[pixlayer][ErrorType-1]++;
if(pixlayeribl2d3d != 0) nErrorTypes_mod[pixlayeribl2d3d][ErrorType-1]++;
if( !hasErrorMODROD[ErrorType-1] ){
nErrorTypes_mod[pixlayer][ErrorType-1]++;
if(pixlayeribl2d3d != 0) nErrorTypes_mod[pixlayeribl2d3d][ErrorType-1]++;
hasErrorMODROD[ErrorType-1] = true;
}
if( !hasError[kErrorCategory] ){
if(m_ErrorCategoryMap[kErrorCategory] && !m_doOnline) m_ErrorCategoryMap[kErrorCategory]->Fill(WaferID,m_pixelid,m_doIBL, false);
nErrorsCategory_permod[pixlayer][kErrorCategory]++;
......
......@@ -226,6 +226,12 @@ StatusCode PixelMainMon::BookHitsMon(void)
m_hiteff_mod = new PixelMonModulesProf("Hit_track_eff", ("Proportion of hits on track" + m_histTitleExt).c_str(), 2500,-0.5,2499.5,m_doIBL);
sc = m_hiteff_mod->regHist(this,(path+"/Modules_HitEff").c_str(),run, m_doIBL);
}
if(!m_doOnline && m_doOnTrack){
//m_hiteff_mod = new PixelMonModulesProf("HitEff_incl", ("Proportion of hits on track" + m_histTitleExt).c_str(), 2500,-0.5,2499.5,m_doIBL);
//sc = m_hiteff_mod->regHist(this,(path+"/Modules_HitEff").c_str(),run, m_doIBL);
//m_hiteff_goodmod = new PixelMonModulesProf("HitEff_active", ("Proportion of hits on track for active modules" + m_histTitleExt).c_str(), 2500,-0.5,2499.5,m_doIBL);
//sc = m_hiteff_mod->regHist(this,(path+"/Modules_HitEff").c_str(),run, m_doIBL);
}
if(m_doModules || m_doFEChipSummary)
{
m_FE_chip_hit_summary = new PixelMonModules1D("FE_Chip_Summary", ("FE Chip Summary" + m_histTitleExt).c_str(), 16,-0.5,15.5,m_doIBL);
......@@ -404,9 +410,9 @@ StatusCode PixelMainMon::FillHitsMon(void) //Called once per event
//Current bcid
const unsigned int pix_bcid = (*ipix_bcid)->second;
if ( ipix_bcid > Pixel_BCIDColl->begin() && m_diff_ROD_BCID){
m_diff_ROD_BCID->Fill(n_pix_bcid_nrobs-1,prev_pix_bcid-pix_bcid);
}
///if ( ipix_bcid > Pixel_BCIDColl->begin() && m_diff_ROD_BCID){
/// m_diff_ROD_BCID->Fill(n_pix_bcid_nrobs-1,prev_pix_bcid-pix_bcid);
///}
prev_pix_bcid = pix_bcid;
n_pix_bcid_nrobs++;
} // End for loop
......@@ -801,8 +807,8 @@ StatusCode PixelMainMon::ProcHitsMon(void)
msg(MSG::WARNING) << "Please be patient, it will take a while to fill these histograms" << endreq;
}
if(m_pixel_noise_map) m_pixel_noise_map->Reset();
if(m_pixel_occupancy_spectrum) m_pixel_occupancy_spectrum->Reset();
//if(m_pixel_noise_map) m_pixel_noise_map->Reset();
//if(m_pixel_occupancy_spectrum) m_pixel_occupancy_spectrum->Reset();
PixelID::const_id_iterator idIt = m_pixelid->wafer_begin();
PixelID::const_id_iterator idItEnd = m_pixelid->wafer_end();
......@@ -825,8 +831,8 @@ StatusCode PixelMainMon::ProcHitsMon(void)
}
occ_spec = occ_spec/events;
if(m_pixel_noise_map) m_pixel_noise_map->Fill(etaIndex,phiIndex,WaferID, m_pixelid,occ_spec,m_doIBL); //fill the right pixel, give it pointers to the right module, and a weight of 'occ_spec'
if(m_pixel_occupancy_spectrum) m_pixel_occupancy_spectrum->Fill(occ_spec, WaferID, m_pixelid, m_doIBL); //fill the pixel occupancy and give a pointer to the right module. Will fill 80M times total in this loop...
//if(m_pixel_noise_map) m_pixel_noise_map->Fill(etaIndex,phiIndex,WaferID, m_pixelid,occ_spec,m_doIBL); //fill the right pixel, give it pointers to the right module, and a weight of 'occ_spec'
//if(m_pixel_occupancy_spectrum) m_pixel_occupancy_spectrum->Fill(occ_spec, WaferID, m_pixelid, m_doIBL); //fill the pixel occupancy and give a pointer to the right module. Will fill 80M times total in this loop...
}
}
}
......
......@@ -103,8 +103,8 @@ PixelMainMon::PixelMainMon(const std::string & type,
declareProperty("PixelConditionsSummarySvc", m_pixelCondSummarySvc);
declareProperty("PixelByteStreamErrorsSvc", m_ErrorSvc);
declareProperty("PixelCablingSvc", m_pixelCableSvc);
declareProperty("HoleSearchTool", m_holeSearchTool);
declareProperty("LuminosityTool", m_lumiTool);
declareProperty("HoleSearchTool", m_holeSearchTool);
declareProperty("LuminosityTool", m_lumiTool);
//declareProperty("TrkSummaryTool", m_trkSummaryTool);
......@@ -178,7 +178,7 @@ PixelMainMon::PixelMainMon(const std::string & type,
m_Atlas_BCID = 0;
m_Atlas_BCID_hits = 0;
m_BCID_Profile = 0;
m_diff_ROD_BCID = 0;
///m_diff_ROD_BCID = 0;
m_occupancy = 0;
m_occupancy_10min = 0;
m_average_pixocc = 0;
......@@ -205,8 +205,8 @@ PixelMainMon::PixelMainMon(const std::string & type,
m_Details_mod3_ToT = 0;
m_Details_mod4_ToT = 0;
m_pixel_occupancy = 0;
m_pixel_noise_map = 0;
m_pixel_occupancy_spectrum = 0;
//m_pixel_noise_map = 0;
//m_pixel_occupancy_spectrum = 0;
m_hit_num_mod = 0;
//-------------------
......@@ -237,10 +237,10 @@ PixelMainMon::PixelMainMon(const std::string & type,
//m_track_phi0 = 0;
//m_track_theta = 0;
//m_track_eta = 0;
m_tracks_per_lumi = 0;
m_trackRate_per_lumi = 0;
m_tracksPerEvt_per_lumi = 0;
m_tracksPerEvtPerMu_per_lumi = 0;
//m_tracks_per_lumi = 0;
//m_trackRate_per_lumi = 0;
//m_tracksPerEvt_per_lumi = 0;
//m_tracksPerEvtPerMu_per_lumi = 0;
//m_track_dedx = 0;
//m_track_mass_dedx = 0;
m_clustot_vs_pt = 0;
......@@ -265,13 +265,13 @@ PixelMainMon::PixelMainMon(const std::string & type,
m_cluster_groupsize = 0;
m_cluster_col_width = 0;
m_cluster_row_width = 0;
m_cluster_row_width_IBL = 0;
//m_cluster_row_width_IBL = 0;
m_cluster_LVL1A = 0;
m_clus_LVL1A_sizenot1 = 0;
m_cluster_LVL1A_highToT = 0;
//m_cluster_LVL1A_highToT = 0;
m_clusterSize_eta = 0;
m_cluster_occupancy = 0;
m_clusocc_DBM = 0;
//m_clusocc_DBM = 0;
m_clusocc_sizenot1 = 0;
m_cluseff_mod = 0;
m_cluster_ToT_mod = 0;
......@@ -281,7 +281,7 @@ PixelMainMon::PixelMainMon(const std::string & type,
m_cluster_occupancy_time2 = 0;
m_cluster_occupancy_time3 = 0;
m_num_clusters = 0;
m_num_clusters_PIX = 0;
//m_num_clusters_PIX = 0;
m_num_clusters_low = 0;
m_num_clusters_ECA = 0;
m_num_clusters_ECC = 0;
......@@ -306,59 +306,59 @@ PixelMainMon::PixelMainMon(const std::string & type,
m_Status_modules = 0;
m_status = 0;
m_dqStatus = 0;
m_error1 = 0;
m_errorTypes = 0;
m_otherROD_per_lumi_IBL = 0;
m_chip_per_lumi_IBL = 0;
//m_error1 = 0;
//m_errorTypes = 0;
//m_otherROD_per_lumi_IBL = 0;
//m_chip_per_lumi_IBL = 0;
m_error_time1 = 0;
m_error_time2 = 0;
m_error_time3 = 0;
m_errors = 0;
m_OpticalErrors = 0;
m_SEU_Errors = 0;
m_TimeoutErrors = 0;
m_SyncErrorsIBL = 0;
m_SyncErrors = 0;
m_SyncCategory = 0;
m_TruncationCategory = 0;
m_OpticalCategory = 0;
m_SEUCategory = 0;
m_TimeoutCategory = 0;
m_TruncationErrors = 0;
m_sync_mod_BCID1_per_LB = 0;
m_sync_mod_BCID1_int_LB = 0;
m_sync_mod_BCID2_per_LB = 0;
m_sync_mod_BCID2_int_LB = 0;
m_sync_mod_LVL1ID_per_LB = 0;
m_sync_mod_LVL1ID_int_LB = 0;
m_sync_rod_BCID_per_LB = 0;
m_sync_rod_BCID_int_LB = 0;
m_sync_rod_LVL1ID_per_LB = 0;
m_sync_rod_LVL1ID_int_LB = 0;
m_trunc_mod_EOC_per_LB = 0;
m_trunc_mod_EOC_int_LB = 0;
m_trunc_mod_hitOF_per_LB = 0;
m_trunc_mod_hitOF_int_LB = 0;
m_trunc_mod_EoEOF_per_LB = 0;
m_trunc_mod_EoEOF_int_LB = 0;
m_trunc_rod_HTlim_per_LB = 0;
m_trunc_rod_HTlim_int_LB = 0;
m_trunc_rod_FIFOOF_per_LB = 0;
m_trunc_rod_FIFOOF_int_LB = 0;
m_optical_error_per_LB = 0;
m_optical_error_int_LB = 0;
m_seu_hit_parity_per_LB = 0;
m_seu_hit_parity_int_LB = 0;
m_seu_reg_parity_per_LB = 0;
m_seu_reg_parity_int_LB = 0;
m_seu_hamming_per_LB = 0;
m_seu_hamming_int_LB = 0;
m_timeout_per_LB = 0;
m_timeout_int_LB = 0;
m_FEwarning_per_LB = 0;
m_FEwarning_int_LB = 0;
m_sync_mod_corr_LVL1ID_BCID2_per_LB = 0;
m_sync_rod_corr_LVL1ID_BCID_per_LB = 0;
//m_OpticalErrors = 0;
//m_SEU_Errors = 0;
//m_TimeoutErrors = 0;
//m_SyncErrorsIBL = 0;
//m_SyncErrors = 0;
//m_SyncCategory = 0;
//m_TruncationCategory = 0;
//m_OpticalCategory = 0;
//m_SEUCategory = 0;
//m_TimeoutCategory = 0;
//m_TruncationErrors = 0;
//m_sync_mod_BCID1_per_LB = 0;
//m_sync_mod_BCID1_int_LB = 0;
//m_sync_mod_BCID2_per_LB = 0;
//m_sync_mod_BCID2_int_LB = 0;
//m_sync_mod_LVL1ID_per_LB = 0;
//m_sync_mod_LVL1ID_int_LB = 0;
//m_sync_rod_BCID_per_LB = 0;
//m_sync_rod_BCID_int_LB = 0;
//m_sync_rod_LVL1ID_per_LB = 0;
//m_sync_rod_LVL1ID_int_LB = 0;
//m_trunc_mod_EOC_per_LB = 0;
//m_trunc_mod_EOC_int_LB = 0;
//m_trunc_mod_hitOF_per_LB = 0;
//m_trunc_mod_hitOF_int_LB = 0;
//m_trunc_mod_EoEOF_per_LB = 0;
//m_trunc_mod_EoEOF_int_LB = 0;
//m_trunc_rod_HTlim_per_LB = 0;
//m_trunc_rod_HTlim_int_LB = 0;
//m_trunc_rod_FIFOOF_per_LB = 0;
//m_trunc_rod_FIFOOF_int_LB = 0;
//m_optical_error_per_LB = 0;
//m_optical_error_int_LB = 0;