|
19 | 19 | // o2-analysis-pid-tof-base, o2-analysis-multiplicity-table, o2-analysis-event-selection |
20 | 20 | // (to add flow: o2-analysis-qvector-table, o2-analysis-centrality-table) |
21 | 21 |
|
22 | | -#include <algorithm> |
23 | | -#include <cmath> |
24 | | -#include <memory> |
25 | | -#include <string> |
26 | | -#include <vector> |
27 | | - |
28 | | -#include "Math/Vector4D.h" |
29 | | - |
30 | | -#include "CCDB/BasicCCDBManager.h" |
| 22 | +#include "PWGLF/DataModel/EPCalibrationTables.h" |
| 23 | +#include "PWGLF/DataModel/LFSlimNucleiTables.h" |
| 24 | +#include "PWGLF/Utils/nucleiUtils.h" |
31 | 25 |
|
| 26 | +#include "Common/Core/EventPlaneHelper.h" |
| 27 | +#include "Common/Core/PID/PIDTOF.h" |
| 28 | +#include "Common/Core/RecoDecay.h" |
32 | 29 | #include "Common/Core/TrackSelection.h" |
33 | 30 | #include "Common/Core/trackUtilities.h" |
34 | 31 | #include "Common/DataModel/Centrality.h" |
35 | | -#include "Common/DataModel/Multiplicity.h" |
36 | 32 | #include "Common/DataModel/EventSelection.h" |
| 33 | +#include "Common/DataModel/Multiplicity.h" |
37 | 34 | #include "Common/DataModel/PIDResponse.h" |
38 | 35 | #include "Common/DataModel/PIDResponseITS.h" |
| 36 | +#include "Common/DataModel/Qvectors.h" |
39 | 37 | #include "Common/DataModel/TrackSelectionTables.h" |
40 | | -#include "Common/Core/PID/PIDTOF.h" |
41 | 38 | #include "Common/TableProducer/PID/pidTOFBase.h" |
42 | | -#include "Common/Core/EventPlaneHelper.h" |
43 | | -#include "Common/DataModel/Qvectors.h" |
44 | 39 | #include "Common/Tools/TrackTuner.h" |
45 | | -#include "Common/Core/RecoDecay.h" |
| 40 | +#include "EventFiltering/Zorro.h" |
| 41 | +#include "EventFiltering/ZorroSummary.h" |
46 | 42 |
|
| 43 | +#include "CCDB/BasicCCDBManager.h" |
47 | 44 | #include "DataFormatsParameters/GRPMagField.h" |
48 | 45 | #include "DataFormatsParameters/GRPObject.h" |
49 | 46 | #include "DataFormatsTPC/BetheBlochAleph.h" |
50 | 47 | #include "DetectorsBase/GeometryManager.h" |
51 | 48 | #include "DetectorsBase/Propagator.h" |
52 | | - |
53 | | -#include "EventFiltering/Zorro.h" |
54 | | -#include "EventFiltering/ZorroSummary.h" |
55 | | - |
| 49 | +#include "Framework/ASoAHelpers.h" |
56 | 50 | #include "Framework/AnalysisDataModel.h" |
57 | 51 | #include "Framework/AnalysisTask.h" |
58 | | -#include "Framework/ASoAHelpers.h" |
59 | 52 | #include "Framework/HistogramRegistry.h" |
60 | 53 | #include "Framework/runDataProcessing.h" |
61 | | - |
62 | 54 | #include "ReconstructionDataFormats/Track.h" |
63 | 55 |
|
64 | | -#include "PWGLF/DataModel/EPCalibrationTables.h" |
65 | | -#include "PWGLF/DataModel/LFSlimNucleiTables.h" |
66 | | - |
| 56 | +#include "Math/Vector4D.h" |
67 | 57 | #include "TRandom3.h" |
68 | 58 |
|
69 | | -#include "nucleiUtils.h" |
| 59 | +#include <algorithm> |
| 60 | +#include <cmath> |
| 61 | +#include <memory> |
| 62 | +#include <string> |
| 63 | +#include <vector> |
70 | 64 |
|
71 | 65 | using namespace o2; |
72 | 66 | using namespace o2::framework; |
@@ -257,7 +251,7 @@ struct nucleiFlowTree { |
257 | 251 | spectra.add("hTpcSignalDataSelected", "Specific energy loss for selected particles", HistType::kTH2F, {{600, -6., 6., "#it{p} (GeV/#it{c})"}, {1400, 0, 1400, "d#it{E} / d#it{X} (a. u.)"}}); |
258 | 252 | spectra.add("hTofSignalData", "TOF beta", HistType::kTH2F, {{500, 0., 5., "#it{p} (GeV/#it{c})"}, {750, 0, 1.5, "TOF #beta"}}); |
259 | 253 |
|
260 | | - for (int iS{0}; iS < nuclei::species; ++iS) { |
| 254 | + for (int iS{0}; iS < nuclei::Species::kNspecies; ++iS) { |
261 | 255 | for (int iMax{0}; iMax < 2; ++iMax) { |
262 | 256 | nuclei::pidCutTPC[iS][iMax] = cfgNsigmaTPC->get(iS, iMax); // changed pidCut to pidCutTPC so that it compiles TODO: check if it is correct |
263 | 257 | } |
@@ -328,7 +322,7 @@ struct nucleiFlowTree { |
328 | 322 | bool selectedTPC[5]{false}, goodToAnalyse{false}; |
329 | 323 | std::array<float, 5> nSigmaTPC; |
330 | 324 |
|
331 | | - for (int iS{0}; iS < nuclei::species; ++iS) { |
| 325 | + for (int iS{0}; iS < nuclei::Species::kNspecies; ++iS) { |
332 | 326 |
|
333 | 327 | double expBethe{tpc::BetheBlochAleph(static_cast<double>(correctedTpcInnerParam * bgScalings[iS][iC]), cfgBetheBlochParams->get(iS, 0u), cfgBetheBlochParams->get(iS, 1u), cfgBetheBlochParams->get(iS, 2u), cfgBetheBlochParams->get(iS, 3u), cfgBetheBlochParams->get(iS, 4u))}; |
334 | 328 |
|
@@ -371,7 +365,7 @@ struct nucleiFlowTree { |
371 | 365 | if (!collision.selection_bit(o2::aod::evsel::kNoITSROFrameBorder)) { |
372 | 366 | flag |= kITSrof; |
373 | 367 | } |
374 | | - for (int iS{0}; iS < nuclei::species; ++iS) { |
| 368 | + for (int iS{0}; iS < nuclei::Species::kNspecies; ++iS) { |
375 | 369 | bool selectedTOF{false}; |
376 | 370 | if (std::abs(dcaInfo[1]) > cfgDCAcut->get(iS, 1)) { |
377 | 371 | continue; |
|
0 commit comments