Skip to content

Commit fa59b90

Browse files
jjurackajjuracka
committed
unify histo binning
1 parent ce9f89e commit fa59b90

File tree

6 files changed

+113
-3
lines changed

6 files changed

+113
-3
lines changed

‎Modules/MFT/include/MFT/QcMFTClusterTask.h‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
/// \author Katarina Krizkova Gajdosova
1717
/// \author Diana Maria Krupova
1818
/// \author David Grund
19+
/// \author Jakub Juracka
1920
///
2021

2122
#ifndef QC_MFT_CLUSTER_TASK_H
@@ -27,6 +28,7 @@
2728
#include "ReconstructionDataFormats/BaseCluster.h"
2829
#include "MFTBase/GeometryTGeo.h"
2930
#include <CommonConstants/LHCConstants.h>
31+
#include <vector>
3032

3133
// Quality Control
3234
#include "QualityControl/TaskInterface.h"
@@ -104,6 +106,39 @@ class QcMFTClusterTask /*final*/ : public TaskInterface // todo add back the "fi
104106
// cluster size in pixels
105107
int mClusterSize = { 0 };
106108

109+
std::vector<float> mROFBins = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10,
110+
11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
111+
21, 22, 23, 24, 25, 26, 27, 28, 29, 30,
112+
31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
113+
41, 42, 43, 44, 45, 46, 47, 48, 49, 50,
114+
51, 52, 53, 54, 55, 56, 57, 58, 59, 60,
115+
61, 62, 63, 64, 65, 66, 67, 68, 69, 70,
116+
71, 72, 73, 74, 75, 76, 77, 78, 79, 80,
117+
81, 82, 83, 84, 85, 86, 87, 88, 89, 90,
118+
91, 92, 93, 94, 95, 96, 97, 98, 99, 100,
119+
110, 120, 130, 140, 150, 160, 170, 180, 190, 200,
120+
210, 220, 230, 240, 250, 260, 270, 280, 290, 300,
121+
310, 320, 330, 340, 350, 360, 370, 380, 390, 400,
122+
410, 420, 430, 440, 450, 460, 470, 480, 490, 500,
123+
510, 520, 530, 540, 550, 560, 570, 580, 590, 600,
124+
610, 620, 630, 640, 650, 660, 670, 680, 690, 700,
125+
710, 720, 730, 740, 750, 760, 770, 780, 790, 800,
126+
810, 820, 830, 840, 850, 860, 870, 880, 890, 900,
127+
910, 920, 930, 940, 950, 960, 970, 980, 990, 1000,
128+
1100, 1200, 1300, 1400, 1500, 1600, 1700, 1800, 1900, 2000,
129+
2100, 2200, 2300, 2400, 2500, 2600, 2700, 2800, 2900, 3000,
130+
3100, 3200, 3300, 3400, 3500, 3600, 3700, 3800, 3900, 4000,
131+
4100, 4200, 4300, 4400, 4500, 4600, 4700, 4800, 4900, 5000,
132+
5100, 5200, 5300, 5400, 5500, 5600, 5700, 5800, 5900, 6000,
133+
6100, 6200, 6300, 6400, 6500, 6600, 6700, 6800, 6900, 7000,
134+
7100, 7200, 7300, 7400, 7500, 7600, 7700, 7800, 7900, 8000,
135+
8100, 8200, 8300, 8400, 8500, 8600, 8700, 8800, 8900, 9000,
136+
9100, 9200, 9300, 9400, 9500, 9600, 9700, 9800, 9900, 10000,
137+
11000, 12000, 13000, 14000, 15000, 16000, 17000, 18000, 19000, 20000,
138+
21000, 22000, 23000, 24000, 25000, 26000, 27000, 28000, 29000, 30000,
139+
31000, 32000, 33000, 34000, 35000, 36000, 37000, 38000, 39000, 40000,
140+
41000, 42000, 43000, 44000, 45000, 46000, 47000, 48000, 49000, 50000};
141+
107142
// dictionary
108143
const o2::itsmft::TopologyDictionary* mDict = nullptr;
109144

