Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ITS: NCluster plot moved to Double #2369

Merged
merged 2 commits into from
Jul 11, 2024
Merged

ITS: NCluster plot moved to Double #2369

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
affb1b4
nClusterPlot moved to Double
IsakovAD Jul 9, 2024
6b1280f
Moved all TH to double in cluster and track tasks
IsakovAD Jul 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 19 additions & 19 deletions Modules/ITS/include/ITS/ITSClusterTask.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,38 +78,38 @@ class ITSClusterTask : public TaskInterface
std::vector<TObject*> mPublishedObjects;

// Inner barrel
TH1F* hClusterTopologySummaryIB[NLayer][48][9] = { { { nullptr } } };
TH1F* hGroupedClusterSizeSummaryIB[NLayer][48][9] = { { { nullptr } } };
TH1D* hClusterTopologySummaryIB[NLayer][48][9] = { { { nullptr } } };
TH1D* hGroupedClusterSizeSummaryIB[NLayer][48][9] = { { { nullptr } } };

std::shared_ptr<TH2FRatio> hAverageClusterOccupancySummaryIB[NLayer];
std::shared_ptr<TH2FRatio> hAverageClusterSizeSummaryIB[NLayer];
std::shared_ptr<TH2DRatio> hAverageClusterOccupancySummaryIB[NLayer];
std::shared_ptr<TH2DRatio> hAverageClusterSizeSummaryIB[NLayer];

// Outer barrel
TH1F* hGroupedClusterSizeSummaryOB[NLayer][48] = { { nullptr } };
TH1F* hClusterSizeSummaryOB[NLayer][48] = { { nullptr } };
TH1F* hClusterTopologySummaryOB[NLayer][48] = { { nullptr } };
TH1D* hGroupedClusterSizeSummaryOB[NLayer][48] = { { nullptr } };
TH1D* hClusterSizeSummaryOB[NLayer][48] = { { nullptr } };
TH1D* hClusterTopologySummaryOB[NLayer][48] = { { nullptr } };

std::shared_ptr<TH2FRatio> hAverageClusterOccupancySummaryOB[NLayer];
std::shared_ptr<TH2FRatio> hAverageClusterSizeSummaryOB[NLayer];
std::shared_ptr<TH2DRatio> hAverageClusterOccupancySummaryOB[NLayer];
std::shared_ptr<TH2DRatio> hAverageClusterSizeSummaryOB[NLayer];

// Layer synnary
TH1F* hClusterSizeLayerSummary[NLayer] = { nullptr };
TH1F* hClusterTopologyLayerSummary[NLayer] = { nullptr };
TH1F* hGroupedClusterSizeLayerSummary[NLayer] = { nullptr };
TH1D* hClusterSizeLayerSummary[NLayer] = { nullptr };
TH1D* hClusterTopologyLayerSummary[NLayer] = { nullptr };
TH1D* hGroupedClusterSizeLayerSummary[NLayer] = { nullptr };

// General
TH2F* hClusterVsBunchCrossing = nullptr;
std::unique_ptr<TH2FRatio> mGeneralOccupancy = nullptr;
TH2D* hClusterVsBunchCrossing = nullptr;
std::unique_ptr<TH2DRatio> mGeneralOccupancy = nullptr;

// Fine checks

std::shared_ptr<TH2FRatio> hAverageClusterOccupancySummaryFine[NLayer];
std::shared_ptr<TH2FRatio> hAverageClusterSizeSummaryFine[NLayer];
std::shared_ptr<TH2DRatio> hAverageClusterOccupancySummaryFine[NLayer];
std::shared_ptr<TH2DRatio> hAverageClusterSizeSummaryFine[NLayer];

std::shared_ptr<TH2FRatio> hAverageClusterOccupancySummaryZPhi[NLayer];
std::shared_ptr<TH2FRatio> hAverageClusterSizeSummaryZPhi[NLayer];
std::shared_ptr<TH2DRatio> hAverageClusterOccupancySummaryZPhi[NLayer];
std::shared_ptr<TH2DRatio> hAverageClusterSizeSummaryZPhi[NLayer];

TH1F* hEmptyLaneFractionGlobal;
TH1D* hEmptyLaneFractionGlobal;

// Edges of space binning within chips (local frame coordinates)
std::vector<float> vRphiBinsIB;
Expand Down
52 changes: 26 additions & 26 deletions Modules/ITS/include/ITS/ITSTrackTask.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,33 +70,33 @@ class ITSTrackTask : public TaskInterface
const int ChipBoundary[NLayer + 1] = { 0, 108, 252, 432, 3120, 6480, 14712, 24120 };

