Skip to content

[PWGCF] Please consider the following formatting changes to #10890 #36

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

Merged
bghanley1995 merged 1 commit into from
Apr 17, 2025
+12 −14
Merged

[PWGCF] Please consider the following formatting changes to #10890 #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 11 additions & 13 deletions PWGCF/TwoParticleCorrelations/TableProducer/identifiedBfFilter.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -897,25 +897,25 @@
TString::Format("dE/dx vs P_{IP} reconstructed %s; P (GeV/c); dE/dx (a.u.)", speciesTitle[sp]).Data(),
ptbins, ptlow, ptup, 1000, 0.0, 1000.0);
fhTrackTimeA[sp] = new TH2F(TString::Format("fhTrackTimeA_%s", speciesName[sp]).Data(),
TString::Format("Track Time vs P_{IP} reconstructed %s; P (GeV/c); Track Time(ns)", speciesTitle[sp]).Data(),
ptbins, ptlow, ptup, 1000, 0.0, 10.0);
TString::Format("Track Time vs P_{IP} reconstructed %s; P (GeV/c); Track Time(ns)", speciesTitle[sp]).Data(),
ptbins, ptlow, ptup, 1000, 0.0, 10.0);
fhTrackBetaA[sp] = new TH2F(TString::Format("fhTrackBetaA_%s", speciesName[sp]).Data(),
TString::Format("1/#Beta vs P_{IP} reconstructed %s; P (GeV/c); 1/#Beta(ns/m)", speciesTitle[sp]).Data(),
ptbins, ptlow, ptup, 1000, 0.0, 10.0);
}
}
fhdEdxA[kIdBfNoOfSpecies + 1] = new TH2F(TString::Format("fhdEdxA_WrongSpecies").Data(),
TString::Format("dE/dx vs P reconstructed Wrong Species; P (GeV/c); dE/dx (a.u.)").Data(),
ptbins, ptlow, ptup, 1000, 0.0, 1000.0);
fhdEdxIPTPCA[kIdBfNoOfSpecies + 1] = new TH2F(TString::Format("fhdEdxIPTPCA_WrongSpecies").Data(),
TString::Format("dE/dx vs P_{IP} reconstructed Wrong Species; P (GeV/c); dE/dx (a.u.)").Data(),
ptbins, ptlow, ptup, 1000, 0.0, 1000.0);
fhTrackTimeA[kIdBfNoOfSpecies + 1] = new TH2F(TString::Format("fhTrackTimeA_WrongSpecies").Data(),
TString::Format("Track Time vs P_{IP} reconstructed Wrong Species; P (GeV/c); Track Time(ns)").Data(),
ptbins, ptlow, ptup, 1000, 0.0, 10.0);
TString::Format("Track Time vs P_{IP} reconstructed Wrong Species; P (GeV/c); Track Time(ns)").Data(),
ptbins, ptlow, ptup, 1000, 0.0, 10.0);
fhTrackBetaA[kIdBfNoOfSpecies + 1] = new TH2F(TString::Format("fhTrackBetaA_WrongSpecies").Data(),
TString::Format("1/#Beta vs P_{IP} reconstructed Wrong Species; P (GeV/c); 1/#Beta(ns/m)").Data(),
ptbins, ptlow, ptup, 1000, 0.0, 10.0);
TString::Format("1/#Beta vs P_{IP} reconstructed Wrong Species; P (GeV/c); 1/#Beta(ns/m)").Data(),
ptbins, ptlow, ptup, 1000, 0.0, 10.0);

/* add the hstograms to the output list */
fOutputList->Add(fhXYB);
fOutputList->Add(fhYZB);
Expand Down Expand Up @@ -979,13 +979,11 @@
fOutputList->Add(fhdEdxIPTPCA[sp]);
fOutputList->Add(fhTrackTimeA[sp]);
fOutputList->Add(fhTrackBetaA[sp]);

}
fOutputList->Add(fhdEdxA[kIdBfNoOfSpecies + 1]);
fOutputList->Add(fhdEdxIPTPCA[kIdBfNoOfSpecies + 1]);
fOutputList->Add(fhTrackTimeA[kIdBfNoOfSpecies + 1]);
fOutputList->Add(fhTrackBetaA[kIdBfNoOfSpecies + 1]);

}

if ((fDataType != kData) && (fDataType != kDataNoEvtSel)) {
Expand Down Expand Up @@ -1165,10 +1163,10 @@
if (!(pid < 0)) {
naccepted++;
/* update charged multiplicities */
if (pid % 2 == trackTypes[0]) {

Check warning on line 1166 in PWGCF/TwoParticleCorrelations/TableProducer/identifiedBfFilter.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
trkMultPos[kIdBfCharged]++;
}
if (pid % 2 == trackTypes[1]) {

Check warning on line 1169 in PWGCF/TwoParticleCorrelations/TableProducer/identifiedBfFilter.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
trkMultNeg[kIdBfCharged]++;
}
if (fullDerivedData) {
Expand Down Expand Up @@ -1588,7 +1586,7 @@
fhdEdxA[kIdBfNoOfSpecies]->Fill(track.p(), track.tpcSignal());
fhdEdxIPTPCA[kIdBfNoOfSpecies]->Fill(track.tpcInnerParam(), track.tpcSignal());
fhTrackTimeA[kIdBfNoOfSpecies]->Fill(track.tpcInnerParam(), track.trackTime());
fhTrackBetaA[kIdBfNoOfSpecies]->Fill(track.tpcInnerParam(), track.trackTime()/track.length());
fhTrackBetaA[kIdBfNoOfSpecies]->Fill(track.tpcInnerParam(), track.trackTime() / track.length());
fhDoublePID->Fill(spMinNSigma, spDouble);
return kWrongSpecies; // Return wrong species value
} else {
Expand Down Expand Up @@ -1686,7 +1684,7 @@
}
if (recoIdMethod == recoIdMethods[1]) {
sp = identifyParticle(particle);
}
}
if (sp != kWrongSpecies) {
if (sp != kIdBfCharged) {
/* fill the charged particle histograms */
Expand Down Expand Up @@ -1838,7 +1836,7 @@
fhdEdxA[sp]->Fill(track.p(), track.tpcSignal());
fhdEdxIPTPCA[sp]->Fill(track.tpcInnerParam(), track.tpcSignal());
fhTrackTimeA[sp]->Fill(track.tpcInnerParam(), track.trackTime());
fhTrackBetaA[sp]->Fill(track.tpcInnerParam(), track.trackTime()/track.length());
fhTrackBetaA[sp]->Fill(track.tpcInnerParam(), track.trackTime() / track.length());
if (track.sign() > 0) {
fhPtPosA[sp]->Fill(track.pt());
fhPtEtaPosA[sp]->Fill(track.pt(), track.eta());
Expand Down
2 changes: 1 addition & 1 deletion PWGCF/TwoParticleCorrelations/Tasks/identifiedbf.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ struct IdentifiedbfTask {
} else {
fhN1VsZEtaPhiPtSecondary[track.trackacceptedid()]->Fill(zvtx, getEtaPhiIndex(track) + 0.5, track.pt(), corr);
}
}else if constexpr(framework::has_type_v<aod::mcparticle::McCollisionId, typename TrackObject::all_columns>){
} else if constexpr (framework::has_type_v<aod::mcparticle::McCollisionId, typename TrackObject::all_columns>) {
if (isPrimaryCheck(track)) {
fhN1VsZEtaPhiPtPrimary[track.trackacceptedid()]->Fill(zvtx, getEtaPhiIndex(track) + 0.5, track.pt(), corr);
} else {
Expand Down
Loading