‎Modules/MFT/include/MFT/QcMFTDigitTask.h‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
/// \author Katarina Krizkova Gajdosova
1717
/// \author Diana Maria Krupova
1818
/// \author David Grund
19+
/// \author Jakub Juracka
1920
///
2021

2122
#ifndef QC_MFT_DIGIT_TASK_H
@@ -25,6 +26,8 @@
2526
#include <TCanvas.h>
2627
#include <TH1.h>
2728
#include <TH2.h>
29+
// C++
30+
#include <vector>
2831
// O2
2932
#include <ITSMFTReconstruction/ChipMappingMFT.h>
3033
#include <CommonConstants/LHCConstants.h>
@@ -93,6 +96,39 @@ class QcMFTDigitTask final : public TaskInterface
9396
float mX[936] = { 0 };
9497
float mY[936] = { 0 };
9598

99+
std::vector<float> mROFBins = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10,
100+
11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
101+
21, 22, 23, 24, 25, 26, 27, 28, 29, 30,
102+
31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
103+
41, 42, 43, 44, 45, 46, 47, 48, 49, 50,
104+
51, 52, 53, 54, 55, 56, 57, 58, 59, 60,
105+
61, 62, 63, 64, 65, 66, 67, 68, 69, 70,
106+
71, 72, 73, 74, 75, 76, 77, 78, 79, 80,
107+
81, 82, 83, 84, 85, 86, 87, 88, 89, 90,
108+
91, 92, 93, 94, 95, 96, 97, 98, 99, 100,
109+
110, 120, 130, 140, 150, 160, 170, 180, 190, 200,
110+
210, 220, 230, 240, 250, 260, 270, 280, 290, 300,
111+
310, 320, 330, 340, 350, 360, 370, 380, 390, 400,
112+
410, 420, 430, 440, 450, 460, 470, 480, 490, 500,
113+
510, 520, 530, 540, 550, 560, 570, 580, 590, 600,
114+
610, 620, 630, 640, 650, 660, 670, 680, 690, 700,
115+
710, 720, 730, 740, 750, 760, 770, 780, 790, 800,
116+
810, 820, 830, 840, 850, 860, 870, 880, 890, 900,
117+
910, 920, 930, 940, 950, 960, 970, 980, 990, 1000,
118+
1100, 1200, 1300, 1400, 1500, 1600, 1700, 1800, 1900, 2000,
119+
2100, 2200, 2300, 2400, 2500, 2600, 2700, 2800, 2900, 3000,
120+
3100, 3200, 3300, 3400, 3500, 3600, 3700, 3800, 3900, 4000,
121+
4100, 4200, 4300, 4400, 4500, 4600, 4700, 4800, 4900, 5000,
122+
5100, 5200, 5300, 5400, 5500, 5600, 5700, 5800, 5900, 6000,
123+
6100, 6200, 6300, 6400, 6500, 6600, 6700, 6800, 6900, 7000,
124+
7100, 7200, 7300, 7400, 7500, 7600, 7700, 7800, 7900, 8000,
125+
8100, 8200, 8300, 8400, 8500, 8600, 8700, 8800, 8900, 9000,
126+
9100, 9200, 9300, 9400, 9500, 9600, 9700, 9800, 9900, 10000,
127+
11000, 12000, 13000, 14000, 15000, 16000, 17000, 18000, 19000, 20000,
128+
21000, 22000, 23000, 24000, 25000, 26000, 27000, 28000, 29000, 30000,
129+
31000, 32000, 33000, 34000, 35000, 36000, 37000, 38000, 39000, 40000,
130+
41000, 42000, 43000, 44000, 45000, 46000, 47000, 48000, 49000, 50000};
131+
96132
std::unique_ptr<TH1F> mMergerTest = nullptr;
97133
std::unique_ptr<TH1FRatio> mDigitChipOccupancy = nullptr;
98134
std::unique_ptr<TH1F> mDigitChipStdDev = nullptr;

