Skip to content

Commit ce4331d

Browse files
IsakovADIsakovAD
authored
ITS: NCluster plot moved to Double (#2369)
* nClusterPlot moved to Double * Moved all TH to double in cluster and track tasks
1 parent b914499 commit ce4331d

6 files changed

Lines changed: 129 additions & 129 deletions

File tree

‎Modules/ITS/include/ITS/ITSClusterTask.h‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -78,38 +78,38 @@ class ITSClusterTask : public TaskInterface
7878
std::vector<TObject*> mPublishedObjects;
7979

8080
// Inner barrel
81-
TH1F* hClusterTopologySummaryIB[NLayer][48][9] = { { { nullptr } } };
82-
TH1F* hGroupedClusterSizeSummaryIB[NLayer][48][9] = { { { nullptr } } };
81+
TH1D* hClusterTopologySummaryIB[NLayer][48][9] = { { { nullptr } } };
82+
TH1D* hGroupedClusterSizeSummaryIB[NLayer][48][9] = { { { nullptr } } };
8383

84-
std::shared_ptr<TH2FRatio> hAverageClusterOccupancySummaryIB[NLayer];
85-
std::shared_ptr<TH2FRatio> hAverageClusterSizeSummaryIB[NLayer];
84+
std::shared_ptr<TH2DRatio> hAverageClusterOccupancySummaryIB[NLayer];
85+
std::shared_ptr<TH2DRatio> hAverageClusterSizeSummaryIB[NLayer];
8686

8787
// Outer barrel
88-
TH1F* hGroupedClusterSizeSummaryOB[NLayer][48] = { { nullptr } };
89-
TH1F* hClusterSizeSummaryOB[NLayer][48] = { { nullptr } };
90-
TH1F* hClusterTopologySummaryOB[NLayer][48] = { { nullptr } };
88+
TH1D* hGroupedClusterSizeSummaryOB[NLayer][48] = { { nullptr } };
89+
TH1D* hClusterSizeSummaryOB[NLayer][48] = { { nullptr } };
90+
TH1D* hClusterTopologySummaryOB[NLayer][48] = { { nullptr } };
9191

92-
std::shared_ptr<TH2FRatio> hAverageClusterOccupancySummaryOB[NLayer];
93-
std::shared_ptr<TH2FRatio> hAverageClusterSizeSummaryOB[NLayer];
92+
std::shared_ptr<TH2DRatio> hAverageClusterOccupancySummaryOB[NLayer];
93+
std::shared_ptr<TH2DRatio> hAverageClusterSizeSummaryOB[NLayer];
9494

9595
// Layer synnary
96-
TH1F* hClusterSizeLayerSummary[NLayer] = { nullptr };
97-
TH1F* hClusterTopologyLayerSummary[NLayer] = { nullptr };
98-
TH1F* hGroupedClusterSizeLayerSummary[NLayer] = { nullptr };
96+
TH1D* hClusterSizeLayerSummary[NLayer] = { nullptr };
97+
TH1D* hClusterTopologyLayerSummary[NLayer] = { nullptr };
98+
TH1D* hGroupedClusterSizeLayerSummary[NLayer] = { nullptr };
9999

100100
// General
101-
TH2F* hClusterVsBunchCrossing = nullptr;
102-
std::unique_ptr<TH2FRatio> mGeneralOccupancy = nullptr;
101+
TH2D* hClusterVsBunchCrossing = nullptr;
102+
std::unique_ptr<TH2DRatio> mGeneralOccupancy = nullptr;
103103

104104
// Fine checks
105105

106-
std::shared_ptr<TH2FRatio> hAverageClusterOccupancySummaryFine[NLayer];
107-
std::shared_ptr<TH2FRatio> hAverageClusterSizeSummaryFine[NLayer];
106+
std::shared_ptr<TH2DRatio> hAverageClusterOccupancySummaryFine[NLayer];
107+
std::shared_ptr<TH2DRatio> hAverageClusterSizeSummaryFine[NLayer];
108108

109-
std::shared_ptr<TH2FRatio> hAverageClusterOccupancySummaryZPhi[NLayer];
110-
std::shared_ptr<TH2FRatio> hAverageClusterSizeSummaryZPhi[NLayer];
109+
std::shared_ptr<TH2DRatio> hAverageClusterOccupancySummaryZPhi[NLayer];
110+
std::shared_ptr<TH2DRatio> hAverageClusterSizeSummaryZPhi[NLayer];
111111

112-
TH1F* hEmptyLaneFractionGlobal;
112+
TH1D* hEmptyLaneFractionGlobal;
113113

114114
// Edges of space binning within chips (local frame coordinates)
115115
std::vector<float> vRphiBinsIB;

‎Modules/ITS/include/ITS/ITSTrackTask.h‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -70,33 +70,33 @@ class ITSTrackTask : public TaskInterface
7070
const int ChipBoundary[NLayer + 1] = { 0, 108, 252, 432, 3120, 6480, 14712, 24120 };
7171

7272
std::vector<TObject*> mPublishedObjects;
73-
std::unique_ptr<TH1FRatio> hNClusters;
74-
std::unique_ptr<TH1FRatio> hTrackEta;
75-
std::unique_ptr<TH1FRatio> hTrackPhi;
76-
TH1F* hVerticesRof;
77-
std::unique_ptr<TH2FRatio> hAngularDistribution;
78-
TH2F* hVertexCoordinates;
79-
TH2F* hVertexRvsZ;
80-
TH1F* hVertexZ;
81-
TH1F* hVertexContributors;
82-
TH1F* hAssociatedClusterFraction;
83-
TH1F* hNtracks;
84-
std::unique_ptr<TH2FRatio> hNClustersPerTrackEta;
85-
std::unique_ptr<TH2FRatio> hNClustersPerTrackPhi;
86-
std::unique_ptr<TH2FRatio> hNClustersPerTrackPt;
87-
std::unique_ptr<TH2FRatio> hHitFirstLayerPhiAll;
88-
std::unique_ptr<TH2FRatio> hHitFirstLayerPhi4cls;
89-
std::unique_ptr<TH2FRatio> hHitFirstLayerPhi5cls;
90-
std::unique_ptr<TH2FRatio> hHitFirstLayerPhi6cls;
91-
std::unique_ptr<TH2FRatio> hHitFirstLayerPhi7cls;
92-
TH2F* hClusterVsBunchCrossing;
93-
TH2F* hNClusterVsChipITS;
73+
std::unique_ptr<TH1DRatio> hNClusters;
74+
std::unique_ptr<TH1DRatio> hTrackEta;
75+
std::unique_ptr<TH1DRatio> hTrackPhi;
76+
TH1D* hVerticesRof;
77+
std::unique_ptr<TH2DRatio> hAngularDistribution;
78+
TH2D* hVertexCoordinates;
79+
TH2D* hVertexRvsZ;
80+
TH1D* hVertexZ;
81+
TH1D* hVertexContributors;
82+
TH1D* hAssociatedClusterFraction;
83+
TH1D* hNtracks;
84+
std::unique_ptr<TH2DRatio> hNClustersPerTrackEta;
85+
std::unique_ptr<TH2DRatio> hNClustersPerTrackPhi;
86+
std::unique_ptr<TH2DRatio> hNClustersPerTrackPt;
87+
std::unique_ptr<TH2DRatio> hHitFirstLayerPhiAll;
88+
std::unique_ptr<TH2DRatio> hHitFirstLayerPhi4cls;
89+
std::unique_ptr<TH2DRatio> hHitFirstLayerPhi5cls;
90+
std::unique_ptr<TH2DRatio> hHitFirstLayerPhi6cls;
91+
std::unique_ptr<TH2DRatio> hHitFirstLayerPhi7cls;
92+
TH2D* hClusterVsBunchCrossing;
93+
TH2D* hNClusterVsChipITS;
9494
// Histograms for inv mass k0s, lambda
95-
TH1F* hInvMassK0s;
96-
TH1F* hInvMassLambda;
97-
TH1F* hInvMassLambdaBar;
98-
TH2F* hTrackPtVsEta;
99-
TH2F* hTrackPtVsPhi;
95+
TH1D* hInvMassK0s;
96+
TH1D* hInvMassLambda;
97+
TH1D* hInvMassLambdaBar;
98+
TH2D* hTrackPtVsEta;
99+
TH2D* hTrackPtVsPhi;
100100
float mPiInvMass = 0.14;
101101
float mProtonInvMass = 0.938;
102102
Int_t mInvMasses = 0; // switch for the V0 invariant mass computation, 1 (default) - on, 0 - off

‎Modules/ITS/src/ITSClusterCheck.cxx‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ Quality ITSClusterCheck::check(std::map<std::string, std::shared_ptr<MonitorObje
3838
result = Quality::Good;
3939

4040
if (iter->second->getName().find("AverageClusterSize") != std::string::npos) {
41-
auto* h = dynamic_cast<TH2F*>(iter->second->getObject());
41+
auto* h = dynamic_cast<TH2D*>(iter->second->getObject());
4242
if (h == nullptr) {
43-
ILOG(Error, Support) << "could not cast AverageClusteSize to TH2F*" << ENDM;
43+
ILOG(Error, Support) << "could not cast AverageClusteSize to TH2D*" << ENDM;
4444
continue;
4545
}
4646
for (int ilayer = 0; ilayer < NLayer; ilayer++) {
@@ -53,9 +53,9 @@ Quality ITSClusterCheck::check(std::map<std::string, std::shared_ptr<MonitorObje
5353
}
5454

5555
if (iter->second->getName().find("EmptyLaneFractionGlobal") != std::string::npos) {
56-
auto* h = dynamic_cast<TH1F*>(iter->second->getObject());
56+
auto* h = dynamic_cast<TH1D*>(iter->second->getObject());
5757
if (h == nullptr) {
58-
ILOG(Error, Support) << "could not cast EmptyLaneFractionGlobal to TH1F*" << ENDM;
58+
ILOG(Error, Support) << "could not cast EmptyLaneFractionGlobal to TH1D*" << ENDM;
5959
continue;
6060
}
6161
result.addMetadata("EmptyLaneFractionGlobal", "good");
@@ -68,9 +68,9 @@ Quality ITSClusterCheck::check(std::map<std::string, std::shared_ptr<MonitorObje
6868
} // end summary loop
6969

7070
if (iter->second->getName().find("General_Occupancy") != std::string::npos) {
71-
auto* hp = dynamic_cast<TH2F*>(iter->second->getObject());
71+
auto* hp = dynamic_cast<TH2D*>(iter->second->getObject());
7272
if (hp == nullptr) {
73-
ILOG(Error, Support) << "could not cast general occupancy to TH2F*" << ENDM;
73+
ILOG(Error, Support) << "could not cast general occupancy to TH2D*" << ENDM;
7474
continue;
7575
}
7676
std::vector<int> skipxbins = convertToArray<int>(o2::quality_control_modules::common::getFromConfig<string>(mCustomParameters, "skipxbinsoccupancy", ""));
@@ -133,7 +133,7 @@ Quality ITSClusterCheck::check(std::map<std::string, std::shared_ptr<MonitorObje
133133
return result;
134134
} // end check
135135

136-
std::string ITSClusterCheck::getAcceptedType() { return "TH2F"; }
136+
std::string ITSClusterCheck::getAcceptedType() { return "TH2D"; }
137137

138138
void ITSClusterCheck::beautify(std::shared_ptr<MonitorObject> mo, Quality checkResult)
139139
{
@@ -158,9 +158,9 @@ void ITSClusterCheck::beautify(std::shared_ptr<MonitorObject> mo, Quality checkR
158158
Double_t positionX, positionY;
159159

160160
if (mo->getName().find("AverageClusterSize") != std::string::npos) {
161-
auto* h = dynamic_cast<TH2F*>(mo->getObject());
161+
auto* h = dynamic_cast<TH2D*>(mo->getObject());
162162
if (h == nullptr) {
163-
ILOG(Error, Support) << "could not cast AverageClusterSize to TH2F*" << ENDM;
163+
ILOG(Error, Support) << "could not cast AverageClusterSize to TH2D*" << ENDM;
164164
return;
165165
}
166166
std::string histoName = mo->getName();
@@ -189,9 +189,9 @@ void ITSClusterCheck::beautify(std::shared_ptr<MonitorObject> mo, Quality checkR
189189
}
190190

191191
if (mo->getName().find("EmptyLaneFractionGlobal") != std::string::npos) {
192-
auto* h = dynamic_cast<TH1F*>(mo->getObject());
192+
auto* h = dynamic_cast<TH1D*>(mo->getObject());
193193
if (h == nullptr) {
194-
ILOG(Error, Support) << "could not cast EmptyLaneFractionGlobal to TH1F*" << ENDM;
194+
ILOG(Error, Support) << "could not cast EmptyLaneFractionGlobal to TH1D*" << ENDM;
195195
return;
196196
}
197197
if (checkResult == Quality::Good) {
@@ -231,9 +231,9 @@ void ITSClusterCheck::beautify(std::shared_ptr<MonitorObject> mo, Quality checkR
231231
h->GetListOfFunctions()->Add(tShifterInfo->Clone());
232232
}
233233
if (mo->getName().find("General_Occupancy") != std::string::npos) {
234-
auto* h = dynamic_cast<TH2F*>(mo->getObject());
234+
auto* h = dynamic_cast<TH2D*>(mo->getObject());
235235
if (h == nullptr) {
236-
ILOG(Error, Support) << "could not cast General_Occupancy to TH2F*" << ENDM;
236+
ILOG(Error, Support) << "could not cast General_Occupancy to TH2D*" << ENDM;
237237
return;
238238
}
239239
if (checkResult == Quality::Good) {

0 commit comments

Comments
 (0)