swap occupancy and lifetime axes for backward compatibility

Author: lubynets

PWGHF/D2H/Tasks/taskLc.cxx

@@ -354,18 +354,17 @@ struct HfTaskLc {
         axesWithBdt = {thnAxisMass, thnAxisPt, thnAxisCentrality, thnAxisBdtScoreLcBkg, thnAxisBdtScoreLcPrompt, thnAxisBdtScoreLcNonPrompt, thnAxisTracklets, thnAxisPtB, thnAxisCanType};
       }
 
-      if (storeProperLifetime) {
-        for (const auto& axes : std::array<std::vector<AxisSpec>*, 2>{&axesGen, &axesWithBdt}) {
+      if (storeOccupancy) {
+        for (const auto& axes : std::array<std::vector<AxisSpec>*, 3>{&axesWithBdt, &axesStd, &axesGen}) {
           if (!axes->empty()) {
-            axes->push_back(thnAxisProperLifetime);
+            axes->push_back(thnAxisOccupancy);
           }
         }
       }
-
-      if (storeOccupancy) {
-        for (const auto& axes : std::array<std::vector<AxisSpec>*, 3>{&axesWithBdt, &axesStd, &axesGen}) {
+      if (storeProperLifetime) {
+        for (const auto& axes : std::array<std::vector<AxisSpec>*, 2>{&axesGen, &axesWithBdt}) {
           if (!axes->empty()) {
-            axes->push_back(thnAxisOccupancy);
+            axes->push_back(thnAxisProperLifetime);
           }
         }
       }
@@ -574,12 +573,12 @@ struct HfTaskLc {
               }
               /// Fill the ML outputScores and variables of candidate
               std::vector<double> valuesToFill{massLc, pt, cent, outputBkg, outputPrompt, outputFD, static_cast<double>(numPvContributors), ptRecB, static_cast<double>(originType)};
-              if (storeProperLifetime) {
-                valuesToFill.push_back(properLifetime);
-              }
               if (storeOccupancy && occEstimator != o2::hf_occupancy::OccupancyEstimator::None) {
                 valuesToFill.push_back(occ);
               }
+              if (storeProperLifetime) {
+                valuesToFill.push_back(properLifetime);
+              }
               registry.get<THnSparse>(HIST("hnLcVarsWithBdt"))->Fill(valuesToFill.data());
             } else {
               std::vector<double> valuesToFill{massLc, pt, cent, ptProng0, ptProng1, ptProng2, chi2PCA, decayLength, cpa, static_cast<double>(numPvContributors), ptRecB, static_cast<double>(originType)};
@@ -600,12 +599,12 @@ struct HfTaskLc {
               }
               /// Fill the ML outputScores and variables of candidate (todo: add multiplicity)
               std::vector<double> valuesToFill{massLc, pt, cent, outputBkg, outputPrompt, outputFD, static_cast<double>(numPvContributors), ptRecB, static_cast<double>(originType)};
-              if (storeProperLifetime) {
-                valuesToFill.push_back(properLifetime);
-              }
               if (storeOccupancy && occEstimator != o2::hf_occupancy::OccupancyEstimator::None) {
                 valuesToFill.push_back(occ);
               }
+              if (storeProperLifetime) {
+                valuesToFill.push_back(properLifetime);
+              }
               registry.get<THnSparse>(HIST("hnLcVarsWithBdt"))->Fill(valuesToFill.data());
             } else {
               std::vector<double> valuesToFill{massLc, pt, cent, ptProng0, ptProng1, ptProng2, chi2PCA, decayLength, cpa, static_cast<double>(numPvContributors), ptRecB, static_cast<double>(originType)};
@@ -662,12 +661,12 @@ struct HfTaskLc {
         if (particle.originMcGen() == RecoDecay::OriginType::Prompt) {
           if (fillTHn) {
             std::vector<double> valuesToFill{ptGen, cent, yGen, static_cast<double>(numPvContributors), ptGenB, static_cast<double>(originType)};
-            if (storeProperLifetime) {
-              valuesToFill.push_back(properLifetime);
-            }
             if (storeOccupancy && occEstimator != o2::hf_occupancy::OccupancyEstimator::None) {
               valuesToFill.push_back(occ);
             }
+            if (storeProperLifetime) {
+              valuesToFill.push_back(properLifetime);
+            }
             registry.get<THnSparse>(HIST("hnLcVarsGen"))->Fill(valuesToFill.data());
           }
           registry.fill(HIST("MC/generated/prompt/hPtGenPrompt"), ptGen);
@@ -682,12 +681,12 @@ struct HfTaskLc {
           ptGenB = mcParticles.rawIteratorAt(particle.idxBhadMotherPart()).pt();
           if (fillTHn) {
             std::vector<double> valuesToFill{ptGen, cent, yGen, static_cast<double>(numPvContributors), ptGenB, static_cast<double>(originType)};
-            if (storeProperLifetime) {
-              valuesToFill.push_back(properLifetime);
-            }
             if (storeOccupancy && occEstimator != o2::hf_occupancy::OccupancyEstimator::None) {
               valuesToFill.push_back(occ);
             }
+            if (storeProperLifetime) {
+              valuesToFill.push_back(properLifetime);
+            }
             registry.get<THnSparse>(HIST("hnLcVarsGen"))->Fill(valuesToFill.data());
           }
           registry.fill(HIST("MC/generated/nonprompt/hPtGenNonPrompt"), ptGen);
@@ -791,12 +790,12 @@ struct HfTaskLc {
             }
             /// Fill the ML outputScores and variables of candidate
             std::vector<double> valuesToFill{massLc, pt, cent, outputBkg, outputPrompt, outputFD, static_cast<double>(numPvContributors)};
-            if (storeProperLifetime) {
-              valuesToFill.push_back(properLifetime);
-            }
             if (storeOccupancy && occEstimator != o2::hf_occupancy::OccupancyEstimator::None) {
               valuesToFill.push_back(occ);
             }
+            if (storeProperLifetime) {
+              valuesToFill.push_back(properLifetime);
+            }
             registry.get<THnSparse>(HIST("hnLcVarsWithBdt"))->Fill(valuesToFill.data());
           } else {
             std::vector<double> valuesToFill{massLc, pt, cent, ptProng0, ptProng1, ptProng2, chi2PCA, decayLength, cpa, static_cast<double>(numPvContributors)};
@@ -817,12 +816,12 @@ struct HfTaskLc {
             }
             /// Fill the ML outputScores and variables of candidate
             std::vector<double> valuesToFill{massLc, pt, cent, outputBkg, outputPrompt, outputFD, static_cast<double>(numPvContributors)};
-            if (storeProperLifetime) {
-              valuesToFill.push_back(properLifetime);
-            }
             if (storeOccupancy && occEstimator != o2::hf_occupancy::OccupancyEstimator::None) {
               valuesToFill.push_back(occ);
             }
+            if (storeProperLifetime) {
+              valuesToFill.push_back(properLifetime);
+            }
             registry.get<THnSparse>(HIST("hnLcVarsWithBdt"))->Fill(valuesToFill.data());
           } else {
             std::vector<double> valuesToFill{massLc, pt, cent, ptProng0, ptProng1, ptProng2, chi2PCA, decayLength, cpa, static_cast<double>(numPvContributors)};