Skip to content

[DPG] Clean PIDResponse in DPG #13638

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 2, 2025
Merged

[DPG] Clean PIDResponse in DPG #13638

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
1 change: 0 additions & 1 deletion DPG/Tasks/AOTTrack/PID/HMPID/hmpidQa.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
#include "Common/Core/PID/PIDTOF.h"
#include "Common/Core/trackUtilities.h"
#include "Common/DataModel/EventSelection.h"
#include "Common/DataModel/PIDResponse.h"
#include "Common/DataModel/TrackSelectionTables.h"
#include "Common/TableProducer/PID/pidTOFBase.h"

Expand Down
2 changes: 1 addition & 1 deletion DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOF.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

#include "Common/DataModel/EventSelection.h"
#include "Common/DataModel/FT0Corrected.h"
#include "Common/DataModel/PIDResponse.h"
#include "Common/DataModel/PIDResponseTOF.h"
#include "Common/DataModel/TrackSelectionTables.h"
#include "Common/TableProducer/PID/pidTOFBase.h"

Expand Down Expand Up @@ -244,7 +244,7 @@
histos.add(hdelta_evtime_tof[id].data(), axisTitle, kTH2F, {pAxis, deltaAxis});
histos.add(hdelta_evtime_ft0[id].data(), axisTitle, kTH2F, {pAxis, deltaAxis});
histos.add(hdelta_evtime_tofft0[id].data(), axisTitle, kTH2F, {pAxis, deltaAxis});
} else if (enableVsMomentumHistograms == 2) {

Check failure on line 247 in DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOF.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.add(hdelta_evtime_fill[id].data(), axisTitle, kTH3F, {pAxis, etaAxis, deltaAxis});
histos.add(hdelta_evtime_tof[id].data(), axisTitle, kTH3F, {pAxis, etaAxis, deltaAxis});
histos.add(hdelta_evtime_ft0[id].data(), axisTitle, kTH3F, {pAxis, etaAxis, deltaAxis});
Expand Down Expand Up @@ -305,7 +305,7 @@
histos.add("event/pvcontributors", "", kTH1D, {contributorsAxis});
histos.add("event/vertexz", "", kTH1D, {vtxZAxis});
h = histos.add<TH1>("event/particlehypo", "", kTH1D, {{10, 0, 10, "PID in tracking"}});
for (int i = 0; i < 9; i++) {

Check failure on line 308 in DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOF.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.
h->GetXaxis()->SetBinLabel(i + 1, PID::getName(i));
}

Expand Down Expand Up @@ -351,7 +351,7 @@
if (!collision.sel7()) {
return false;
}
} else if (applyEvSel == 2) {

Check failure on line 354 in DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOF.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 (!collision.sel8()) {
return false;
}
Expand All @@ -367,7 +367,7 @@
int evtimeflag = 0;

if constexpr (fillHistograms) {
for (auto t : tracks) {

Check failure on line 370 in DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOF.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.
if (!t.hasTOF()) { // Skipping tracks without TOF
continue;
}
Expand All @@ -387,7 +387,7 @@
}
}
}
if (std::abs(collision.posZ()) > 10.f) {

Check failure on line 390 in DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOF.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 false;
}
// Count the number of contributors
Expand Down Expand Up @@ -501,11 +501,11 @@

Filter eventFilter = (applyEvSel.node() == 0) ||
((applyEvSel.node() == 1) && (o2::aod::evsel::sel7 == true)) ||
((applyEvSel.node() == 2) && (o2::aod::evsel::sel8 == true));

Check failure on line 504 in DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOF.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.
Filter trackFilter = (trackSelection.node() == 0) ||
((trackSelection.node() == 1) && requireGlobalTrackInFilter()) ||
((trackSelection.node() == 2) && requireGlobalTrackWoPtEtaInFilter()) ||

Check failure on line 507 in DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOF.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.
((trackSelection.node() == 3) && requireGlobalTrackWoDCAInFilter()) ||

Check failure on line 508 in DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOF.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.
((trackSelection.node() == 4) && requireQualityTracksInFilter()) ||
((trackSelection.node() == 5) && requireInAcceptanceTracksInFilter());
using CollisionCandidate = soa::Filtered<soa::Join<aod::Collisions, aod::EvSels>>::iterator;
Expand All @@ -517,7 +517,7 @@
soa::Filtered<TrackCandidates> const& tracks)
{
isEventSelected<true>(collision, tracks);
for (auto t : tracks) {

Check failure on line 520 in DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOF.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.
isTrackSelected<true>(collision, t);
}
}
Expand All @@ -531,7 +531,7 @@
return;
}

