Skip to content

Commit 76d9be3

Browse files
lubynetslubynets
committed
rename QA->diagnostics; mv AOTTrack/PID/TPC->TPC
1 parent 411e26f commit 76d9be3

4 files changed

Lines changed: 50 additions & 50 deletions

File tree

‎DPG/Tasks/AOTTrack/PID/TPC/CMakeLists.txt‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,3 @@ o2physics_add_dpl_workflow(pid-tpc-qa-mc
2424
SOURCES qaPIDTPCMC.cxx
2525
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore
2626
COMPONENT_NAME Analysis)
27-
28-
o2physics_add_dpl_workflow(tree-creator-pid-tpc-qa
29-
SOURCES treeCreatorPidTpcQa.cxx
30-
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2Physics::AnalysisCCDB
31-
COMPONENT_NAME Analysis)

‎DPG/Tasks/TPC/CMakeLists.txt‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,9 @@ o2physics_add_dpl_workflow(pid-tpc-skimscreation
1717
o2physics_add_dpl_workflow(pid-tpc-tree-creator-light
1818
SOURCES tpcTreeCreatorLight.cxx
1919
PUBLIC_LINK_LIBRARIES O2::Framework O2::DetectorsBase O2Physics::AnalysisCore
20-
COMPONENT_NAME Analysis)
20+
COMPONENT_NAME Analysis)
21+
22+
o2physics_add_dpl_workflow(tree-creator-pid-tpc-diagnostics
23+
SOURCES treeCreatorPidTpcDiagnostics.cxx
24+
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2Physics::AnalysisCCDB
25+
COMPONENT_NAME Analysis)

DPG/Tasks/AOTTrack/PID/TPC/treeCreatorPidTpcQa.cxx renamed to DPG/Tasks/TPC/treeCreatorPidTpcDiagnostics.cxx

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@
99
// granted to it by virtue of its status as an Intergovernmental Organization
1010
// or submit itself to any jurisdiction.
1111

12-
/// \file treeCreatorPidTpcQa.cxx
12+
/// \file treeCreatorPidTpcDiagnostics.cxx
1313
/// \brief Creates trees with PID QA variables along with variables used for NN training
1414
///
1515
/// \author Ana Marin <ana.marin@cern.ch>
1616
/// \author Oleksii Lubynets <oleksii.lubynets@cern.ch>
1717

18-
#include "treeCreatorPidTpcQa.h"
18+
#include "treeCreatorPidTpcDiagnostics.h"
1919

2020
#include "Common/CCDB/RCTSelectionFlags.h"
2121
#include "Common/CCDB/ctpRateFetcher.h"
@@ -64,8 +64,8 @@ using namespace o2::dpg_tpcskimstablecreator;
6464
MACRO(He, Helium3) \
6565
MACRO(Al, Alpha)
6666

67-
struct TreeCreatorPidTpcQa {
68-
Produces<o2::aod::QaPidTpc> rowPidTpcQa;
67+
struct TreeCreatorPidTpcDiagnostics {
68+
Produces<o2::aod::PidTpcDiagnostics> rowPidTpcDiagnostics;
6969

7070
Configurable<int> applyEvSel{"applyEvSel", 2, "Flag to apply event selection: 0 -> no event selection, 1 -> Run 2 event selection, 2 -> Run 3 event selection"};
7171
Configurable<float> cutVtxZ{"cutVtxZ", 10.f, "Cut on vertex Z position [cm]"};
@@ -180,7 +180,7 @@ struct TreeCreatorPidTpcQa {
180180
TrackType const& tracks)
181181
{
182182
if (mProcessedParticles == 0) {
183-
rowPidTpcQa.reserve(tracks.size() * reserveRatio);
183+
rowPidTpcDiagnostics.reserve(tracks.size() * reserveRatio);
184184
}
185185

186186
std::string irSource{};
@@ -249,49 +249,49 @@ struct TreeCreatorPidTpcQa {
249249
nSigmaTof = o2::aod::pidutils::tofNSigma<ParticleId>(track);
250250
}
251251

252-
rowPidTpcQa(isGoodRctEvent, ParticleId, ft0Occ, hadronicRate, multTPC, nClNormalized, nclPID, phi, tgl, tpcInnerParam, rapidity, momentum, signed1Pt, nSigmaTpc, dedxExpected, dedxDiff, expSigma, nSigmaTof);
252+
rowPidTpcDiagnostics(isGoodRctEvent, ParticleId, ft0Occ, hadronicRate, multTPC, nClNormalized, nclPID, phi, tgl, tpcInnerParam, rapidity, momentum, signed1Pt, nSigmaTpc, dedxExpected, dedxDiff, expSigma, nSigmaTof);
253253
} // tracksFromCollision
254254
} // collisions
255255
++mProcessedParticles;
256256
if (mProcessedParticles == mEnabledParticles) {
257257
mProcessedParticles = 0;
258258
if (saveReserveQaHisto) {
259-
registry.fill(HIST("hOutputRatio"), static_cast<double>((rowPidTpcQa.lastIndex() + 1)) / tracks.size());
259+
registry.fill(HIST("hOutputRatio"), static_cast<double>((rowPidTpcDiagnostics.lastIndex() + 1)) / tracks.size());
260260
}
261261
}
262262
}
263263