‎Modules/MFT/include/MFT/QcMFTTrackTask.h‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
/// \author Diana Maria Krupova
1717
/// \author Katarina Krizkova Gajdosova
1818
/// \author David Grund
19+
/// \author Jakub Juracka
1920
///
2021

2122
#ifndef QC_MFT_TRACK_TASK_H
@@ -24,6 +25,8 @@
2425
// ROOT
2526
#include <TH1.h>
2627
#include <TH2.h>
28+
// C++
29+
#include <vector>
2730
// Quality Control
2831
#include "QualityControl/TaskInterface.h"
2932
#include "Common/TH1Ratio.h"
@@ -61,6 +64,39 @@ class QcMFTTrackTask /*final*/ : public TaskInterface // todo add back the "fina
6164
private:
6265
o2::mft::GeometryTGeo* mGeom = nullptr;
6366

67+
std::vector<float> mROFBins = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10,
68+
11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
69+
21, 22, 23, 24, 25, 26, 27, 28, 29, 30,
70+
31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
71+
41, 42, 43, 44, 45, 46, 47, 48, 49, 50,
72+
51, 52, 53, 54, 55, 56, 57, 58, 59, 60,
73+
61, 62, 63, 64, 65, 66, 67, 68, 69, 70,
74+
71, 72, 73, 74, 75, 76, 77, 78, 79, 80,
75+
81, 82, 83, 84, 85, 86, 87, 88, 89, 90,
76+
91, 92, 93, 94, 95, 96, 97, 98, 99, 100,
77+
110, 120, 130, 140, 150, 160, 170, 180, 190, 200,
78+
210, 220, 230, 240, 250, 260, 270, 280, 290, 300,
79+
310, 320, 330, 340, 350, 360, 370, 380, 390, 400,
80+
410, 420, 430, 440, 450, 460, 470, 480, 490, 500,
81+
510, 520, 530, 540, 550, 560, 570, 580, 590, 600,
82+
610, 620, 630, 640, 650, 660, 670, 680, 690, 700,
83+
710, 720, 730, 740, 750, 760, 770, 780, 790, 800,
84+
810, 820, 830, 840, 850, 860, 870, 880, 890, 900,
85+
910, 920, 930, 940, 950, 960, 970, 980, 990, 1000,
86+
1100, 1200, 1300, 1400, 1500, 1600, 1700, 1800, 1900, 2000,
87+
2100, 2200, 2300, 2400, 2500, 2600, 2700, 2800, 2900, 3000,
88+
3100, 3200, 3300, 3400, 3500, 3600, 3700, 3800, 3900, 4000,
89+
4100, 4200, 4300, 4400, 4500, 4600, 4700, 4800, 4900, 5000,
90+
5100, 5200, 5300, 5400, 5500, 5600, 5700, 5800, 5900, 6000,
91+
6100, 6200, 6300, 6400, 6500, 6600, 6700, 6800, 6900, 7000,
92+
7100, 7200, 7300, 7400, 7500, 7600, 7700, 7800, 7900, 8000,
93+
8100, 8200, 8300, 8400, 8500, 8600, 8700, 8800, 8900, 9000,
94+
9100, 9200, 9300, 9400, 9500, 9600, 9700, 9800, 9900, 10000,
95+
11000, 12000, 13000, 14000, 15000, 16000, 17000, 18000, 19000, 20000,
96+
21000, 22000, 23000, 24000, 25000, 26000, 27000, 28000, 29000, 30000,
97+
31000, 32000, 33000, 34000, 35000, 36000, 37000, 38000, 39000, 40000,
98+
41000, 42000, 43000, 44000, 45000, 46000, 47000, 48000, 49000, 50000};
99+
64100
std::unique_ptr<TH1FRatio> mNumberOfTracksPerTF = nullptr;
65101
std::unique_ptr<TH1FRatio> mTrackNumberOfClusters = nullptr;
66102
std::unique_ptr<TH1FRatio> mCATrackNumberOfClusters = nullptr;