for (auto t : tracks) {

Check failure on line 534 in DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOF.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.
if (!isTrackSelected<false>(collision, t)) {
continue;
}
Expand Down
13 changes: 7 additions & 6 deletions DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFBeta.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,17 @@
/// \brief Task to produce the TOF QA plots for Beta
///

#include "Framework/AnalysisTask.h"
#include "Framework/runDataProcessing.h"
#include "Framework/HistogramRegistry.h"
#include "Framework/StaticFor.h"
#include "Common/DataModel/TrackSelectionTables.h"
#include "Common/DataModel/EventSelection.h"
#include "Common/DataModel/PIDResponse.h"
#include "Common/DataModel/FT0Corrected.h"
#include "Common/DataModel/PIDResponseTOF.h"
#include "Common/DataModel/TrackSelectionTables.h"
#include "Common/TableProducer/PID/pidTOFBase.h"

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

using namespace o2;
using namespace o2::framework;
using namespace o2::framework::expressions;
Expand Down
13 changes: 7 additions & 6 deletions DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFBetaImp.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,17 @@
/// \brief Task to produce the TOF QA plots for Beta. Version using dynamic columns. Interim solution for test and benchmarking
///

#include "Framework/AnalysisTask.h"
#include "Framework/runDataProcessing.h"
#include "Framework/HistogramRegistry.h"
#include "Framework/StaticFor.h"
#include "Common/DataModel/TrackSelectionTables.h"
#include "Common/DataModel/EventSelection.h"
#include "Common/DataModel/PIDResponse.h"
#include "Common/DataModel/FT0Corrected.h"
#include "Common/DataModel/PIDResponseTOF.h"
#include "Common/DataModel/TrackSelectionTables.h"
#include "Common/TableProducer/PID/pidTOFBase.h"

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

using namespace o2;
using namespace o2::framework;
using namespace o2::framework::expressions;
Expand Down
19 changes: 10 additions & 9 deletions DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFEvTime.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,21 @@
/// \brief Tasks of the TOF PID quantities for the event times
///

#include "TEfficiency.h"
#include "THashList.h"

#include "Framework/HistogramRegistry.h"
#include "Framework/StaticFor.h"
#include "Framework/AnalysisTask.h"
#include "Common/DataModel/TrackSelectionTables.h"
#include "Common/DataModel/EventSelection.h"
#include "Common/DataModel/PIDResponse.h"
#include "Common/DataModel/FT0Corrected.h"
#include "Common/DataModel/PIDResponseTOF.h"
#include "Common/DataModel/TrackSelectionTables.h"
#include "Common/TableProducer/PID/pidTOFBase.h"
#include "Framework/runDataProcessing.h"

#include "CommonConstants/LHCConstants.h"
#include "DataFormatsFT0/Digit.h"
#include "Framework/AnalysisTask.h"
#include "Framework/HistogramRegistry.h"
#include "Framework/StaticFor.h"
#include "Framework/runDataProcessing.h"

#include "TEfficiency.h"
#include "THashList.h"

using namespace o2;
using namespace o2::framework;
Expand Down
5 changes: 3 additions & 2 deletions DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFMC.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,12 @@
///

// O2 includes
#include "Common/DataModel/EventSelection.h"
#include "Common/DataModel/PIDResponseTOF.h"

#include "Framework/AnalysisTask.h"
#include "Framework/HistogramRegistry.h"
#include "Framework/StaticFor.h"
#include "Common/DataModel/EventSelection.h"
#include "Common/DataModel/PIDResponse.h"
#include "Framework/runDataProcessing.h"

using namespace o2;
Expand Down
3 changes: 2 additions & 1 deletion DPG/Tasks/AOTTrack/PID/TPC/qaPIDTPCMC.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,11 @@
///

// O2 includes
#include "Common/DataModel/PIDResponseTPC.h"

#include "Framework/AnalysisTask.h"
#include "Framework/HistogramRegistry.h"
#include "Framework/StaticFor.h"
#include "Common/DataModel/PIDResponse.h"
#include "Framework/runDataProcessing.h"

using namespace o2;
Expand Down
13 changes: 7 additions & 6 deletions DPG/Tasks/TOF/tofSkimsTableCreator.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,16 @@
/// \brief Task to defined the skimmed data format for the TOF skims
///

#include "Framework/AnalysisTask.h"
#include "Framework/runDataProcessing.h"
#include "Common/DataModel/PIDResponse.h"
#include "Common/DataModel/Multiplicity.h"
#include "Common/DataModel/TrackSelectionTables.h"
#include "tofSkimsTableCreator.h"

#include "Common/DataModel/EventSelection.h"
#include "Common/DataModel/FT0Corrected.h"
#include "Common/DataModel/Multiplicity.h"
#include "Common/DataModel/PIDResponseTOF.h"
#include "Common/DataModel/TrackSelectionTables.h"

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

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