[PWGCF] flow-runbyrun: add a class to hold the list of weight (#9129)

Author: Luzhiyongg

PWGCF/Flow/Tasks/flowRunbyRun.cxx

@@ -38,6 +38,7 @@
 #include "GFW.h"
 #include "GFWCumulant.h"
 #include "GFWWeights.h"
+#include "GFWWeightsList.h"
 #include "FlowContainer.h"
 #include "TList.h"
 #include <TProfile.h>
@@ -62,6 +63,7 @@ struct FlowRunbyRun {
   O2_DEFINE_CONFIGURABLE(cfgCutChi2prTPCcls, float, 2.5, "Chi2 per TPC clusters")
   O2_DEFINE_CONFIGURABLE(cfgCutDCAz, float, 2.0f, "max DCA to vertex z")
   O2_DEFINE_CONFIGURABLE(cfgUseNch, bool, false, "Use Nch for flow observables")
+  O2_DEFINE_CONFIGURABLE(cfgNbootstrap, int, 30, "Number of subsamples")
   O2_DEFINE_CONFIGURABLE(cfgOutputNUAWeightsRefPt, bool, false, "NUA weights are filled in ref pt bins")
   O2_DEFINE_CONFIGURABLE(cfgDynamicRunNumber, bool, false, "Add runNumber during runtime")
   Configurable<std::vector<int>> cfgRunNumbers{"cfgRunNumbers", std::vector<int>{544095, 544098, 544116, 544121, 544122, 544123, 544124}, "Preconfigured run numbers"};
@@ -84,7 +86,7 @@ struct FlowRunbyRun {
 
   // Define output
   OutputObj<FlowContainer> fFC{FlowContainer("FlowContainer")};
-  OutputObj<TList> fWeightList{"WeightList", OutputObjHandlingPolicy::AnalysisObject, OutputObjSourceType::OutputObjSource};
+  OutputObj<GFWWeightsList> fGFWWeightsList{GFWWeightsList("GFWWeightsList")};
   HistogramRegistry registry{"registry"};
 
   // define global variables
@@ -97,7 +99,6 @@ struct FlowRunbyRun {
   std::vector<int> runNumbers;                                        // vector of run numbers
   std::map<int, std::vector<std::shared_ptr<TH1>>> th1sList;          // map of histograms for all runs
   std::map<int, std::vector<std::shared_ptr<TProfile>>> profilesList; // map of profiles for all runs
-  std::map<int, GFWWeights*> weightsList;                             // map of weights for all runs
   enum OutputTH1Names {
     // here are TProfiles for vn-pt correlations that are not implemented in GFW
     hPhi = 0,
@@ -122,9 +123,7 @@ struct FlowRunbyRun {
     ccdb->setCaching(true);
     ccdb->setCreatedNotAfter(ccdbNoLaterThan.value);
 
-    TList* weightlist = new TList();
-    weightlist->SetOwner(true);
-    fWeightList.setObject(weightlist);
+    fGFWWeightsList->init("weightList");
 
     // Add output histograms to the registry
     runNumbers = cfgRunNumbers;
@@ -148,7 +147,7 @@ struct FlowRunbyRun {
     }
     fFC->SetName("FlowContainer");
     fFC->SetXAxis(fPtAxis);
-    fFC->Initialize(oba, axisIndependent, 1);
+    fFC->Initialize(oba, axisIndependent, cfgNbootstrap);
     delete oba;
 
     fGFW->AddRegion("full", -0.8, 0.8, 1, 1);
@@ -230,11 +229,7 @@ struct FlowRunbyRun {
     o2::framework::AxisSpec axis = axisPt;
     int nPtBins = axis.binEdges.size() - 1;
     double* ptBins = &(axis.binEdges)[0];
-    GFWWeights* weight = new GFWWeights(Form("weight_%d", runNumber));
-    weight->SetPtBins(nPtBins, ptBins);
-    weight->Init(true, false);
-    fWeightList->Add(weight);
-    weightsList.insert(std::make_pair(runNumber, weight));
+    fGFWWeightsList->addGFWWeightsByRun(runNumber, nPtBins, ptBins, true, false);
   }
 
   void process(AodCollisions::iterator const& collision, aod::BCsWithTimestamps const&, AodTracks const& tracks)
@@ -277,10 +272,21 @@ struct FlowRunbyRun {
         fGFW->Fill(track.eta(), 1, track.phi(), wacc * weff, 1);
       }
       if (cfgOutputNUAWeightsRefPt) {
-        if (withinPtRef)
-          weightsList[runNumber]->Fill(track.phi(), track.eta(), collision.posZ(), track.pt(), cent, 0);
+        if (withinPtRef) {
+          GFWWeights* weight = fGFWWeightsList->getGFWWeightsByRun(runNumber);
+          if (!weight) {
+            LOGF(fatal, "Could not find the weight for run %d", runNumber);
+            return;
+          }
+          weight->Fill(track.phi(), track.eta(), collision.posZ(), track.pt(), cent, 0);
+        }
       } else {
-        weightsList[runNumber]->Fill(track.phi(), track.eta(), collision.posZ(), track.pt(), cent, 0);
+        GFWWeights* weight = fGFWWeightsList->getGFWWeightsByRun(runNumber);
+        if (!weight) {
+          LOGF(fatal, "Could not find the weight for run %d", runNumber);
+          return;
+        }
+        weight->Fill(track.phi(), track.eta(), collision.posZ(), track.pt(), cent, 0);
       }
     }
 

PWGCF/GenericFramework/Core/CMakeLists.txt

@@ -16,6 +16,7 @@ o2physics_add_library(GFWCore
                         ProfileSubset.cxx
                         FlowContainer.cxx
                         GFWWeights.cxx
+                        GFWWeightsList.cxx
                         FlowPtContainer.cxx
                         BootstrapProfile.cxx
                PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore)
@@ -27,6 +28,7 @@ o2physics_target_root_dictionary(GFWCore
                       ProfileSubset.h
                       FlowContainer.h
                       GFWWeights.h
+                      GFWWeightsList.h
                       GFWConfig.h
                       FlowPtContainer.h
                       BootstrapProfile.h

PWGCF/GenericFramework/Core/GFWWeightsList.cxx

@@ -0,0 +1,87 @@
+// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
+// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
+// All rights not expressly granted are reserved.
+//
+// This software is distributed under the terms of the GNU General Public
+// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
+//
+// In applying this license CERN does not waive the privileges and immunities
+// granted to it by virtue of its status as an Intergovernmental Organization
+// or submit itself to any jurisdiction.
+
+/// \file   GFWWeightsList.cxx
+/// \author Zhiyong Lu (zhiyong.lu@cern.ch)
+/// \since  Dec/25/2024
+/// \brief  one object to hold a list of GFWWeights objects,
+
+#include <utility>
+#include <cstdio>
+#include "GFWWeightsList.h"
+
+GFWWeightsList::GFWWeightsList() : TNamed("", ""), list(0)
+{
+  runNumerMap.clear();
+}
+
+GFWWeightsList::GFWWeightsList(const char* name) : TNamed(name, name), list(0)
+{
+  runNumerMap.clear();
+}
+
+GFWWeightsList::~GFWWeightsList()
+{
+  delete list;
+  runNumerMap.clear();
+}
+
+void GFWWeightsList::init(const char* listName)
+{
+  list = new TObjArray();
+  list->SetName(listName);
+  list->SetOwner(kTRUE);
+}
+
+void GFWWeightsList::addGFWWeightsByName(const char* weightName, int nPtBins, double* ptBins, bool addData, bool addMC)
+{
+  if (!list) {
+    init("weightList");
+  }
+  GFWWeights* weight = new GFWWeights(weightName);
+  weight->SetPtBins(nPtBins, ptBins);
+  weight->Init(addData, addMC);
+  list->Add(weight);
+}
+
+GFWWeights* GFWWeightsList::getGFWWeightsByName(const char* weightName)
+{
+  if (!list) {
+    printf("Error: weight list is not initialized\n");
+    return nullptr;
+  }
+  return reinterpret_cast<GFWWeights*>(list->FindObject(weightName));
+}
+
+void GFWWeightsList::addGFWWeightsByRun(int runNumber, int nPtBins, double* ptBins, bool addData, bool addMC)
+{
+  if (!list) {
+    init("weightList");
+  }
+  GFWWeights* weight = new GFWWeights(Form("weight_%d", runNumber));
+  weight->SetPtBins(nPtBins, ptBins);
+  weight->Init(addData, addMC);
+  list->Add(weight);
+  runNumerMap.insert(std::make_pair(runNumber, weight));
+}
+
+GFWWeights* GFWWeightsList::getGFWWeightsByRun(int runNumber)
+{
+  if (!list) {
+    printf("Error: weight list is not initialized\n");
+    return nullptr;
+  }
+  if (!runNumerMap.contains(runNumber)) {
+    printf("Error: weight for run %d is not found\n", runNumber);
+    return nullptr;
+  }
+  return runNumerMap.at(runNumber);
+}

PWGCF/GenericFramework/Core/GFWWeightsList.h

@@ -0,0 +1,43 @@
+// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
+// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
+// All rights not expressly granted are reserved.
+//
+// This software is distributed under the terms of the GNU General Public
+// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
+//
+// In applying this license CERN does not waive the privileges and immunities
+// granted to it by virtue of its status as an Intergovernmental Organization
+// or submit itself to any jurisdiction.
+
+/// \file   GFWWeightsList.h
+/// \author Zhiyong Lu (zhiyong.lu@cern.ch)
+/// \since  Dec/25/2024
+/// \brief  one object to hold a list of GFWWeights objects,
+
+#ifndef PWGCF_GENERICFRAMEWORK_CORE_GFWWEIGHTSLIST_H_
+#define PWGCF_GENERICFRAMEWORK_CORE_GFWWEIGHTSLIST_H_
+#include <map>
+#include "TObjArray.h"
+#include "GFWWeights.h"
+
+class GFWWeightsList : public TNamed
+{
+ public:
+  GFWWeightsList();
+  explicit GFWWeightsList(const char* name);
+  ~GFWWeightsList();
+  void init(const char* listName);
+  void addGFWWeightsByName(const char* weightName, int nPtBins, double* ptBins, bool addData = kTRUE, bool addMC = kTRUE);
+  GFWWeights* getGFWWeightsByName(const char* weightName);
+  void addGFWWeightsByRun(int runNumber, int nPtBins, double* ptBins, bool addData = kTRUE, bool addMC = kTRUE);
+  GFWWeights* getGFWWeightsByRun(int runNumber);
+  TObjArray* getList() const { return list; }
+
+ private:
+  TObjArray* list;
+  std::map<int, GFWWeights*> runNumerMap;
+
+  ClassDef(GFWWeightsList, 1);
+};
+
+#endif // PWGCF_GENERICFRAMEWORK_CORE_GFWWEIGHTSLIST_H_

PWGCF/GenericFramework/Core/GenericFrameworkLinkDef.h

@@ -22,6 +22,7 @@
 #pragma link C++ class ProfileSubset + ;
 #pragma link C++ class FlowContainer + ;
 #pragma link C++ class GFWWeights + ;
+#pragma link C++ class GFWWeightsList + ;
 #pragma link C++ class BootstrapProfile + ;
 #pragma link C++ class FlowPtContainer + ;
 #pragma link C++ class o2::analysis::genericframework::GFWBinningCuts + ;