restore features removed by branch-related shenanigans

Author: EmilGorm

PWGCF/GenericFramework/Core/FlowPtContainer.cxx

@@ -398,7 +398,6 @@ void FlowPtContainer::initialiseSubevent(const o2::framework::AxisSpec& axis, co
     LOGF(warning, "Multiplicity axis does not exist");
     return;
   }
-
   delete fSubList;
   fSubList = new TList();
   fSubList->SetOwner(kTRUE);
@@ -426,7 +425,6 @@ void FlowPtContainer::initialiseSubevent(const o2::framework::AxisSpec& axis, co
   for (const auto& name : histnames) {
     fSubList->Add(new BootstrapProfile(name.c_str(), this->GetTitle(), nMultiBins, multiBins.data()));
   }
-
   delete fSubCMList;
   fSubCMList = new TList();
   fSubCMList->SetOwner(kTRUE);
@@ -475,7 +473,6 @@ void FlowPtContainer::initialiseSubevent(int nbinsx, double* xbins, const int& m
   if (mpar == 0) {
     mpar = maxOrder;
   }
-
   delete fSubList;
   fSubList = new TList();
   fSubList->SetOwner(kTRUE);
@@ -503,7 +500,6 @@ void FlowPtContainer::initialiseSubevent(int nbinsx, double* xbins, const int& m
   for (const auto& name : histnames) {
     fSubList->Add(new BootstrapProfile(name.c_str(), this->GetTitle(), nbinsx, xbins));
   }
-
   delete fSubCMList;
   fSubCMList = new TList();
   fSubCMList->SetOwner(kTRUE);
@@ -579,7 +575,6 @@ void FlowPtContainer::initialiseSubevent(int nbinsx, double xlow, double xhigh,
   for (const auto& name : histnames) {
     fSubList->Add(new BootstrapProfile(name.c_str(), this->GetTitle(), nbinsx, xlow, xhigh));
   }
-
   delete fSubCMList;
   fSubCMList = new TList();
   fSubCMList->SetOwner(kTRUE);
@@ -694,6 +689,45 @@ void FlowPtContainer::fillPtProfiles(const double& centmult, const double& rn)
     }
   }
 }
+bool FlowPtContainer::addPtProfile(const char* name, int observableOrder)
+{
+  if (!fCorrList || !name || (name[0] == 0) || observableOrder < 1 || observableOrder > mpar) {
+    LOGF(error, "Cannot add pT profile %s for order %d", name ? name : "(null)", observableOrder);
+    return false;
+  }
+  const std::string profileName{name};
+  if (fCorrList->FindObject(profileName.c_str())) {
+    LOGF(error, "pT profile %s already exists", profileName.c_str());
+    return false;
+  }
+  auto* original = dynamic_cast<BootstrapProfile*>(fCorrList->At(observableOrder - 1));
+  const auto* axis = original->GetXaxis();
+  BootstrapProfile* profile = nullptr;
+  if (axis->GetXbins()->GetSize() != 0) {
+    profile = new BootstrapProfile(profileName.c_str(), profileName.c_str(), axis->GetNbins(), axis->GetXbins()->GetArray());
+  } else {
+    profile = new BootstrapProfile(profileName.c_str(), profileName.c_str(), axis->GetNbins(), axis->GetXmin(), axis->GetXmax());
+  }
+  if (original->fListOfEntries) {
+    profile->InitializeSubsamples(original->fListOfEntries->GetEntries());
+  }
+  fCorrList->Add(profile);
+  return true;
+}
+bool FlowPtContainer::fillPtProfile(const char* name, int observableOrder, double mult, double eventWeight, double rn)
+{
+  if (!fCorrList || !name || observableOrder < 1 || observableOrder > mpar ||
+      static_cast<size_t>(observableOrder) >= corrDen.size() || corrDen[observableOrder] == 0. || eventWeight == 0.) {
+    return false;
+  }
+  auto* profile = dynamic_cast<BootstrapProfile*>(fCorrList->FindObject(name));
+  if (!profile) {
+    LOGF(error, "pT profile %s has not been booked", name);
+    return false;
+  }
+  profile->FillProfile(mult, corrNum[observableOrder] / corrDen[observableOrder], eventWeight, rn);
+  return true;
+}
 void FlowPtContainer::fillSubeventPtProfiles(const double& centmult, const double& rn)
 {
   int histCounter = 0;

PWGCF/GenericFramework/Core/FlowPtContainer.h

@@ -68,6 +68,10 @@ class FlowPtContainer : public TNamed
   void calculateSubeventCorrelations();
   void calculateCMTerms();
   void fillPtProfiles(const double& centmult, const double& rn);
+  // Book and fill a separate pT observable with a weight calculated by the task.
+  // The task can supply a separate event weight for the same observable.
+  bool addPtProfile(const char* name, int observableOrder);
+  bool fillPtProfile(const char* name, int observableOrder, double mult, double eventWeight, double rn);
   void fillSubeventPtProfiles(const double& centmult, const double& rn);
   void fillVnPtCorrProfiles(const double& centmult, const double& flowval, const double& flowtuples, const double& rn, uint8_t mask);
   void fillVnDeltaPtProfiles(const double& centmult, const double& flowval, const double& flowtuples, const double& rn, uint8_t mask);

PWGCF/GenericFramework/Tasks/flowGenericFramework.cxx

@@ -878,7 +878,7 @@ struct FlowGenericFramework {
           if (resonance ? !cfgFill.cfgAnalyseK0Lambda : !cfgFill.cfgAnalyseChargedHadrons) {
             continue;
           }
-          const std::string target = source + (source.rfind("npt_v02_", 0) == 0 ? "_w3pc" : "_w2pc");
+          const std::string target = source + (source.starts_with("npt_v02_") ? "_w3pc" : "_w2pc");
           if (doprocessData || doprocessRun2 || doprocessMCReco || doprocessMC) {
             registry.addClone(source, target);
           }
@@ -1685,6 +1685,8 @@ struct FlowGenericFramework {
           case 5:
             fillFractionProfile<dt>(HIST("npt_v02_Lambda_sb2_w3pc"), HIST("MCGen/npt_v02_Lambda_sb2_w3pc"), pt, centmult, fraction, weight);
             break;
+          default:
+            return;
         }
       } else {
         switch (index) {
@@ -1700,6 +1702,8 @@ struct FlowGenericFramework {
           case 3:
             fillFractionProfile<dt>(HIST("npt_v02_pr_w3pc"), HIST("MCGen/npt_v02_pr_w3pc"), pt, centmult, fraction, weight);
             break;
+          default:
+            return;
         }
       }
     } else {
@@ -1723,6 +1727,8 @@ struct FlowGenericFramework {
           case 5:
             fillFractionProfile<dt>(HIST("npt_v0_Lambda_sb2_w2pc"), HIST("MCGen/npt_v0_Lambda_sb2_w2pc"), pt, centmult, fraction, weight);
             break;
+          default:
+            return;
         }
       } else {
         switch (index) {
@@ -1738,6 +1744,8 @@ struct FlowGenericFramework {
           case 3:
             fillFractionProfile<dt>(HIST("npt_v0_pr_w2pc"), HIST("MCGen/npt_v0_pr_w2pc"), pt, centmult, fraction, weight);
             break;
+          default:
+            return;
         }
       }
     }