[PWGCF] NUA corrections with CCDB connection (#9868)

Co-authored-by: ALICE Action Bot <alibuild@cern.ch>

Author: MaximVirta

PWGCF/JCorran/Core/FlowJHistManager.cxx

@@ -10,18 +10,20 @@
 // or submit itself to any jurisdiction.
 
 // Header files.
+#include <vector>
 
 // O2 headers.
 
 // O2 Physics headers.
 #include "PWGCF/JCorran/Core/FlowJHistManager.h"
+#include "CommonConstants/MathConstants.h"
 
 // Namespaces.
 using namespace o2;
 using namespace o2::framework;
 
 /// \brief Create the histograms in the QA registry.
-void FlowJHistManager::CreateHistQA()
+void FlowJHistManager::createHistQA()
 {
   // Security checks for proper use of the method.
   if (!mHistRegistryQA) {
@@ -60,7 +62,7 @@ void FlowJHistManager::CreateHistQA()
   mHistRegistryQA->add("Centrality_00-01/After/histEta", "Pseudorapidity",
                        HistType::kTH1F, {axisEta}, true);
 
-  const AxisSpec axisPhi = {100, 0., 2. * M_PI, "#varphi"};
+  const AxisSpec axisPhi = {100, 0., o2::constants::math::TwoPI, "#varphi"};
   mHistRegistryQA->add("Centrality_00-01/After/histPhi", "Azimuthal angles (no NUA)",
                        HistType::kTH1F, {axisPhi}, true);
 
@@ -145,7 +147,7 @@ void FlowJHistManager::CreateHistQA()
 
   // Clone the first centrality class into the other classes.
   for (int iBin = 1; iBin < mNcentBins; iBin++) {
-    mHistRegistryQA->addClone("Centrality_00-01/", mCentClasses[iBin].data());
+    mHistRegistryQA->addClone("Centrality_00-01/", MCentClasses[iBin].data());
   }
 
   LOGF(info, "QA histograms created.");
@@ -154,7 +156,7 @@ void FlowJHistManager::CreateHistQA()
 /// \brief Get the centrality bin value corresponding to the percentile.
 /// \param Centrality percentile of the collision.
 /// \return Bin for the histograms,...
-int FlowJHistManager::GetCentBin(float cValue)
+int FlowJHistManager::getCentBin(float cValue)
 {
   const float centClasses[] = {0., 1., 2., 5., 10., 20., 30., 40., 50., 60., 70.};
 

PWGCF/JCorran/Core/FlowJHistManager.h

@@ -16,7 +16,6 @@
 #define PWGCF_JCORRAN_CORE_FLOWJSPCANALYSIS_H_
 
 /* Header files. */
-#include <iostream>
 #include <array>
 #include <vector>
 #include <TComplex.h>
@@ -25,64 +24,54 @@
 // O2 headers. //
 #include "Framework/HistogramRegistry.h"
 #include "PWGCF/JCorran/Core/JQVectors.h"
-
-using namespace o2;
-using namespace o2::framework;
-using namespace std;
+#include "CommonConstants/MathConstants.h"
 
 class FlowJSPCAnalysis
 {
  public:
   FlowJSPCAnalysis() = default;
 
-  void SetHistRegistry(HistogramRegistry* histReg) { mHistRegistry = histReg; }
-  Int_t GetCentBin(float cValue);
+  void setHistRegistry(o2::framework::HistogramRegistry* histReg) { mHistRegistry = histReg; }
+  int getCentBin(float cValue);
 
   using JQVectorsT = JQVectors<TComplex, 113, 15, false>;
-  inline void SetQvectors(const JQVectorsT* _qvecs) { qvecs = _qvecs; }
-  void Correlation(Int_t c_nPart, Int_t c_nHarmo, Int_t* harmo, Double_t* correlData);
-  void CalculateCorrelators(const Int_t fCentBin);
-  void FillHistograms(const Int_t fCentBin, Int_t ind, Double_t cNum, Double_t cDenom, Double_t wNum, Double_t wDenom);
-  TComplex Recursion(int n, int* harmonic, int mult, int skip);
-  TComplex Q(const Int_t harmN, const Int_t p);
-
-  void CreateHistos()
+  inline void setQvectors(const JQVectorsT* _qvecs) { qvecs = _qvecs; }
+  void correlation(int c_nPart, int c_nHarmo, int* harmo, double* correlData);
+  void calculateCorrelators(const int fCentBin);
+  void fillHistograms(const int fCentBin, int ind, double cNum, double cDenom, double wNum, double wDenom);
+  void fillQAHistograms(const int fCentBin, double phi, double phiWeight);
+  TComplex recursion(int n, int* harmonic, int mult, int skip);
+  TComplex q(const int harmN, const int p);
+
+  void createHistos()
   {
     if (!mHistRegistry) {
       LOGF(error, "QA histogram registry missing. Quitting...");
       return;
     }
-    mHistRegistry->add("FullCentrality", "FullCentrality", HistType::kTH1D, {{100, 0., 100.}}, true);
-    mHistRegistry->add("Centrality_0/fResults", "Numerators and denominators", {HistType::kTProfile, {{24, 0., 24.}}}, true);
-    mHistRegistry->add("Centrality_0/fCovResults", "Covariance N*D", {HistType::kTProfile, {{48, 0., 48.}}}, true);
+    mHistRegistry->add("FullCentrality", "FullCentrality", o2::framework::HistType::kTH1D, {{100, 0., 100.}}, true);
+    mHistRegistry->add("Centrality_0/fResults", "Numerators and denominators", {o2::framework::HistType::kTProfile, {{24, 0., 24.}}}, true);
+    mHistRegistry->add("Centrality_0/fCovResults", "Covariance N*D", {o2::framework::HistType::kTProfile, {{48, 0., 48.}}}, true);
+    mHistRegistry->add("Centrality_0/phiBefore", "Phi before", {o2::framework::HistType::kTH1D, {{100, 0., o2::constants::math::TwoPI}}}, true);
+    mHistRegistry->add("Centrality_0/phiAfter", "Phi after", {o2::framework::HistType::kTH1D, {{100, 0., o2::constants::math::TwoPI}}}, true);
 
-    for (UInt_t i = 1; i < 8; i++) {
+    for (uint i = 1; i < 8; i++) {
       mHistRegistry->addClone("Centrality_0/", Form("Centrality_%u/", i));
     }
   }
 
-  void SetCorrSet(Int_t obsInd, Int_t harmo[8])
+  void setCorrSet(int obsInd, int harmo[8])
   {
     for (int i = 0; i < 8; i++) {
       fHarmosArray[obsInd][i] = harmo[i];
     }
   }
-  void SetFullCorrSet(Int_t harmo[12][8])
+  void setFullCorrSet(int harmo[12][8])
   {
-    memcpy(fHarmosArray, harmo, sizeof(Int_t) * 12 * 8);
+    memcpy(fHarmosArray, harmo, sizeof(int) * 12 * 8);
   }
 
- private:
-  const Int_t mNqHarmos = 113; ///< Highest harmo for Q(n,p): (v8*14part)+1.
-  const Int_t mNqPowers = 15;  ///< Max power for Q(n,p): 14part+1.
-  const JQVectorsT* qvecs;
-
-  HistogramRegistry* mHistRegistry = nullptr;
-
-  Int_t fHarmosArray[12][8];
-
-  Double_t fCorrelDenoms[14];
-  static constexpr std::string_view mCentClasses[] = {
+  static constexpr std::string_view MCentClasses[] = {
     "Centrality_0/",
     "Centrality_1/",
     "Centrality_2/",
@@ -94,6 +83,17 @@ class FlowJSPCAnalysis
     "Centrality_8/",
     "Centrality_9/"};
 
+ private:
+  const int mNqHarmos = 113; ///< Highest harmo for Q(n,p): (v8*14part)+1.
+  const int mNqPowers = 15;  ///< Max power for Q(n,p): 14part+1.
+  const JQVectorsT* qvecs;
+
+  o2::framework::HistogramRegistry* mHistRegistry = nullptr;
+
+  int fHarmosArray[12][8];
+
+  double fCorrelDenoms[14];
+
   ClassDefNV(FlowJSPCAnalysis, 1);
 };
 #endif // PWGCF_JCORRAN_CORE_FLOWJSPCANALYSIS_H_

PWGCF/JCorran/Core/FlowJSPCAnalysis.cxx

@@ -18,27 +18,23 @@
 // O2 headers. //
 #include "Framework/HistogramRegistry.h"
 
-using namespace o2;
-using namespace o2::framework;
-using namespace std;
-
 const int maxNrComb = 12;
 class FlowJSPCObservables
 {
  public:
   FlowJSPCObservables() = default;
 
-  Int_t harmonicArray[maxNrComb][8] = {{0}};
+  int harmonicArray[maxNrComb][8] = {{0}};
 
-  void SetSPCObservables(Int_t index)
+  void setSPCObservables(int index)
   {
-    // Int_t *harmonicArray = (Int_t*)malloc(sizeof(Int_t)*maxNrComb*8);
+    // int *harmonicArray = (int*)malloc(sizeof(int)*maxNrComb*8);
 
     // Switch to set up correct symmetry plane combinations
     switch (index) {
       case 0: {
         LOGF(info, "Computing three harmonic SPC");
-        Int_t harmonicArray01[maxNrComb][8] = {
+        int harmonicArray01[maxNrComb][8] = {
           {3, 6, -3, -3, 0, 0, 0, 0},
           {3, 4, -2, -2, 0, 0, 0, 0},
           {3, 8, -4, -4, 0, 0, 0, 0},
@@ -52,11 +48,11 @@ class FlowJSPCObservables
           {0, 2, -3, -3, 4, 0, 0, 0},
           {0, 3, 3, -2, -2, -2, 0, 0}};
 
-        memcpy(harmonicArray, harmonicArray01, sizeof(Int_t) * maxNrComb * 8);
+        memcpy(harmonicArray, harmonicArray01, sizeof(int) * maxNrComb * 8);
       } break;
       case 1: {
         LOGF(info, "Computing four harmonic SPC");
-        Int_t harmonicArray02[maxNrComb][8] = {
+        int harmonicArray02[maxNrComb][8] = {
           {4, 6, -2, -2, -2, 0, 0, 0},
           {4, 2, -3, -4, 5, 0, 0, 0},
           {4, 2, -3, -3, 4, 0, 0, 0},
@@ -69,11 +65,11 @@ class FlowJSPCObservables
           {0, 0, 0, 0, 0, 0, 0, 0},
           {0, 0, 0, 0, 0, 0, 0, 0},
           {0, 0, 0, 0, 0, 0, 0, 0}};
-        memcpy(harmonicArray, harmonicArray02, sizeof(Int_t) * maxNrComb * 8);
+        memcpy(harmonicArray, harmonicArray02, sizeof(int) * maxNrComb * 8);
       } break;
       case 3: {
         LOGF(info, "Computing five and six harmonic SPC");
-        Int_t harmonicArray03[maxNrComb][8] = {
+        int harmonicArray03[maxNrComb][8] = {
           {5, 3, 3, -2, -2, -2, 0, 0},
           {5, 2, 2, -3, 4, -5, 0, 0},
           {5, 2, 3, 3, -4, -4, 0, 0},
@@ -86,11 +82,10 @@ class FlowJSPCObservables
           {6, 2, 2, 2, 3, -4, -5, 0},
           {6, 2, 2, 3, 3, -4, -6, 0},
           {0, 0, 0, 0, 0, 0, 0, 0}};
-        memcpy(harmonicArray, harmonicArray03, sizeof(Int_t) * maxNrComb * 8);
+        memcpy(harmonicArray, harmonicArray03, sizeof(int) * maxNrComb * 8);
       } break;
       default:
-        std::cout << "ERROR: Invalid configuration index. Skipping this element."
-                  << std::endl;
+        LOGF(error, "ERROR: Invalid configuration index. Skipping this element.");
     }
   }
 

PWGCF/JCorran/Core/FlowJSPCAnalysis.h

@@ -93,10 +93,10 @@ struct flowJNUACreation {
   void init(InitContext const&)
   {
     // Add histomanager here
-    histManager.SetHistRegistryQA(&qaHistRegistry);
-    histManager.SetDebugLog(false);
-    histManager.SetObtainNUA(true);
-    histManager.CreateHistQA();
+    histManager.setHistRegistryQA(&qaHistRegistry);
+    histManager.setDebugLog(false);
+    histManager.setObtainNUA(true);
+    histManager.createHistQA();
 
     // Add CCDB access here
     ccdb->setURL(cfgCCDB.cfgURL);
@@ -131,13 +131,13 @@ struct flowJNUACreation {
     if (cent < 0. || cent > 70.) {
       return;
     }
-    Int_t cBin = histManager.GetCentBin(cent);
+    Int_t cBin = histManager.getCentBin(cent);
     int nTracks = tracks.size();
 
     for (auto& track : tracks) {
-      histManager.FillTrackQA<1>(track, cBin, 1., 1., coll.posZ());
+      histManager.fillTrackQA<1>(track, cBin, 1., 1., coll.posZ());
     }
-    histManager.FillEventQA<1>(coll, cBin, cent, nTracks);
+    histManager.fillEventQA<1>(coll, cBin, cent, nTracks);
 
     LOGF(info, "Collision analysed. Next...");
   }