|
18 | 18 |
|
19 | 19 | #include "Common/Core/EventPlaneHelper.h" |
20 | 20 | #include "Common/Core/TrackSelection.h" |
21 | | -#include "Common/DataModel/Centrality.h" |
22 | 21 | #include "Common/DataModel/EventSelection.h" |
23 | 22 | #include "Common/DataModel/Qvectors.h" |
24 | 23 | #include "Common/DataModel/TrackSelectionTables.h" |
| 24 | +#include "Common/DataModel/Centrality.h" |
25 | 25 |
|
26 | 26 | #include "CCDB/BasicCCDBManager.h" |
27 | 27 | #include "CCDB/CcdbApi.h" |
|
30 | 30 | #include "Framework/RunningWorkflowInfo.h" |
31 | 31 | #include "Framework/runDataProcessing.h" |
32 | 32 |
|
33 | | -#include <TDatabasePDG.h> |
34 | | - |
35 | 33 | #include <string> |
36 | 34 | #include <vector> |
37 | 35 |
|
| 36 | +#include <TDatabasePDG.h> |
| 37 | + |
38 | 38 | using namespace o2; |
39 | 39 | using namespace o2::framework; |
40 | 40 | using namespace o2::framework::expressions; |
41 | 41 | using namespace std; |
42 | 42 |
|
43 | | -using MyCollisions = soa::Join<aod::Collisions, aod::EvSels, aod::Qvectors>; |
44 | | -using MyTracks = soa::Join<aod::Tracks, aod::TracksExtra, aod::TracksDCA, aod::TrackSelection>; |
45 | | -using MyCollisionsMC = soa::Join<aod::Collisions, aod::EvSels, aod::CentFT0Cs, aod::McCollisionLabels>; |
46 | | -using MyTracksMC = soa::Join<aod::Tracks, aod::TracksExtra, aod::TracksDCA, aod::TrackSelection, aod::McTrackLabels>; |
47 | | - |
48 | 43 | struct jEPFlowAnalysis { |
49 | | - |
50 | 44 | HistogramRegistry epFlowHistograms{"EPFlow", {}, OutputObjHandlingPolicy::AnalysisObject, true, true}; |
51 | 45 | EventPlaneHelper helperEP; |
52 | 46 | FlowJHistManager histManager; |
@@ -109,6 +103,11 @@ struct jEPFlowAnalysis { |
109 | 103 |
|
110 | 104 | Filter trackFilter = (aod::track::pt > cfgTrackCuts.cfgPtMin) && (nabs(aod::track::eta) < cfgTrackCuts.cfgEtaMax); |
111 | 105 |
|
| 106 | + using MyCollisions = soa::Join<aod::Collisions, aod::EvSels, aod::Qvectors>; |
| 107 | + using MyTracks = soa::Filtered<soa::Join<aod::Tracks, aod::TracksExtra, aod::TracksDCA, aod::TrackSelection>>; |
| 108 | + using MyCollisionsMC = soa::Join<aod::Collisions, aod::EvSels, aod::CentFT0Cs, aod::McCollisionLabels>; |
| 109 | + using MyTracksMC = soa::Join<aod::Tracks, aod::TracksExtra, aod::TracksDCA, aod::TrackSelection, aod::McTrackLabels>; |
| 110 | + |
112 | 111 | int detId; |
113 | 112 | int refAId; |
114 | 113 | int refBId; |
@@ -169,6 +168,12 @@ struct jEPFlowAnalysis { |
169 | 168 | if (std::abs(track.dcaXY()) >= cfgdcaXY0 + cfgdcaXY1 / std::pow(track.pt(), 1.1) && cfgSystStudy) { |
170 | 169 | tracksel += 64; |
171 | 170 | } |
| 171 | + if (track.pt() <= cfgTrackCuts.cfgPtMin) { |
| 172 | + tracksel += 128; |
| 173 | + } |
| 174 | + if (std::abs(track.eta()) >= cfgTrackCuts.cfgEtaMax) { |
| 175 | + tracksel += 256; |
| 176 | + } |
172 | 177 |
|
173 | 178 | return tracksel; |
174 | 179 | } |
@@ -458,8 +463,7 @@ struct jEPFlowAnalysis { |
458 | 463 |
|
459 | 464 | void processMCGen(MyCollisionsMC::iterator const& coll, aod::McParticles const& mcParticles, aod::McCollisions const&) |
460 | 465 | { |
461 | | - if (!coll.has_mcCollision()) |
462 | | - return; |
| 466 | + if (!coll.has_mcCollision()) return; |
463 | 467 | const auto mcColl = coll.mcCollision(); |
464 | 468 |
|
465 | 469 | if (cfgAddEvtSel) { |
|
0 commit comments