std::vector<TObject*> mPublishedObjects;
std::unique_ptr<TH1FRatio> hNClusters;
std::unique_ptr<TH1FRatio> hTrackEta;
std::unique_ptr<TH1FRatio> hTrackPhi;
TH1F* hVerticesRof;
std::unique_ptr<TH2FRatio> hAngularDistribution;
TH2F* hVertexCoordinates;
TH2F* hVertexRvsZ;
TH1F* hVertexZ;
TH1F* hVertexContributors;
TH1F* hAssociatedClusterFraction;
TH1F* hNtracks;
std::unique_ptr<TH2FRatio> hNClustersPerTrackEta;
std::unique_ptr<TH2FRatio> hNClustersPerTrackPhi;
std::unique_ptr<TH2FRatio> hNClustersPerTrackPt;
std::unique_ptr<TH2FRatio> hHitFirstLayerPhiAll;
std::unique_ptr<TH2FRatio> hHitFirstLayerPhi4cls;
std::unique_ptr<TH2FRatio> hHitFirstLayerPhi5cls;
std::unique_ptr<TH2FRatio> hHitFirstLayerPhi6cls;
std::unique_ptr<TH2FRatio> hHitFirstLayerPhi7cls;
TH2F* hClusterVsBunchCrossing;
TH2F* hNClusterVsChipITS;
std::unique_ptr<TH1DRatio> hNClusters;
std::unique_ptr<TH1DRatio> hTrackEta;
std::unique_ptr<TH1DRatio> hTrackPhi;
TH1D* hVerticesRof;
std::unique_ptr<TH2DRatio> hAngularDistribution;
TH2D* hVertexCoordinates;
TH2D* hVertexRvsZ;
TH1D* hVertexZ;
TH1D* hVertexContributors;
TH1D* hAssociatedClusterFraction;
TH1D* hNtracks;
std::unique_ptr<TH2DRatio> hNClustersPerTrackEta;
std::unique_ptr<TH2DRatio> hNClustersPerTrackPhi;
std::unique_ptr<TH2DRatio> hNClustersPerTrackPt;
std::unique_ptr<TH2DRatio> hHitFirstLayerPhiAll;
std::unique_ptr<TH2DRatio> hHitFirstLayerPhi4cls;
std::unique_ptr<TH2DRatio> hHitFirstLayerPhi5cls;
std::unique_ptr<TH2DRatio> hHitFirstLayerPhi6cls;
std::unique_ptr<TH2DRatio> hHitFirstLayerPhi7cls;
TH2D* hClusterVsBunchCrossing;
TH2D* hNClusterVsChipITS;
// Histograms for inv mass k0s, lambda
TH1F* hInvMassK0s;
TH1F* hInvMassLambda;
TH1F* hInvMassLambdaBar;
TH2F* hTrackPtVsEta;
TH2F* hTrackPtVsPhi;
TH1D* hInvMassK0s;
TH1D* hInvMassLambda;
TH1D* hInvMassLambdaBar;
TH2D* hTrackPtVsEta;
TH2D* hTrackPtVsPhi;
float mPiInvMass = 0.14;
float mProtonInvMass = 0.938;
Int_t mInvMasses = 0; // switch for the V0 invariant mass computation, 1 (default) - on, 0 - off
Expand Down
26 changes: 13 additions & 13 deletions Modules/ITS/src/ITSClusterCheck.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ Quality ITSClusterCheck::check(std::map<std::string, std::shared_ptr<MonitorObje
result = Quality::Good;

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

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

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

std::string ITSClusterCheck::getAcceptedType() { return "TH2F"; }
std::string ITSClusterCheck::getAcceptedType() { return "TH2D"; }

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

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

if (mo->getName().find("EmptyLaneFractionGlobal") != std::string::npos) {
auto* h = dynamic_cast<TH1F*>(mo->getObject());
auto* h = dynamic_cast<TH1D*>(mo->getObject());
if (h == nullptr) {
ILOG(Error, Support) << "could not cast EmptyLaneFractionGlobal to TH1F*" << ENDM;
ILOG(Error, Support) << "could not cast EmptyLaneFractionGlobal to TH1D*" << ENDM;
return;
}
if (checkResult == Quality::Good) {
Expand Down Expand Up @@ -231,9 +231,9 @@ void ITSClusterCheck::beautify(std::shared_ptr<MonitorObject> mo, Quality checkR
h->GetListOfFunctions()->Add(tShifterInfo->Clone());
}
if (mo->getName().find("General_Occupancy") != std::string::npos) {
auto* h = dynamic_cast<TH2F*>(mo->getObject());
auto* h = dynamic_cast<TH2D*>(mo->getObject());
if (h == nullptr) {
ILOG(Error, Support) << "could not cast General_Occupancy to TH2F*" << ENDM;
ILOG(Error, Support) << "could not cast General_Occupancy to TH2D*" << ENDM;
return;
}
if (checkResult == Quality::Good) {
Expand Down
Loading
Loading