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: memory improvements and new normalization #2203

Merged
merged 4 commits into from
Mar 25, 2024
Merged

ITS: memory improvements and new normalization #2203

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ff0c879
memory improvements and new normalization for distribution of number …
iravasen Mar 22, 2024
8c1ee9a
removed debug comments
iravasen Mar 22, 2024
a1e6fa5
fixed bug with getClusterCoordinates: wrongly used was producing cras…
iravasen Mar 22, 2024
7e56fcf
get locC only if needed
iravasen Mar 22, 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
11 changes: 1 addition & 10 deletions Modules/ITS/include/ITS/ITSClusterTask.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,6 @@ class ITSClusterTask : public TaskInterface
std::shared_ptr<TH2FRatio> hAverageClusterOccupancySummaryIB[NLayer];
std::shared_ptr<TH2FRatio> hAverageClusterSizeSummaryIB[NLayer];

int mClusterOccupancyIB[NLayer][48][9] = { { { 0 } } };

// Outer barrel
TH1F* hGroupedClusterSizeSummaryOB[NLayer][48] = { { nullptr } };
TH1F* hClusterSizeSummaryOB[NLayer][48] = { { nullptr } };
Expand All @@ -94,9 +92,6 @@ class ITSClusterTask : public TaskInterface
std::shared_ptr<TH2FRatio> hAverageClusterOccupancySummaryOB[NLayer];
std::shared_ptr<TH2FRatio> hAverageClusterSizeSummaryOB[NLayer];

int mClusterOccupancyOB[NLayer][48][28] = { { { 0 } } };
int mNLaneEmpty[4] = { 0 }; // IB, ML, OL, TOTAL empty lane

// Layer synnary
TH1F* hClusterSizeLayerSummary[NLayer] = { nullptr };
TH1F* hClusterTopologyLayerSummary[NLayer] = { nullptr };
Expand All @@ -114,10 +109,7 @@ class ITSClusterTask : public TaskInterface
std::shared_ptr<TH2FRatio> hAverageClusterOccupancySummaryZPhi[NLayer];
std::shared_ptr<TH2FRatio> hAverageClusterSizeSummaryZPhi[NLayer];

TH1D* hEmptyLaneFractionGlobal;

int mClusterSize[NLayer][48][28] = { { { 0 } } }; //[#layers][max staves][max lanes / chips]
int nClusters[NLayer][48][28] = { { { 0 } } };
TH1F* hEmptyLaneFractionGlobal;

// Edges of space binning within chips (local frame coordinates)
std::vector<float> vRphiBinsIB;
Expand All @@ -135,7 +127,6 @@ class ITSClusterTask : public TaskInterface
const int mNLanes[4] = { 432, 864, 2520, 3816 }; // IB, ML, OL, TOTAL lane
int mDoPublish1DSummary = 0;
int mNThreads = 1;
int mNRofs = 0;
int nBCbins = 103;
long int mTimestamp = -1;
TString xLabel;
Expand Down
54 changes: 27 additions & 27 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,38 +70,38 @@ class ITSTrackTask : public TaskInterface
const int ChipBoundary[NLayer + 1] = { 0, 108, 252, 432, 3120, 6480, 14712, 24120 };

std::vector<TObject*> mPublishedObjects;
TH1D* hNClusters;
TH2D* hNClustersPt;
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;
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;
// Histograms for inv mass k0s, lambda
TH1D* hInvMassK0s;
TH1D* hInvMassLambda;
TH1D* hInvMassLambdaBar;
TH2D* hTrackPtVsEta;
TH2D* hTrackPtVsPhi;
TH1F* hInvMassK0s;
TH1F* hInvMassLambda;
TH1F* hInvMassLambdaBar;
TH2F* hTrackPtVsEta;
TH2F* 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

int mPublishMore = 1;
float mVertexXYsize = 0.5;
float mVertexZsize = 15.;
float mVertexRsize = 0.8;
Expand Down
8 changes: 4 additions & 4 deletions Modules/ITS/src/ITSClusterCheck.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,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<TH1D*>(iter->second->getObject());
auto* h = dynamic_cast<TH1F*>(iter->second->getObject());
if (h == nullptr) {
ILOG(Error, Support) << "could not cast EmptyLaneFractionGlobal to TH1D*" << ENDM;
ILOG(Error, Support) << "could not cast EmptyLaneFractionGlobal to TH1F*" << ENDM;
continue;
}
result.addMetadata("EmptyLaneFractionGlobal", "good");
Expand Down Expand Up @@ -188,9 +188,9 @@ void ITSClusterCheck::beautify(std::shared_ptr<MonitorObject> mo, Quality checkR
}

if (mo->getName().find("EmptyLaneFractionGlobal") != std::string::npos) {
auto* h = dynamic_cast<TH1D*>(mo->getObject());
auto* h = dynamic_cast<TH1F*>(mo->getObject());
if (h == nullptr) {
ILOG(Error, Support) << "could not cast EmptyLaneFractionGlobal to TH1D*" << ENDM;
ILOG(Error, Support) << "could not cast EmptyLaneFractionGlobal to TH1F*" << ENDM;
return;
}
if (checkResult == Quality::Good) {
Expand Down
Loading
Loading