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

[DPG] Renaming Histo #8760

Closed
wants to merge 7 commits into from
+3 −4
Closed

[DPG] Renaming Histo #8760

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ba664a8
Renaming Histo
upasanasharma31 Dec 2, 2024
45bd024
Update qaEfficiency.cxx
upasanasharma31 Dec 2, 2024
6907b15
Update qaEfficiency.cxx
upasanasharma31 Dec 2, 2024
def5d48
Update qaEfficiency.cxx
upasanasharma31 Dec 2, 2024
b90bacb
Update qaEfficiency.cxx
upasanasharma31 Dec 6, 2024
82d03e8
Merge branch 'master' into patch-14
njacazio Dec 9, 2024
1db2822
Merge branch 'master' into patch-14
njacazio Dec 12, 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
7 changes: 3 additions & 4 deletions DPG/Tasks/AOTTrack/qaEfficiency.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,14 @@
using namespace o2::framework;

// Indices for the track cut histogram
static constexpr int trkCutIdxTrkRead = 1;

Check warning on line 46 in DPG/Tasks/AOTTrack/qaEfficiency.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[name/constexpr-constant] 

Use UpperCamelCase for names of constexpr constants. Names of special constants may be prefixed with "k".
static constexpr int trkCutIdxHasMcPart = 2;

Check warning on line 47 in DPG/Tasks/AOTTrack/qaEfficiency.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[name/constexpr-constant] 

Use UpperCamelCase for names of constexpr constants. Names of special constants may be prefixed with "k".
static constexpr int trkCutIdxPassedPt = 3;

Check warning on line 48 in DPG/Tasks/AOTTrack/qaEfficiency.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[name/constexpr-constant] 

Use UpperCamelCase for names of constexpr constants. Names of special constants may be prefixed with "k".
static constexpr int trkCutIdxPassedEta = 4;

Check warning on line 49 in DPG/Tasks/AOTTrack/qaEfficiency.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[name/constexpr-constant] 

Use UpperCamelCase for names of constexpr constants. Names of special constants may be prefixed with "k".
static constexpr int trkCutIdxPassedPhi = 5;

Check warning on line 50 in DPG/Tasks/AOTTrack/qaEfficiency.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[name/constexpr-constant] 

Use UpperCamelCase for names of constexpr constants. Names of special constants may be prefixed with "k".
static constexpr int trkCutIdxPassedY = 6;

Check warning on line 51 in DPG/Tasks/AOTTrack/qaEfficiency.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[name/constexpr-constant] 

Use UpperCamelCase for names of constexpr constants. Names of special constants may be prefixed with "k".
static constexpr int trkCutIdxPassedFake = 7;

Check warning on line 52 in DPG/Tasks/AOTTrack/qaEfficiency.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[name/constexpr-constant] 

Use UpperCamelCase for names of constexpr constants. Names of special constants may be prefixed with "k".
static constexpr int trkCutIdxHasCollision = 8;

Check warning on line 53 in DPG/Tasks/AOTTrack/qaEfficiency.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[name/constexpr-constant] 

Use UpperCamelCase for names of constexpr constants. Names of special constants may be prefixed with "k".
static constexpr int trkCutIdxPassedTrkType = 9;
static constexpr int trkCutIdxPassedPtRange = 10;
static constexpr int trkCutIdxPassedEtaRange = 11;
Expand All @@ -76,9 +76,6 @@
static constexpr int PDGs[nParticles] = {11, 13, 211, 321, 2212, 1000010020, 1000010030, 1000020030, 1000020040,
-11, -13, -211, -321, -2212, -1000010020, -1000010030, -1000020030, -1000020040};

// Histograms
std::shared_ptr<TH1> hPtmotherGenerated; // histogram to store pT of Xi and Lambda

// Pt
std::array<std::shared_ptr<TH1>, nParticles> hPtIts;
std::array<std::shared_ptr<TH1>, nParticles> hPtTpc;
Expand Down Expand Up @@ -106,6 +103,7 @@
std::array<std::shared_ptr<TH1>, nParticles> hPtTrkItsTpcStr;
std::array<std::shared_ptr<TH1>, nParticles> hPtItsTpcTofStr;
std::array<std::shared_ptr<TH1>, nParticles> hPtGeneratedStr;
std::array<std::shared_ptr<TH1>, nParticles> hPtmotherGenerated; // histogram to store pT of mother
std::array<std::shared_ptr<TH1>, nParticles> hdecaylengthmother; // histogram to store decaylength of mother

// Pt for secondaries from material
Expand Down Expand Up @@ -366,6 +364,7 @@
hPtTrkItsTpcStr[histogramIndex] = histos.add<TH1>(Form("MC/pdg%i/pt/str/trk/its_tpc", PDGs[histogramIndex]), "ITS-TPC tracks (reco from weak decays) " + tagPt, kTH1D, {axisPt});
hPtItsTpcTofStr[histogramIndex] = histos.add<TH1>(Form("MC/pdg%i/pt/str/its_tpc_tof", PDGs[histogramIndex]), "ITS-TPC-TOF tracks (from weak decays) " + tagPt, kTH1D, {axisPt});
hPtGeneratedStr[histogramIndex] = histos.add<TH1>(Form("MC/pdg%i/pt/str/generated", PDGs[histogramIndex]), "Generated (from weak decays) " + tagPt, kTH1D, {axisPt});
hPtmotherGenerated[histogramIndex] = histos.add<TH1>(Form("MC/pdg%i/pt/str/generated_mother", PDGs[histogramIndex]), "Generated Mother " + tagPt, kTH1D, {axisPt});
hdecaylengthmother[histogramIndex] = histos.add<TH1>(Form("MC/pdg%i/pt/str/decayLength", PDGs[histogramIndex]), "Decay Length of mother particle" + tagPt, kTH1D, {axisPt});

// Ter
Expand Down Expand Up @@ -1267,7 +1266,7 @@
break;
}
if (motherIsAccepted) {
hPtmotherGenerated->Fill(mother.pt()); // Fill generated pT for Lambda
hPtmotherGenerated[histogramIndex]->Fill(mother.pt()); // Fill generated pT for mother
}
}
}
Expand Down Expand Up @@ -1918,7 +1917,7 @@
// Loop on particles to fill the denominator
float dNdEta = 0; // Multiplicity
for (const auto& mcParticle : groupedMcParticles) {
if (TMath::Abs(mcParticle.eta()) <= 2.f && !mcParticle.has_daughters()) {

Check warning on line 1920 in DPG/Tasks/AOTTrack/qaEfficiency.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[root-entity] 

Consider replacing ROOT entities with equivalents from standard C++ or from O2.
dNdEta += 1.f;
}
if (!isInAcceptance(mcParticle, HIST("MC/particleSelection"))) {
Expand Down Expand Up @@ -2205,7 +2204,7 @@
if (!isTrackSelected<false>(track, HIST("Data/trackSelection"))) {
continue;
}
if (abs(track.tpcNSigmaDe()) > nsigmaTPCDe) {

Check warning on line 2207 in DPG/Tasks/AOTTrack/qaEfficiency.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[std-prefix] 

Use std:: prefix for names from the std namespace.
continue;
}
histos.fill(HIST("Data/trackLength"), track.length());
Expand Down
Loading