From 8dc98014b28c5d4aba643410245b81a08bfe0016 Mon Sep 17 00:00:00 2001 From: Hass AbouZeid <hass.abouzeid@cern.ch> Date: Fri, 9 Jun 2017 07:46:33 +0000 Subject: [PATCH] Merge branch '21.0-pixmon-bugfix-postprocess' into '21.0' fix postprocessing normalization See merge request !2582 Former-commit-id: 99a7e6280b1a2cb39e85eba3ba4f61202c49bdb7 --- .../DataQualityUtils/src/MonitoringFile_PixelPostProcess.cxx | 2 +- .../InDetRecExample/share/InDetMonitoringPixel.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/DataQuality/DataQualityUtils/src/MonitoringFile_PixelPostProcess.cxx b/DataQuality/DataQualityUtils/src/MonitoringFile_PixelPostProcess.cxx index fb0c5103a3f..ea75b93dc9c 100644 --- a/DataQuality/DataQualityUtils/src/MonitoringFile_PixelPostProcess.cxx +++ b/DataQuality/DataQualityUtils/src/MonitoringFile_PixelPostProcess.cxx @@ -107,7 +107,7 @@ namespace dqutils { } const static int nlayer = 8; - float nevents = h_norm->Integral(); + float nevents = h_norm->Integral(0,h_norm->GetNbinsX()+1); TString layerName[nlayer] = {"IBL", "B0", "B1", "B2", "ECA", "ECC", "IBL2D", "IBL3D"}; float npixel[nlayer] = {26880, 46080, 46080, 46080, 46080, 46080, 26880, 26880}; float nmodule[nlayer] = {280., 286., 494., 676., 144., 144., 168., 112.}; diff --git a/InnerDetector/InDetExample/InDetRecExample/share/InDetMonitoringPixel.py b/InnerDetector/InDetExample/InDetRecExample/share/InDetMonitoringPixel.py index 24142a6c028..67206c47adb 100644 --- a/InnerDetector/InDetExample/InDetRecExample/share/InDetMonitoringPixel.py +++ b/InnerDetector/InDetExample/InDetRecExample/share/InDetMonitoringPixel.py @@ -30,7 +30,7 @@ if doAllHits: do2DMaps = True, #Turn on/off the sets of 2D module maps doModules = doAllHitsModules, #Turn on/off the sets of 1744 module histograms (for dqmf) doFEChipSummary = False, #Turn on/off the 1744 module FE chip summary histograms (low memory version of doModules) - doLowOccupancy = True, #Turn on/off histograms with binning for cosmics/single beam + doLowOccupancy = False, #Turn on/off histograms with binning for cosmics/single beam doHighOccupancy = True, #Turn on/off histograms with binning for collisions doRodSim = False, #Turn on/off histograms specific for the rod simulator doDetails = False, #Turn on/off the set of histograms with detailed info for 4 modules @@ -85,7 +85,7 @@ if doHitsOnTrack: do2DMaps = True , #Turn on/off the sets of 2D module maps doModules = False, #Turn on/off the sets of 1744 module histograms (for dqmf) doFEChipSummary = False, #Turn on/off the 1744 module FE chip summary histograms (low memory version of doModules) - doLowOccupancy = True, #Turn on/off histograms with binning for cosmics/single beam + doLowOccupancy = False, #Turn on/off histograms with binning for cosmics/single beam doHighOccupancy = True, #Turn on/off histograms with binning for collisions doRodSim = False, #Turn on/off histograms specific for the rod simulator doDetails = False, #Turn on/off the set of histograms with detailed info for 4 modules -- GitLab