Skip to content

[PWGLF] Clean PIDResponse in PWGMM #13647

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
njacazio merged 1 commit into from
Nov 5, 2025
Merged

[PWGLF] Clean PIDResponse in PWGMM #13647

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
44 changes: 23 additions & 21 deletions PWGMM/Mult/Tasks/dndeta-hi.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,29 +9,24 @@
// granted to it by virtue of its status as an Intergovernmental Organization
// or submit itself to any jurisdiction.

#include <Math/Vector4D.h>
#include <array>
#include <cmath>
#include <chrono>
#include <cstdlib>
#include <iostream>
#include <TFile.h>
#include <TH2F.h>
#include <TProfile.h>
#include <TPDGCode.h>
#include <TDatabasePDG.h>

#include "Index.h"
#include "bestCollisionTable.h"
#include "CCDB/BasicCCDBManager.h"
#include "Common/Core/RecoDecay.h"
#include "Common/Core/trackUtilities.h"

#include "PWGHF/Core/SelectorCuts.h"
#include "PWGHF/DataModel/CandidateReconstructionTables.h"
#include "PWGHF/DataModel/CandidateSelectionTables.h"
#include "PWGLF/DataModel/LFStrangenessTables.h"

#include "Common/CCDB/EventSelectionParams.h"
#include "Common/Core/RecoDecay.h"
#include "Common/Core/TrackSelection.h"
#include "Common/DataModel/PIDResponse.h"
#include "Common/Core/trackUtilities.h"
#include "Common/DataModel/Centrality.h"
#include "Common/DataModel/EventSelection.h"
#include "Common/DataModel/Multiplicity.h"
#include "Common/DataModel/TrackSelectionTables.h"

#include "CCDB/BasicCCDBManager.h"
#include "CommonConstants/MathConstants.h"
#include "Framework/ASoAHelpers.h"
#include "Framework/AnalysisDataModel.h"
Expand All @@ -41,14 +36,21 @@
#include "Framework/O2DatabasePDGPlugin.h"
#include "Framework/RuntimeError.h"
#include "Framework/runDataProcessing.h"
#include "Index.h"
#include "ReconstructionDataFormats/GlobalTrackID.h"
#include "ReconstructionDataFormats/Track.h"

#include "PWGHF/Core/SelectorCuts.h"
#include "PWGHF/DataModel/CandidateReconstructionTables.h"
#include "PWGHF/DataModel/CandidateSelectionTables.h"
#include "PWGLF/DataModel/LFStrangenessTables.h"
#include <Math/Vector4D.h>
#include <TDatabasePDG.h>

Check failure on line 43 in PWGMM/Mult/Tasks/dndeta-hi.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[pdg/database] 

Do not use TDatabasePDG directly. Use o2::constants::physics::Mass... or Service<o2::framework::O2DatabasePDG> instead.
#include <TFile.h>
#include <TH2F.h>
#include <TPDGCode.h>
#include <TProfile.h>

#include <array>
#include <chrono>
#include <cmath>
#include <cstdlib>
#include <iostream>

Check failure on line 53 in PWGMM/Mult/Tasks/dndeta-hi.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[include-iostream] 

Do not include iostream. Use O2 logging instead.

using namespace o2;
using namespace o2::framework;
Expand Down Expand Up @@ -241,9 +243,9 @@
std::vector<Double_t> logbins(nbins + 1, 0);
Double_t low = 0.01;
Double_t high = 10;
Double_t logbw = (log(high) - log(low)) / nbins;

Check failure on line 246 in PWGMM/Mult/Tasks/dndeta-hi.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[std-prefix] 

Use std:: prefix for names from the std namespace.
for (int ij = 0; ij <= nbins; ij++) {
logbins[ij] = low * exp(ij * logbw);

Check failure on line 248 in PWGMM/Mult/Tasks/dndeta-hi.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[std-prefix] 

Use std:: prefix for names from the std namespace.
}
AxisSpec ptbins2 = {logbins, "pT (GeV/c)", "pt bin"};

