Skip to content

[PWGEM,PWGUD,Tutorial] Clean PIDResponse in Tutorials #13639

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

Closed
njacazio wants to merge 4 commits into from
+139 −122
Closed

[PWGEM,PWGUD,Tutorial] Clean PIDResponse in Tutorials #13639

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6c5bb43
Clean PIDResponse in Tutorials
njacazio Nov 2, 2025
da1e8dd
Please consider the following formatting changes to #13639 (#13648)
alibuild Nov 2, 2025
a562caf
Fix
njacazio Nov 5, 2025
c1d3c08
Merge branch 'master' into nj-pidresponse-tutorial
njacazio Nov 27, 2025
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
19 changes: 11 additions & 8 deletions Tutorials/OpenData/flowAnalysis.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,23 @@
/// \author
/// \since

#include <TF1.h>
#include <TH3.h>
#include <Framework/runDataProcessing.h>
#include <Framework/AnalysisTask.h>
#include <Framework/HistogramRegistry.h>
#include <Framework/AnalysisDataModel.h>
#include <Common/DataModel/EventSelection.h>
#include <Common/CCDB/TriggerAliases.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 <Common/DataModel/PIDResponse.h>

#include <CCDB/BasicCCDBManager.h>
#include <DataFormatsParameters/GRPObject.h>
#include <Framework/AnalysisDataModel.h>
#include <Framework/AnalysisTask.h>
#include <Framework/HistogramRegistry.h>
#include <Framework/runDataProcessing.h>

#include <TF1.h>
#include <TH3.h>

using namespace o2;
using namespace o2::framework;
Expand Down Expand Up @@ -310,9 +313,9 @@

auto getDoubleCountingPi = [&](Double_t nSpi, Short_t minNSigma) { return (nSpi < nsigCut && minNSigma != 1); };

auto getDoubleCountingK = [&](Double_t nSk, Short_t minNSigma) { return (nSk < nsigCut && minNSigma != 2); };

Check failure on line 316 in Tutorials/OpenData/flowAnalysis.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.

auto getDoubleCountingP = [&](Double_t nSp, Short_t minNSigma) { return (nSp < nsigCut && minNSigma != 3); };

Check failure on line 318 in Tutorials/OpenData/flowAnalysis.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.