‎Modules/MFT/src/QcMFTClusterTask.cxx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
/// \author Katarina Krizkova Gajdosova
1717
/// \author Diana Maria Krupova
1818
/// \author David Grund
19+
/// \author Jakub Juracka
1920
///
2021

2122
// C++
@@ -194,7 +195,7 @@ void QcMFTClusterTask::initialize(o2::framework::InitContext& /*ctx*/)
194195
getObjectsManager()->setDisplayHint(mClusterZ.get(), "hist");
195196

196197
mClustersROFSize = std::make_unique<TH1FRatio>(
197-
"mClustersROFSize", "Distribution of the #clusters per ROF; # clusters per ROF; # entries per orbit", maxClusterROFSize, 0, maxClusterROFSize, true);
198+
"mClustersROFSize", "Distribution of the #clusters per ROF; # clusters per ROF; # entries per orbit", static_cast<int>(mROFBins.size() - 1), mROFBins.data(), true);
198199
mClustersROFSize->SetStats(0);
199200
getObjectsManager()->startPublishing(mClustersROFSize.get());
200201
getObjectsManager()->setDisplayHint(mClustersROFSize.get(), "hist logx logy");

‎Modules/MFT/src/QcMFTDigitTask.cxx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
/// \author Katarina Krizkova Gajdosova
1717
/// \author Diana Maria Krupova
1818
/// \author David Grund
19+
/// \author Jakub Juracka
1920
///
2021

2122
// C++
@@ -160,7 +161,7 @@ void QcMFTDigitTask::initialize(o2::framework::InitContext& /*ctx*/)
160161

161162
mDigitsROFSize = std::make_unique<TH1FRatio>("mDigitsROFSize",
162163
"Distribution of the #digits per ROF; # digits per ROF; # entries per orbit",
163-
maxDigitROFSize, 0, maxDigitROFSize, true);
164+
static_cast<int>(mROFBins.size() - 1), mROFBins.data(), true);
164165
mDigitsROFSize->SetStats(0);
165166
getObjectsManager()->startPublishing(mDigitsROFSize.get());
166167
getObjectsManager()->setDisplayHint(mDigitsROFSize.get(), "hist logx logy");

‎Modules/MFT/src/QcMFTTrackTask.cxx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
/// \author Diana Maria Krupova
1717
/// \author Katarina Krizkova Gajdosova
1818
/// \author David Grund
19+
/// \author Jakub Juracka
1920
///
2021

2122
// C++
@@ -176,7 +177,7 @@ void QcMFTTrackTask::initialize(o2::framework::InitContext& /*ctx*/)
176177
getObjectsManager()->startPublishing(mTrackTanl.get());
177178
getObjectsManager()->setDisplayHint(mTrackTanl.get(), "hist");
178179

179-
mTrackROFNEntries = std::make_unique<TH1FRatio>("mMFTTrackROFSize", "Distribution of the #tracks per ROF; # tracks per ROF; # entries per orbit", MaxTrackROFSize, 0, MaxTrackROFSize, true);
180+
mTrackROFNEntries = std::make_unique<TH1FRatio>("mMFTTrackROFSize", "Distribution of the #tracks per ROF; # tracks per ROF; # entries per orbit", static_cast<int>(mROFBins.size() - 1), mROFBins.data(), true);
180181
getObjectsManager()->startPublishing(mTrackROFNEntries.get());
181182
getObjectsManager()->setDisplayHint(mTrackROFNEntries.get(), "hist logx logy");
182183

0 commit comments

Comments
 (0)