Expand Down Expand Up @@ -483,7 +485,7 @@
std::vector<Double_t> particleetas;
for (auto& particle : particles) {
auto p = pdg->GetParticle(particle.pdgCode());
if (std::abs(particle.pdgCode()) == 310 && std::abs(particle.eta()) < 0.5 && std::abs(genz) < 10)

Check failure on line 488 in PWGMM/Mult/Tasks/dndeta-hi.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[pdg/explicit-code] 

Avoid hard-coded PDG codes. Use named values from PDG_t or o2::constants::physics::Pdg instead.
registry.fill(HIST("Selection"), 17.);
if (!particle.isPhysicalPrimary()) {
continue;
Expand Down Expand Up @@ -631,7 +633,7 @@
for (auto MotherIDs = particle.mothersIds().front(); MotherIDs <= particle.mothersIds().back(); MotherIDs++) {
auto mother = mcParticles.rawIteratorAt(MotherIDs);
auto pdg_mother = mother.pdgCode();
if (pdg_mother == 310 || std::abs(pdg_mother) == 3122) {

Check failure on line 636 in PWGMM/Mult/Tasks/dndeta-hi.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[pdg/explicit-code] 

Avoid hard-coded PDG codes. Use named values from PDG_t or o2::constants::physics::Pdg instead.
pid = kMotherStrange;
}
}
Expand Down Expand Up @@ -720,7 +722,7 @@
Int_t pid = 0;
for (auto& particle : mcParticles) {
auto p = pdg->GetParticle(particle.pdgCode());
if (std::abs(particle.pdgCode()) == 310 && std::abs(particle.eta()) < 0.5 && std::abs(genz) < 10)

Check failure on line 725 in PWGMM/Mult/Tasks/dndeta-hi.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[pdg/explicit-code] 

Avoid hard-coded PDG codes. Use named values from PDG_t or o2::constants::physics::Pdg instead.
registry.fill(HIST("Selection"), 17.);
if (!particle.isPhysicalPrimary()) {
continue;
Expand Down Expand Up @@ -795,12 +797,12 @@
continue;
if (v0.v0cosPA() < v0cospa)
continue;
if (fabs(pTrack.eta()) > 0.9)

Check failure on line 800 in PWGMM/Mult/Tasks/dndeta-hi.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[std-prefix] 

Use std:: prefix for names from the std namespace.
continue;
if (fabs(nTrack.eta()) > 0.9)

Check failure on line 802 in PWGMM/Mult/Tasks/dndeta-hi.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[std-prefix] 

Use std:: prefix for names from the std namespace.
continue;

if (fabs(v0.eta()) < 0.5)

Check failure on line 805 in PWGMM/Mult/Tasks/dndeta-hi.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[std-prefix] 

Use std:: prefix for names from the std namespace.
registry.fill(HIST("hv0k0s"), v0.mK0Short());
registry.fill(HIST("hv0mass"), cent, Double_t(kK0short), v0.eta(), Double_t(v0.mK0Short()));
registry.fill(HIST("hv0mass"), cent, Double_t(kLambda), v0.eta(), Double_t(v0.mLambda()));
Expand Down
29 changes: 16 additions & 13 deletions PWGMM/Mult/Tasks/heavy-ion-mult.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,22 +18,20 @@
// 3. https://github.com/AliceO2Group/O2Physics/blob/master/PWGMM/Mult/Tasks/puremc-dndeta.cxx
// 4. O2 analysis tutorial: https://indico.cern.ch/event/1267433/

#include <cmath>
#include <cstdlib>
#include <iostream>
#include <TPDGCode.h>
#include <TDatabasePDG.h>
#include <vector>

#include "Index.h"
#include "bestCollisionTable.h"
#include "CCDB/BasicCCDBManager.h"
#include "Common/Core/trackUtilities.h"

#include "PWGLF/DataModel/LFStrangenessTables.h"

#include "Common/CCDB/EventSelectionParams.h"
#include "Common/Core/TrackSelection.h"
#include "Common/Core/trackUtilities.h"
#include "Common/DataModel/Centrality.h"
#include "Common/DataModel/Multiplicity.h"
#include "Common/DataModel/EventSelection.h"
#include "Common/DataModel/Multiplicity.h"
#include "Common/DataModel/TrackSelectionTables.h"

#include "CCDB/BasicCCDBManager.h"
#include "CommonConstants/MathConstants.h"
#include "Framework/ASoAHelpers.h"
#include "Framework/AnalysisDataModel.h"
Expand All @@ -43,9 +41,14 @@
#include "Framework/runDataProcessing.h"
#include "ReconstructionDataFormats/GlobalTrackID.h"
#include "ReconstructionDataFormats/Track.h"
#include "Index.h"
#include "Common/DataModel/PIDResponse.h"
#include "PWGLF/DataModel/LFStrangenessTables.h"

#include <TDatabasePDG.h>
#include <TPDGCode.h>

#include <cmath>
#include <cstdlib>
#include <iostream>
#include <vector>

using namespace o2;
using namespace o2::framework;
Expand Down
2 changes: 1 addition & 1 deletion PWGMM/UE/Tasks/dedxAnalysis.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#include "Common/Core/trackUtilities.h"
#include "Common/DataModel/EventSelection.h"
#include "Common/DataModel/Multiplicity.h"
#include "Common/DataModel/PIDResponse.h"
#include "Common/DataModel/PIDResponseTOF.h"
#include "Common/DataModel/TrackSelectionTables.h"

#include "CCDB/BasicCCDBManager.h"
Expand Down
11 changes: 7 additions & 4 deletions PWGMM/UE/Tasks/dedx_analysys.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,22 @@
/// \author Paola Vargas
/// \since January 8, 2025

#include "PWGLF/DataModel/LFStrangenessTables.h"

#include "Common/Core/RecoDecay.h"
#include "Common/Core/TrackSelection.h"
#include "Common/Core/trackUtilities.h"
#include "Common/DataModel/EventSelection.h"
#include "Common/DataModel/PIDResponse.h"
#include "Common/DataModel/TrackSelectionTables.h"
#include "Common/DataModel/Centrality.h"
#include "Common/DataModel/EventSelection.h"
#include "Common/DataModel/Multiplicity.h"
#include "Common/DataModel/PIDResponseTOF.h"
#include "Common/DataModel/PIDResponseTPC.h"
#include "Common/DataModel/TrackSelectionTables.h"

#include "Framework/ASoAHelpers.h"
#include "Framework/AnalysisDataModel.h"
#include "Framework/AnalysisTask.h"
#include "Framework/runDataProcessing.h"
#include "PWGLF/DataModel/LFStrangenessTables.h"
#include "ReconstructionDataFormats/Track.h"

using namespace o2;
Expand Down
Loading