if ((eventSelection == 1) && (!collision.alias_bit(kINT7) || !collision.sel7())) {
// LOGF(info, "Collision index : %d skipped not kINT7", collision.index());
Expand All @@ -323,13 +326,13 @@
if (collision.numContrib() > 1) {
float zRes = TMath::Sqrt(collision.covZZ());
bool vertexerZ = collision.flags() == aod::collision::Run2VertexerZ;
if (vertexerZ && zRes > 0.25 && collision.numContrib() < 20)

Check failure on line 329 in Tutorials/OpenData/flowAnalysis.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.
zvtx = -999;
else
zvtx = collision.posZ();
}

if (zvtx < -990)

Check failure on line 335 in Tutorials/OpenData/flowAnalysis.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.
histos.fill(HIST("vtx"), 0);
else
histos.fill(HIST("vtx"), 1);
Expand All @@ -341,7 +344,7 @@
auto cl1Centr = collision.centRun2CL1();
auto cl0Centr = collision.centRun2CL0();

if (v0Centr >= 80. || v0Centr < 0)

Check failure on line 347 in Tutorials/OpenData/flowAnalysis.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.
return;

// cannot use vertex quality comparing SPD and Trk vertices as below
Expand Down Expand Up @@ -376,7 +379,7 @@
//clusters SDD+SSD
AliVMultiplicity* mult = aod->GetMultiplicity();
Int_t nCluSDDSSD=0;
for(Int_t iLay = 2; iLay < 6; iLay++)

Check failure on line 382 in Tutorials/OpenData/flowAnalysis.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.
nCluSDDSSD += mult->GetNumberOfITSClusters(iLay);
*/

Expand All @@ -396,7 +399,7 @@
// Tracks are already filtered with GlobalTrack || GlobalTrackSDD
Int_t multTrk = tracks.size();

for (auto& track : tracks) {

Check failure on line 402 in Tutorials/OpenData/flowAnalysis.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[const-ref-in-for-loop] 

Use constant references for non-modified iterators in range-based for loops.

Double_t trackpt = track.pt();
Double_t tracketa = track.eta();
Expand Down Expand Up @@ -435,7 +438,7 @@
histos.fill(HIST("QynC"), v0Centr, QynGapC / multGapC);
}

for (auto& track : tracks) {

Check failure on line 441 in Tutorials/OpenData/flowAnalysis.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[const-ref-in-for-loop] 

Use constant references for non-modified iterators in range-based for loops.

Double_t trackpt = track.pt();
Double_t tracketa = track.eta();
Expand All @@ -462,14 +465,14 @@

if (crsRowsFrcShCls) {
Float_t nrowscr = track.tpcNClsCrossedRows();
if (nrowscr < 120)

Check failure on line 468 in Tutorials/OpenData/flowAnalysis.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.
continue;

Float_t clsFind = track.tpcNClsFindable();
if (clsFind <= 0)
continue;

if (track.tpcCrossedRowsOverFindableCls() < 0.9)

Check failure on line 475 in Tutorials/OpenData/flowAnalysis.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.
continue;
}

Expand Down
36 changes: 17 additions & 19 deletions Tutorials/PWGEM/emcclustertutorial.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,23 @@
// granted to it by virtue of its status as an Intergovernmental Organization
// or submit itself to any jurisdiction.

#include "PWGJE/DataModel/EMCALClusters.h"

#include "Common/DataModel/Centrality.h"
#include "Common/DataModel/EventSelection.h"

#include "CommonDataFormat/InteractionRecord.h"
#include "DataFormatsEMCAL/AnalysisCluster.h"
#include "DataFormatsEMCAL/Cell.h"
#include "DataFormatsEMCAL/Constants.h"
#include "EMCALBase/Geometry.h"
#include "EMCALCalib/BadChannelMap.h"
#include "Framework/ASoA.h"
#include "Framework/AnalysisDataModel.h"
#include "Framework/AnalysisTask.h"
#include "Framework/HistogramRegistry.h"
#include "Framework/runDataProcessing.h"

#include <climits>
#include <cstdlib>
#include <map>
Expand All @@ -17,25 +34,6 @@
#include <string>
#include <vector>

#include "Framework/runDataProcessing.h"
#include "Framework/AnalysisTask.h"
#include "Framework/AnalysisDataModel.h"
#include "Framework/ASoA.h"
#include "Framework/HistogramRegistry.h"

#include "Common/DataModel/EventSelection.h"
#include "Common/DataModel/Centrality.h"
#include "Common/DataModel/PIDResponse.h"

#include "EMCALBase/Geometry.h"
#include "EMCALCalib/BadChannelMap.h"
#include "PWGJE/DataModel/EMCALClusters.h"
#include "DataFormatsEMCAL/Cell.h"
#include "DataFormatsEMCAL/Constants.h"
#include "DataFormatsEMCAL/AnalysisCluster.h"

#include "CommonDataFormat/InteractionRecord.h"

// \struct ClusterTutorial
/// \brief Skeleton task for EMCal cluster tutorial
/// \author Florian Jonas <florian.jonas@cern.ch>, Oak Ridge National Laoratory; Joshua König <joshua.konig@cern.ch>, Goethe-University Frankfurt; Marvin Hemmer <marvin.hemmer@cern.ch>, Goethe-University Frankfurt
Expand Down
10 changes: 6 additions & 4 deletions Tutorials/PWGUD/UDTutorial_01.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,15 @@
// \author Paul Buehler, paul.buehler@oeaw.ac.at
// \since April 2023

#include "Framework/runDataProcessing.h"
#include "PWGUD/Core/UDHelpers.h"
#include "PWGUD/DataModel/UDTables.h"

#include "Common/DataModel/PIDResponseTOF.h"

#include "Framework/AnalysisTask.h"
#include "Framework/runDataProcessing.h"

#include "TVector3.h"
#include "Common/DataModel/PIDResponse.h"
#include "PWGUD/DataModel/UDTables.h"
#include "PWGUD/Core/UDHelpers.h"

using namespace o2;
using namespace o2::framework;
Expand Down
8 changes: 4 additions & 4 deletions Tutorials/PWGUD/UDTutorial_02a.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@
// \author Paul Buehler, paul.buehler@oeaw.ac.at
// \since April 2023

#include "Framework/runDataProcessing.h"
#include "PWGUD/Core/UDHelpers.h"
#include "PWGUD/DataModel/UDTables.h"

#include "Framework/AnalysisTask.h"
#include "Framework/runDataProcessing.h"

#include "TDatabasePDG.h"
#include "TLorentzVector.h"
#include "Common/DataModel/PIDResponse.h"
#include "PWGUD/DataModel/UDTables.h"
#include "PWGUD/Core/UDHelpers.h"

using namespace o2;
using namespace o2::framework;
Expand Down
11 changes: 5 additions & 6 deletions Tutorials/PWGUD/UDTutorial_02b.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,12 @@
// \author Paul Buehler, paul.buehler@oeaw.ac.at
// \since April 2023

#include "Framework/runDataProcessing.h"
#include "Framework/AnalysisTask.h"

#include "Common/DataModel/PIDResponse.h"
#include "PWGUD/DataModel/UDTables.h"
#include "PWGUD/Core/UDHelpers.h"
#include "PWGUD/Core/DGPIDSelector.h"
#include "PWGUD/Core/UDHelpers.h"
#include "PWGUD/DataModel/UDTables.h"

#include "Framework/AnalysisTask.h"
#include "Framework/runDataProcessing.h"

using namespace o2;
using namespace o2::framework;
Expand Down
12 changes: 7 additions & 5 deletions Tutorials/PWGUD/UDTutorial_03a.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,17 @@
// \author Paul Buehler, paul.buehler@oeaw.ac.at
// \since October 2023

#include "Framework/runDataProcessing.h"
#include "PWGUD/Core/UDHelpers.h"

#include "Common/DataModel/EventSelection.h"
#include "Common/DataModel/PIDResponseTPC.h"
#include "Common/DataModel/TrackSelectionTables.h"

#include "Framework/AnalysisTask.h"
#include "Framework/runDataProcessing.h"

#include "TDatabasePDG.h"
#include "TLorentzVector.h"
#include "Common/DataModel/EventSelection.h"
#include "Common/DataModel/TrackSelectionTables.h"
#include "Common/DataModel/PIDResponse.h"
#include "PWGUD/Core/UDHelpers.h"

using namespace o2;
using namespace o2::framework;
Expand Down
12 changes: 7 additions & 5 deletions Tutorials/PWGUD/UDTutorial_03b.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,17 @@
// \author Paul Buehler, paul.buehler@oeaw.ac.at
// \since October 2023

#include "Framework/runDataProcessing.h"
#include "PWGUD/Core/UDHelpers.h"

#include "Common/DataModel/EventSelection.h"
#include "Common/DataModel/PIDResponseTPC.h"
#include "Common/DataModel/TrackSelectionTables.h"

#include "Framework/AnalysisTask.h"
#include "Framework/runDataProcessing.h"

#include "TDatabasePDG.h"
#include "TLorentzVector.h"
#include "Common/DataModel/EventSelection.h"
#include "Common/DataModel/TrackSelectionTables.h"
#include "Common/DataModel/PIDResponse.h"
#include "PWGUD/Core/UDHelpers.h"

using namespace o2;
using namespace o2::framework;
Expand Down
16 changes: 9 additions & 7 deletions Tutorials/Skimming/DataModel/JEDerived.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,13 @@
// or submit itself to any jurisdiction.
/// \author Nima Zardoshti <nima.zardoshti@cern.ch>, CERN

#ifndef O2_ANALYSIS_JEDERIVED_H
#define O2_ANALYSIS_JEDERIVED_H
#ifndef TUTORIALS_SKIMMING_DATAMODEL_JEDERIVED_H_
#define TUTORIALS_SKIMMING_DATAMODEL_JEDERIVED_H_

#include "Framework/ASoA.h"
#include "Framework/AnalysisDataModel.h"
#include <Framework/ASoA.h>
#include <Framework/AnalysisDataModel.h>

#include <TMath.h>

namespace o2::aod
{
Expand All @@ -29,7 +31,7 @@ DECLARE_SOA_COLUMN(Area, area, float);
DECLARE_SOA_DYNAMIC_COLUMN(Px, px, [](float pt, float phi) { return pt * TMath::Cos(phi); });
DECLARE_SOA_DYNAMIC_COLUMN(Py, py, [](float pt, float phi) { return pt * TMath::Sin(phi); });
DECLARE_SOA_DYNAMIC_COLUMN(Pz, pz, [](float pt, float eta) { return pt * TMath::SinH(eta); });
DECLARE_SOA_DYNAMIC_COLUMN(P, p, [](float pt, float eta) { return pt * TMath::CosH(eta); }); //absolute p
DECLARE_SOA_DYNAMIC_COLUMN(P, p, [](float pt, float eta) { return pt * TMath::CosH(eta); }); // absolute p
} // namespace jejet

DECLARE_SOA_TABLE(JEJets, "AOD", "JEJET",
Expand All @@ -56,7 +58,7 @@ DECLARE_SOA_COLUMN(Phi, phi, float);
DECLARE_SOA_DYNAMIC_COLUMN(Px, px, [](float pt, float phi) { return pt * TMath::Cos(phi); });
DECLARE_SOA_DYNAMIC_COLUMN(Py, py, [](float pt, float phi) { return pt * TMath::Sin(phi); });
DECLARE_SOA_DYNAMIC_COLUMN(Pz, pz, [](float pt, float eta) { return pt * TMath::SinH(eta); });
DECLARE_SOA_DYNAMIC_COLUMN(P, p, [](float pt, float eta) { return pt * TMath::CosH(eta); }); //absolute p
DECLARE_SOA_DYNAMIC_COLUMN(P, p, [](float pt, float eta) { return pt * TMath::CosH(eta); }); // absolute p
} // namespace jeconstituent

DECLARE_SOA_TABLE(JEConstituents, "AOD", "JECONSTITUENT", o2::soa::Index<>,
Expand All @@ -69,4 +71,4 @@ DECLARE_SOA_TABLE(JEConstituents, "AOD", "JECONSTITUENT", o2::soa::Index<>,
using JEConstituent = JEConstituents::iterator;
} // namespace o2::aod

#endif // O2_ANALYSIS_JEDERIVED_H
#endif // TUTORIALS_SKIMMING_DATAMODEL_JEDERIVED_H_
12 changes: 7 additions & 5 deletions Tutorials/Skimming/DataModel/LFDerived.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,13 @@
// or submit itself to any jurisdiction.
/// \author Nima Zardoshti <nima.zardoshti@cern.ch>, CERN

#ifndef O2_ANALYSIS_LFDERIVED_H
#define O2_ANALYSIS_LFDERIVED_H
#ifndef TUTORIALS_SKIMMING_DATAMODEL_LFDERIVED_H_
#define TUTORIALS_SKIMMING_DATAMODEL_LFDERIVED_H_

#include "Framework/ASoA.h"
#include "Framework/AnalysisDataModel.h"
#include <Framework/ASoA.h>
#include <Framework/AnalysisDataModel.h>

#include <TMath.h>

namespace o2::aod
{
Expand Down Expand Up @@ -92,4 +94,4 @@ using LFNucleiTrack = LFNucleiTracks::iterator;

} // namespace o2::aod

#endif // O2_ANALYSIS_LFDERIVED_H
#endif // TUTORIALS_SKIMMING_DATAMODEL_LFDERIVED_H_
14 changes: 7 additions & 7 deletions Tutorials/Skimming/spectraNucleiAnalyser.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@
// or submit itself to any jurisdiction.
// O2 includes

#include "ReconstructionDataFormats/Track.h"
#include "Framework/runDataProcessing.h"
#include "Framework/AnalysisTask.h"
#include "Framework/AnalysisDataModel.h"
#include "Framework/ASoAHelpers.h"
#include "Common/DataModel/PIDResponse.h"
#include "Common/DataModel/TrackSelectionTables.h"
#include "DataModel/LFDerived.h"

#include "Common/DataModel/TrackSelectionTables.h"

#include "Framework/ASoAHelpers.h"
#include "Framework/AnalysisDataModel.h"
#include "Framework/AnalysisTask.h"
#include "Framework/HistogramRegistry.h"
#include "Framework/runDataProcessing.h"
#include "ReconstructionDataFormats/Track.h"

#include <TLorentzVector.h>

Expand Down
16 changes: 9 additions & 7 deletions Tutorials/Skimming/spectraNucleiProvider.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,18 @@
/// \author Nima Zardoshti <nima.zardoshti@cern.ch>, CERN

// O2 includes
#include "ReconstructionDataFormats/Track.h"
#include "Framework/AnalysisTask.h"
#include "Framework/AnalysisDataModel.h"
#include "Framework/ASoAHelpers.h"
#include "Common/DataModel/PIDResponse.h"
#include "Common/DataModel/TrackSelectionTables.h"
#include "MathUtils/Utils.h"
#include "DataModel/LFDerived.h"

#include "Common/DataModel/EventSelection.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 "MathUtils/Utils.h"
#include "ReconstructionDataFormats/Track.h"

#include <TLorentzVector.h>

Expand Down
15 changes: 7 additions & 8 deletions Tutorials/Skimming/spectraNucleiReference.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,17 @@
// or submit itself to any jurisdiction.
// O2 includes

#include "ReconstructionDataFormats/Track.h"
#include "Framework/runDataProcessing.h"
#include "Framework/AnalysisTask.h"
#include "Framework/AnalysisDataModel.h"
#include "Framework/ASoAHelpers.h"
#include "Common/DataModel/PIDResponse.h"
#include "Common/DataModel/TrackSelectionTables.h"

#include "Common/DataModel/EventSelection.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/HistogramRegistry.h"
#include "Framework/runDataProcessing.h"
#include "ReconstructionDataFormats/Track.h"

#include <TLorentzVector.h>

Expand Down
15 changes: 8 additions & 7 deletions Tutorials/Skimming/spectraTPCAnalyser.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,15 @@
// or submit itself to any jurisdiction.

// O2 includes
#include "ReconstructionDataFormats/Track.h"
#include "Framework/AnalysisTask.h"
#include "Framework/AnalysisDataModel.h"
#include "Framework/ASoAHelpers.h"
#include "Common/DataModel/PIDResponse.h"
#include "Common/DataModel/TrackSelectionTables.h"
#include "DataModel/LFDerived.h"

#include "Common/DataModel/TrackSelectionTables.h"

#include "Framework/ASoAHelpers.h"
#include "Framework/AnalysisDataModel.h"
#include "Framework/AnalysisTask.h"
#include "ReconstructionDataFormats/Track.h"

using namespace o2;
using namespace o2::framework;
using namespace o2::framework::expressions;
Expand Down Expand Up @@ -63,7 +64,7 @@ struct TPCSpectraAnalyserTask {
histos.fill(HIST(hpt[i]), track.pt());
}

Filter collisionFilter = nabs(aod::collision::posZ) < cfgCutVertex; //collision filters not doing anything now?
Filter collisionFilter = nabs(aod::collision::posZ) < cfgCutVertex; // collision filters not doing anything now?
Filter trackFilter = nabs(aod::lftrack::eta) < cfgCutEta;

void process(soa::Filtered<aod::LFTracks>::iterator const& track)
Expand Down
16 changes: 9 additions & 7 deletions Tutorials/Skimming/spectraTPCProvider.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,17 @@
/// \author Nima Zardoshti <nima.zardoshti@cern.ch>, CERN

// O2 includes
#include "ReconstructionDataFormats/Track.h"
#include "Framework/AnalysisTask.h"
#include "Framework/AnalysisDataModel.h"
#include "Framework/ASoAHelpers.h"
#include "Common/DataModel/PIDResponse.h"
#include "Common/DataModel/TrackSelectionTables.h"
#include "DataModel/LFDerived.h"

#include "Common/DataModel/EventSelection.h"
#include "Common/DataModel/PIDResponseTPC.h"
#include "Common/DataModel/TrackSelectionTables.h"

#include "Framework/ASoAHelpers.h"
#include "Framework/AnalysisDataModel.h"
#include "Framework/AnalysisTask.h"
#include "MathUtils/Utils.h"
#include "DataModel/LFDerived.h"
#include "ReconstructionDataFormats/Track.h"

using namespace o2;
using namespace o2::framework;
Expand Down
Loading
Loading