264-
#define MAKE_PROCESS_FUNCTIONS(ParticleNameShort, ParticleNameLong) \
265-
void process##ParticleNameLong(CollisionsExtra const& collisions, \
266-
soa::Join<TrackCandidates, aod::pidTPC##ParticleNameShort> const& tracks, \
267-
aod::BCsWithTimestamps const&) \
268-
{ \
269-
processSingleParticle<PID::ParticleNameLong, false, false>(collisions, tracks); \
270-
} \
271-
PROCESS_SWITCH(TreeCreatorPidTpcQa, process##ParticleNameLong, Form("Process for the %s hypothesis for TPC NSigma QA", #ParticleNameLong), false); \
272-
\
273-
void processFull##ParticleNameLong(CollisionsExtra const& collisions, \
274-
soa::Join<TrackCandidates, aod::pidTPCFull##ParticleNameShort> const& tracks, \
275-
aod::BCsWithTimestamps const&) \
276-
{ \
277-
processSingleParticle<PID::ParticleNameLong, true, false>(collisions, tracks); \
278-
} \
279-
PROCESS_SWITCH(TreeCreatorPidTpcQa, processFull##ParticleNameLong, Form("Process for the %s hypothesis for full TPC PID QA", #ParticleNameLong), false); \
280-
\
281-
void processFullWithTOF##ParticleNameLong(CollisionsExtra const& collisions, \
282-
soa::Join<TrackCandidates, aod::pidTPCFull##ParticleNameShort, aod::pidTOFFull##ParticleNameShort> const& tracks, \
283-
aod::BCsWithTimestamps const&) \
284-
{ \
285-
processSingleParticle<PID::ParticleNameLong, true, true>(collisions, tracks); \
286-
} \
287-
PROCESS_SWITCH(TreeCreatorPidTpcQa, processFullWithTOF##ParticleNameLong, Form("Process for the %s hypothesis for full TPC PID QA with the TOF info added", #ParticleNameLong), false);
264+
#define MAKE_PROCESS_FUNCTIONS(ParticleNameShort, ParticleNameLong) \
265+
void process##ParticleNameLong(CollisionsExtra const& collisions, \
266+
soa::Join<TrackCandidates, aod::pidTPC##ParticleNameShort> const& tracks, \
267+
aod::BCsWithTimestamps const&) \
268+
{ \
269+
processSingleParticle<PID::ParticleNameLong, false, false>(collisions, tracks); \
270+
} \
271+
PROCESS_SWITCH(TreeCreatorPidTpcDiagnostics, process##ParticleNameLong, Form("Process for the %s hypothesis for TPC NSigma QA", #ParticleNameLong), false); \
272+
\
273+
void processFull##ParticleNameLong(CollisionsExtra const& collisions, \
274+
soa::Join<TrackCandidates, aod::pidTPCFull##ParticleNameShort> const& tracks, \
275+
aod::BCsWithTimestamps const&) \
276+
{ \
277+
processSingleParticle<PID::ParticleNameLong, true, false>(collisions, tracks); \
278+
} \
279+
PROCESS_SWITCH(TreeCreatorPidTpcDiagnostics, processFull##ParticleNameLong, Form("Process for the %s hypothesis for full TPC PID QA", #ParticleNameLong), false); \
280+
\
281+
void processFullWithTOF##ParticleNameLong(CollisionsExtra const& collisions, \
282+
soa::Join<TrackCandidates, aod::pidTPCFull##ParticleNameShort, aod::pidTOFFull##ParticleNameShort> const& tracks, \
283+
aod::BCsWithTimestamps const&) \
284+
{ \
285+
processSingleParticle<PID::ParticleNameLong, true, true>(collisions, tracks); \
286+
} \
287+
PROCESS_SWITCH(TreeCreatorPidTpcDiagnostics, processFullWithTOF##ParticleNameLong, Form("Process for the %s hypothesis for full TPC PID QA with the TOF info added", #ParticleNameLong), false);
288288

289289
DO_FOR_ALL_PARTICLES(MAKE_PROCESS_FUNCTIONS)
290290
#undef MAKE_PROCESS_FUNCTIONS
291291
};
292292

