|
19 | 19 | #include "ALICE3/DataModel/OTFCollision.h" |
20 | 20 | #include "ALICE3/DataModel/collisionAlice3.h" |
21 | 21 | #include "ALICE3/DataModel/tracksAlice3.h" |
22 | | -#include "Common/Core/RecoDecay.h" |
23 | 22 | #include "Common/DataModel/TrackSelectionTables.h" |
24 | 23 |
|
25 | 24 | #include <Framework/AnalysisDataModel.h> |
@@ -130,7 +129,7 @@ struct Alice3TrackingTranslator { |
130 | 129 | } |
131 | 130 | Long64_t getEntries() const { return mTree->GetEntries(); } |
132 | 131 | TFile mFile; |
133 | | - TTree* mTree; |
| 132 | + TTree* mTree{nullptr}; |
134 | 133 | }; |
135 | 134 |
|
136 | 135 | struct ParticleStruct : public FileStruct { |
@@ -433,7 +432,7 @@ struct Alice3TrackingTranslator { |
433 | 432 | std::map<Key, int> barcodeToGlobalIdx; |
434 | 433 | std::map<int, std::vector<float>> globalToVertexPosition; |
435 | 434 | std::map<int, int> GlobalIdxToMotherIdx; |
436 | | - std::map<int, int> GlobalIdxSecVertexRadiusIncoming; |
| 435 | + std::map<int, float> GlobalIdxSecVertexRadiusIncoming; |
437 | 436 | std::map<int, int> GlobalIdxToPDGCode; |
438 | 437 | std::map<int, int> GlobalToLocalIdx; |
439 | 438 | std::map<int, std::vector<int>> GlobalIdxToDaughterIdxs; |
@@ -497,20 +496,20 @@ struct Alice3TrackingTranslator { |
497 | 496 | float secondaryVertexRadius = -1.0f; |
498 | 497 | int globalIdx = firstIdxThisEvent + static_cast<int>(iPart); |
499 | 498 | int motherIdx = -1; |
500 | | - if (GlobalIdxToMotherIdx.find(globalIdx) != GlobalIdxToMotherIdx.end()) { |
| 499 | + if (GlobalIdxToMotherIdx.contains(globalIdx)) { |
501 | 500 | motherIdx = GlobalIdxToMotherIdx[globalIdx]; |
502 | 501 | } |
503 | 502 | int firstDaughter = -1; |
504 | 503 | int secondDaughter = -1; |
505 | | - if (GlobalIdxToDaughterIdxs.find(globalIdx) != GlobalIdxToDaughterIdxs.end()) { |
| 504 | + if (GlobalIdxToDaughterIdxs.contains(globalIdx)) { |
506 | 505 | const auto& daughters = GlobalIdxToDaughterIdxs[globalIdx]; |
507 | | - if (daughters.size() > 0) { |
| 506 | + if (!daughters.empty()) { |
508 | 507 | firstDaughter = daughters[0]; |
509 | 508 | } |
510 | 509 | if (daughters.size() > 1) { |
511 | 510 | secondDaughter = daughters[1]; |
512 | 511 | } |
513 | | - if (globalToVertexPosition.find(globalIdx) != globalToVertexPosition.end()) { |
| 512 | + if (globalToVertexPosition.contains(globalIdx)) { |
514 | 513 | const auto& vertexPos = globalToVertexPosition[globalIdx]; |
515 | 514 | secondaryVertexRadius = std::hypot(vertexPos[0] * 0.1, vertexPos[1] * 0.1); |
516 | 515 | } |
@@ -760,17 +759,17 @@ struct Alice3TrackingTranslator { |
760 | 759 | } |
761 | 760 | }; |
762 | 761 |
|
763 | | -o2::framework::WorkflowSpec defineDataProcessing(o2::framework::ConfigContext const& cfgc) |
| 762 | +o2::framework::WorkflowSpec defineDataProcessing(o2::framework::ConfigContext const& context) |
764 | 763 | { |
765 | 764 | o2::framework::WorkflowSpec w; |
766 | | - if (cfgc.options().hasOption("aod-file")) { |
767 | | - std::string inputFile = cfgc.options().get<std::string>("aod-file"); |
| 765 | + if (context.options().hasOption("aod-file")) { |
| 766 | + auto inputFile = context.options().get<std::string>("aod-file"); |
768 | 767 | if (!inputFile.empty()) { |
769 | 768 | LOG(info) << " " << inputFile; |
770 | 769 | TString tinputFile(inputFile.c_str()); |
771 | 770 | inputPath = gSystem->DirName(tinputFile); |
772 | 771 | } |
773 | 772 | } |
774 | | - w.push_back(adaptAnalysisTask<Alice3TrackingTranslator>(cfgc)); |
| 773 | + w.push_back(adaptAnalysisTask<Alice3TrackingTranslator>(context)); |
775 | 774 | return w; |
776 | 775 | } |
0 commit comments