diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/python/PixelAthClusterMonAlgCfg.py b/InnerDetector/InDetMonitoring/PixelMonitoring/python/PixelAthClusterMonAlgCfg.py index 6011099b331be0d94ba619b0b12e0d6fc774cbac..590e16d82ac8f22851140248fa132cdabe1cba33 100644 --- a/InnerDetector/InDetMonitoring/PixelMonitoring/python/PixelAthClusterMonAlgCfg.py +++ b/InnerDetector/InDetMonitoring/PixelMonitoring/python/PixelAthClusterMonAlgCfg.py @@ -243,7 +243,20 @@ def PixelAthClusterMonAlgCfg(helper, alg, **kwargs): ### pathGroup = addOnTrackToPath(path, ontrack) - varName = 'pixclusmontool_lb,ncls_per_event' + varName = addOnTrackTxt('ClustersPerEvent', ontrack) + '_val' + title = fullDressTitle('Number of pixel clusters in an event', ontrack, ';# pixel clusters', ';# events') + varName += ';'+ addOnTrackTxt('ClustersPerEvent', ontrack) + xmax1D = 10000 if ontrack else 40000 + clusterGroup[ontrack].defineHistogram(varName, + type='TH1I', path=pathGroup, title=title, + xbins=1000, xmin=0, xmax=xmax1D) + + histoGroupName = addOnTrackTxt('ClustersPerEvent', ontrack) + title = addOnTrackTxt('Number of pixel clusters in an event', ontrack, True) + binsizes1D = 10 if ontrack else 40 + define1DLayers(helper, alg, histoGroupName, title, pathGroup, ';# pixel clusters', ';# events', xbins=[200], xmins=[0], binsizes=[binsizes1D]) + + varName = 'pixclusmontool_lb,' + addOnTrackTxt('ClustersPerEvent', ontrack) + '_val' title = fullDressTitle('Average number of pixel clusters per event per LB', ontrack, ';lumi block', ';# clusters/event') varName += ';'+ addOnTrackTxt('ClustersPerLumi', ontrack) clusterGroup[ontrack].defineHistogram(varName, diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/python/PixelAthHitMonAlgCfg.py b/InnerDetector/InDetMonitoring/PixelMonitoring/python/PixelAthHitMonAlgCfg.py index c7f9d749e477bb33a5058c3457006c8a9dbbc4b6..0392131572536540e75dc5fcddb91fbcc6c5ec8d 100644 --- a/InnerDetector/InDetMonitoring/PixelMonitoring/python/PixelAthHitMonAlgCfg.py +++ b/InnerDetector/InDetMonitoring/PixelMonitoring/python/PixelAthHitMonAlgCfg.py @@ -37,13 +37,19 @@ def PixelAthHitMonAlgCfg(helper, alg, **kwargs): hitGroup = helper.addGroup(alg, 'Hit') varName = 'hitdataread_err;ReadingHitDataErr' - title = 'Number of Hit data reading errors;error type;# events' + title = 'Number of Hit data reading errors;error type;# events' hitGroup.defineHistogram(varName, type='TH1I', path=pathGroup, title=title, xbins=len(ReadingDataErrLabels), xmin=-0.5, xmax=-0.5+len(ReadingDataErrLabels), xlabels=ReadingDataErrLabels) - varName = 'pixhitsmontool_lb,nhits_per_event' - title = fullDressTitle('Average number of pixel hits per event per LB', ontrack, ';lumi block', ';# hits/event') + varName = 'pixhitsmontool_lb;EventsPerLumi' + title = 'nEvents per LB;lumi block;# events' + hitGroup.defineHistogram(varName, + type='TH1I', path=pathGroup, title=title, + xbins=lumibinsx, xmin=-0.5, xmax=-0.5+lumibinsx) + + varName = 'pixhitsmontool_lb,nhits_per_event' + title = fullDressTitle('Average number of pixel hits per event per LB', ontrack, ';lumi block', ';# hits/event') varName += ';'+ addOnTrackTxt('HitsPerLumi', ontrack) hitGroup.defineHistogram(varName, type='TProfile', path=pathGroup, title=title, diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthClusterMonAlg.cxx b/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthClusterMonAlg.cxx index a5f748130ad4ae73bd1a2f580702a17fce98546f..ce35aa868ad19d17d6eabd96393695472eba0e1b 100644 --- a/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthClusterMonAlg.cxx +++ b/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthClusterMonAlg.cxx @@ -521,10 +521,15 @@ StatusCode PixelAthClusterMonAlg::fillHistograms( const EventContext& ctx ) cons } // begin cluster rates // - auto nCls = Monitored::Scalar<int>( "ncls_per_event", nclusters ); + auto nCls = Monitored::Scalar<int>( "ClustersPerEvent_val", nclusters ); fill( clusterGroup, lbval, nCls); - nCls = nclusters_ontrack; - fill( clusterGroup_OnTrack, lbval, nCls); + auto nClsOnTrk = Monitored::Scalar<int>( "ClustersPerEventOnTrack_val", nclusters_ontrack ); + fill( clusterGroup_OnTrack, lbval, nClsOnTrk); + for (unsigned int ii=0; ii<PixLayers::COUNT; ii++) { + auto vals = Monitored::Scalar<float>( "ClustersPerEvent_val", nclusters_mod[ii] ); + auto vals_ontrack = Monitored::Scalar<float>( "ClustersPerEventOnTrack_val", nclusters_ontrack_mod[ii] ); + fill( pixLayersLabel[ii], vals, vals_ontrack); + } if (nclusters>0) { auto clsFracOnTrack = Monitored::Scalar<float>( "cls_frac_ontrack", (float)nclusters_ontrack / nclusters );