|
49 | 49 | #include <TH3.h> |
50 | 50 | #include <THnSparse.h> |
51 | 51 | #include <TMCProcess.h> |
| 52 | +#include <TPDGCode.h> |
52 | 53 | #include <TVector2.h> |
53 | 54 |
|
| 55 | +#include <ReconstructionDataFormats/PID.h> |
| 56 | + |
54 | 57 | #include <algorithm> |
55 | 58 | #include <array> |
56 | 59 | #include <cmath> |
@@ -303,7 +306,7 @@ struct nucleiInJets { |
303 | 306 | if (doprocessJetTracksData && doprocessJetTracksDataLfPid) { |
304 | 307 | LOGP(fatal, "only one process function should be enabled!!!"); |
305 | 308 | } |
306 | | - if (!(mcClosureTrainingFraction >= 0.f && mcClosureTrainingFraction <= 1.f)) { |
| 309 | + if (!(mcClosureTrainingFraction >= 0.f) || !(mcClosureTrainingFraction <= 1.f)) { |
307 | 310 | LOGP(fatal, "mcClosureTrainingFraction must be between 0 and 1, inclusive"); |
308 | 311 | } |
309 | 312 | if (mcClosureSplitSeed == 0) { |
@@ -368,7 +371,9 @@ struct nucleiInJets { |
368 | 371 | if (isPOCollision) { |
369 | 372 | for (const auto& sample : {std::string("tracksInc"), std::string("recInc")}) { |
370 | 373 | for (const auto& species : {std::string("proton"), std::string("antiproton"), std::string("deuteron"), std::string("antideuteron")}) { |
371 | | - const auto base = sample + "/qa/rapidity/" + species; |
| 374 | + auto base = sample; |
| 375 | + base += "/qa/rapidity/"; |
| 376 | + base += species; |
372 | 377 | const bool isMcTruth = sample == "recInc"; |
373 | 378 | const char* yLabTitle = isMcTruth ? "matched primary MC truth; #it{p}_{T} (GeV/#it{c}); #eta; y_{lab}" : "inclusive data; #it{p}_{T} (GeV/#it{c}); #eta; y_{lab}"; |
374 | 379 | const char* yCmsTitle = isMcTruth ? "matched primary MC truth; #it{p}_{T} (GeV/#it{c}); #eta; y_{CMS}" : "inclusive data; #it{p}_{T} (GeV/#it{c}); #eta; y_{CMS}"; |
@@ -1029,10 +1034,7 @@ struct nucleiInJets { |
1029 | 1034 | bool isOccupancyAccepted(const coll& collision) |
1030 | 1035 | { |
1031 | 1036 | auto occupancy{collision.trackOccupancyInTimeRange()}; |
1032 | | - if (occupancy < cfgOccupancyRange->at(0) || occupancy > cfgOccupancyRange->at(1)) |
1033 | | - return false; |
1034 | | - else |
1035 | | - return true; |
| 1037 | + return !(occupancy < cfgOccupancyRange->at(0) || occupancy > cfgOccupancyRange->at(1)); |
1036 | 1038 | } |
1037 | 1039 |
|
1038 | 1040 | int nEvents = 0; |
|
0 commit comments