Skip to content

[DPG] Remove PIDResponse from DPG #14598

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
Jan 23, 2026
+19 −16
Merged

[DPG] Remove PIDResponse from DPG #14598

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
6 changes: 3 additions & 3 deletions DPG/Tasks/AOTTrack/qaEventTrack.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
/// \brief Header file for QA tasks for the track and the event properties.
///

#include "Framework/AnalysisDataModel.h"
#include "Framework/ASoAHelpers.h"
#include "Common/DataModel/TrackSelectionTables.h"
#include "Common/DataModel/PIDResponse.h"

#include "Framework/ASoAHelpers.h"
#include "Framework/AnalysisDataModel.h"

// Output table declaration
namespace o2::aod
Expand All @@ -28,7 +28,7 @@

namespace dpgcollision
{
DECLARE_SOA_INDEX_COLUMN(BC, bc);

Check failure on line 31 in DPG/Tasks/AOTTrack/qaEventTrack.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column] 

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.
DECLARE_SOA_COLUMN(IsEventReject, isEventReject, int);
DECLARE_SOA_COLUMN(IsEventSelected, isEventSelected, int);
DECLARE_SOA_COLUMN(RunNumber, runNumber, int);
Expand All @@ -46,8 +46,8 @@
DECLARE_SOA_COLUMN(PosYMC, posYMC, float);
DECLARE_SOA_COLUMN(PosZMC, posZMC, float);
DECLARE_SOA_COLUMN(CollisionTimeMC, collisionTimeMC, float);
DECLARE_SOA_COLUMN(RecoPVsPerMcColl, recoPVsPerMcColls, int); // from LF MCcollisionExtra

Check failure on line 49 in DPG/Tasks/AOTTrack/qaEventTrack.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column] 

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.
DECLARE_SOA_COLUMN(IsPvHighestContribForMcColl, IsPvHighestContribForMcColls, int); // from LF MCcollisionExtra

Check failure on line 50 in DPG/Tasks/AOTTrack/qaEventTrack.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column] 

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.
DECLARE_SOA_COLUMN(DpgCounterCollision, dpgCounterCollision, int);
DECLARE_SOA_COLUMN(DpgCounterDF, dpgCounterDF, int);
DECLARE_SOA_COLUMN(IsFakeCollision, isFakeCollision, int);
Expand Down Expand Up @@ -97,7 +97,7 @@

namespace dpgtrack
{
DECLARE_SOA_INDEX_COLUMN(DPGCollision, dpgCollision); //! Index to move from track to collision

Check failure on line 100 in DPG/Tasks/AOTTrack/qaEventTrack.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column] 

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.
DECLARE_SOA_COLUMN(Pt, pt, float); //! Pt
DECLARE_SOA_COLUMN(Eta, eta, float); //! Eta
DECLARE_SOA_COLUMN(Phi, phi, float); //! Phi
Expand All @@ -107,11 +107,11 @@
DECLARE_SOA_COLUMN(HasTPC, hasTPC, bool); //! Track has the TPC
DECLARE_SOA_COLUMN(HasTRD, hasTRD, bool); //! Track has the TRD
DECLARE_SOA_COLUMN(HasTOF, hasTOF, bool); //! Track has the TOF
DECLARE_SOA_COLUMN(TPCNClsFound, tpcNClsFound, int16_t); //! Clusters found in TPC

Check failure on line 110 in DPG/Tasks/AOTTrack/qaEventTrack.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column] 

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.
DECLARE_SOA_COLUMN(TPCNClsCrossedRows, tpcNClsCrossedRows, int16_t); //! Crossed rows found in TPC

Check failure on line 111 in DPG/Tasks/AOTTrack/qaEventTrack.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column] 

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.
DECLARE_SOA_COLUMN(TPCCrossedRowsOverFindableCls, tpcCrossedRowsOverFindableCls, float); //! Crossed rows over findable clusters in TPC

Check failure on line 112 in DPG/Tasks/AOTTrack/qaEventTrack.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column] 

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.
DECLARE_SOA_COLUMN(TPCFoundOverFindableCls, tpcFoundOverFindableCls, float); //! Found over findable clusters in TPC

Check failure on line 113 in DPG/Tasks/AOTTrack/qaEventTrack.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column] 

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.
DECLARE_SOA_COLUMN(TPCFractionSharedCls, tpcFractionSharedCls, float); //! Fraction of shared clusters in TPC

Check failure on line 114 in DPG/Tasks/AOTTrack/qaEventTrack.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column] 

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.
DECLARE_SOA_COLUMN(ITSNCls, itsNCls, uint8_t); //! Clusters found in ITS
DECLARE_SOA_COLUMN(ITSNClsInnerBarrel, itsNClsInnerBarrel, uint8_t); //! Clusters found in the inner barrel of the ITS
DECLARE_SOA_COLUMN(TOFSignal, tofSignal, float); //! TOF Signal (Ev. Time subtracted)
Expand Down Expand Up @@ -143,7 +143,7 @@
DECLARE_SOA_DYNAMIC_COLUMN(IsFromWeakDecay, isFromWeakDecay, //! True if particle is considered from a weak decay
[](int mode) -> bool { return mode == 1; });
DECLARE_SOA_DYNAMIC_COLUMN(IsFromMaterial, isFromMaterial, //! True if particle is considered from a weak decay
[](int mode) -> bool { return mode == 2; });

Check failure on line 146 in DPG/Tasks/AOTTrack/qaEventTrack.h

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.

} // namespace dpgparticles

Expand Down
24 changes: 13 additions & 11 deletions DPG/Tasks/AOTTrack/qaEventTrackLiteProducer.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,22 +19,24 @@

#include "qaEventTrack.h"

#include <vector>
#include "Common/Core/TrackSelection.h"
#include "Common/Core/TrackSelectionDefaults.h"
#include "Common/Core/trackUtilities.h"
#include "Common/DataModel/EventSelection.h"
#include "Common/DataModel/McCollisionExtra.h"
#include "Common/DataModel/Multiplicity.h"
#include "Common/DataModel/PIDResponseTOF.h"
#include "Common/DataModel/TrackSelectionTables.h"

#include "TRandom.h"
#include "Framework/AnalysisDataModel.h"
#include "Framework/AnalysisTask.h"
#include "Framework/HistogramRegistry.h"
#include "Framework/runDataProcessing.h"
#include "Framework/AnalysisDataModel.h"
#include "ReconstructionDataFormats/DCA.h"
#include "Common/Core/trackUtilities.h"
#include "Common/DataModel/McCollisionExtra.h"
#include "Common/DataModel/EventSelection.h"
#include "Common/DataModel/TrackSelectionTables.h"
#include "Common/DataModel/Multiplicity.h"
#include "Common/Core/TrackSelection.h"
#include "Common/Core/TrackSelectionDefaults.h"
#include "Common/TableProducer/PID/pidTOFBase.h"

#include "TRandom.h"

#include <vector>

using namespace o2;
using namespace o2::framework;
Expand Down
5 changes: 3 additions & 2 deletions DPG/Tasks/TOF/tofSkimsTableCreator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,10 @@
#ifndef DPG_TASKS_TOF_TOFSKIMSTABLECREATOR_H_
#define DPG_TASKS_TOF_TOFSKIMSTABLECREATOR_H_

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

#include "Framework/AnalysisDataModel.h"

namespace o2::aod
Expand Down
Loading