293293
WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
294294
{
295-
return WorkflowSpec{adaptAnalysisTask<TreeCreatorPidTpcQa>(cfgc)};
295+
return WorkflowSpec{adaptAnalysisTask<TreeCreatorPidTpcDiagnostics>(cfgc)};
296296
}
297297
#undef DO_FOR_ALL_PARTICLES

DPG/Tasks/AOTTrack/PID/TPC/treeCreatorPidTpcQa.h renamed to DPG/Tasks/TPC/treeCreatorPidTpcDiagnostics.h

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@
99
// granted to it by virtue of its status as an Intergovernmental Organization
1010
// or submit itself to any jurisdiction.
1111

12-
/// \file treeCreatorPidTpcQa.h
12+
/// \file treeCreatorPidTpcDiagnostics.h
1313
/// \author Ana Marin <ana.marin@cern.ch>
1414
/// \author Oleksii Lubynets <oleksii.lubynets@cern.ch>
1515
/// \brief Creates trees with PID QA variables along with variables used for NN training
1616

17-
#ifndef DPG_TASKS_AOTTRACK_PID_TPC_TREECREATORPIDTPCQA_H_
18-
#define DPG_TASKS_AOTTRACK_PID_TPC_TREECREATORPIDTPCQA_H_
17+
#ifndef DPG_TASKS_TPC_TREECREATORPIDTPCDIAGNOSTICS_H_
18+
#define DPG_TASKS_TPC_TREECREATORPIDTPCDIAGNOSTICS_H_
1919

2020
#include "DPG/Tasks/TPC/tpcSkimsTableCreator.h"
2121

@@ -24,16 +24,16 @@
2424

2525
namespace o2::aod
2626
{
27-
namespace dpg_tpcpidqa
27+
namespace dpg_tpcpiddiagnostics
2828
{
2929
DECLARE_SOA_COLUMN(NSigmaTpc, nSigmaTpc, float);
3030
DECLARE_SOA_COLUMN(DedxExpected, dedxExpected, float);
3131
DECLARE_SOA_COLUMN(DedxDiff, dedxDiff, float);
3232
DECLARE_SOA_COLUMN(ExpSigma, expSigma, float);
3333
DECLARE_SOA_COLUMN(NSigmaTof, nSigmaTof, float);
34-
} // namespace dpg_tpcpidqa
34+
} // namespace dpg_tpcpiddiagnostics
3535

36-
DECLARE_SOA_TABLE(QaPidTpc, "AOD", "QAPIDTPC",
36+
DECLARE_SOA_TABLE(PidTpcDiagnostics, "AOD", "PIDTPCDIAG",
3737
tpcskims::IsGoodRct,
3838
tpcskims::PidIndex,
3939
tpcskims::Ft0Occ,
@@ -47,11 +47,11 @@ DECLARE_SOA_TABLE(QaPidTpc, "AOD", "QAPIDTPC",
4747
o2::aod::track::Y,
4848
o2::aod::track::P,
4949
o2::aod::track::Signed1Pt,
50-
dpg_tpcpidqa::NSigmaTpc,
51-
dpg_tpcpidqa::DedxExpected,
52-
dpg_tpcpidqa::DedxDiff,
53-
dpg_tpcpidqa::ExpSigma,
54-
dpg_tpcpidqa::NSigmaTof)
50+
dpg_tpcpiddiagnostics::NSigmaTpc,
51+
dpg_tpcpiddiagnostics::DedxExpected,
52+
dpg_tpcpiddiagnostics::DedxDiff,
53+
dpg_tpcpiddiagnostics::ExpSigma,
54+
dpg_tpcpiddiagnostics::NSigmaTof)
5555
} // namespace o2::aod
5656

57-
#endif // DPG_TASKS_AOTTRACK_PID_TPC_TREECREATORPIDTPCQA_H_
57+
#endif // DPG_TASKS_TPC_TREECREATORPIDTPCDIAGNOSTICS_H_

0 commit comments

Comments
 (0)