|
20 | 20 | #include "Common/DataModel/TrackSelectionTables.h" |
21 | 21 |
|
22 | 22 | #include <CommonConstants/PhysicsConstants.h> |
| 23 | +#include <Framework/ASoA.h> |
| 24 | +#include <Framework/AnalysisDataModel.h> |
23 | 25 | #include <Framework/AnalysisTask.h> |
| 26 | +#include <Framework/Configurable.h> |
| 27 | +#include <Framework/HistogramSpec.h> |
| 28 | +#include <Framework/InitContext.h> |
| 29 | +#include <Framework/OutputObjHeader.h> |
24 | 30 | #include <Framework/HistogramRegistry.h> |
25 | 31 | #include <Framework/runDataProcessing.h> |
26 | 32 |
|
27 | | -#include <Math/Vector4D.h> |
| 33 | +#include <Math/GenVector/LorentzVector.h> |
| 34 | +#include <Math/GenVector/PxPyPzM4D.h> |
| 35 | +#include <Math/Vector4Dfwd.h> |
28 | 36 |
|
29 | 37 | #include <cmath> |
| 38 | +#include <cstddef> |
30 | 39 | #include <cstdint> |
31 | 40 | #include <deque> |
32 | 41 | #include <map> |
@@ -83,9 +92,9 @@ struct F0phiproxy { |
83 | 92 | int sign; |
84 | 93 | double px, py, pz; |
85 | 94 | bool hasTOF; |
86 | | - FourVector vector(double mass) const |
| 95 | + [[nodiscard]] FourVector vector(double mass) const |
87 | 96 | { |
88 | | - return FourVector(px, py, pz, mass); |
| 97 | + return {px, py, pz, mass}; |
89 | 98 | } |
90 | 99 | }; |
91 | 100 | struct Event { |
@@ -266,8 +275,8 @@ struct F0phiproxy { |
266 | 275 | histos.fill(HIST("hPionTOF"), track.pt(), track.tofNSigmaPi()); |
267 | 276 | histos.fill(HIST("hKaonTOF"), track.pt(), track.tofNSigmaKa()); |
268 | 277 | } |
269 | | - TrackCandidate candidate{track.globalIndex(), track.sign(), track.px(), |
270 | | - track.py(), track.pz(), tof}; |
| 278 | + TrackCandidate candidate{.id = track.globalIndex(), .sign = track.sign(), |
| 279 | + .px = track.px(), .py = track.py(), .pz = track.pz(), .hasTOF = tof}; |
271 | 280 | if (passPID(track.tpcNSigmaPi(), track.tofNSigmaPi(), tof, pionTPC, |
272 | 281 | pionTOF)) { |
273 | 282 | event.pions.push_back(candidate); |
@@ -320,8 +329,8 @@ struct F0phiproxy { |
320 | 329 | } |
321 | 330 | }; |
322 | 331 |
|
323 | | -WorkflowSpec defineDataProcessing(ConfigContext const& cfgc) |
| 332 | +WorkflowSpec defineDataProcessing(ConfigContext const& context) |
324 | 333 | { |
325 | 334 | return WorkflowSpec{ |
326 | | - adaptAnalysisTask<F0phiproxy>(cfgc)}; |
| 335 | + adaptAnalysisTask<F0phiproxy>(context)}; |
327 | 336 | } |
0 commit comments