fix conflicts

Author: Emil Gorm Nielsen

PWGCF/Flow/Tasks/flowGfwTask.cxx

@@ -332,8 +332,8 @@ struct FlowGfwTask {
     fPtAxis = new TAxis(nPtBins, ptBins);
 
     if (cfgOutputNUAWeights) {
-      fWeights->SetPtBins(nPtBins, ptBins);
-      fWeights->Init(true, false);
+      fWeights->setPtBins(nPtBins, ptBins);
+      fWeights->init(true, false);
     }
 
     // add in FlowContainer to Get boostrap sample automatically
@@ -477,7 +477,7 @@ struct FlowGfwTask {
       return false;
     weight_nue = 1. / eff;
     if (mAcceptance)
-      weight_nua = mAcceptance->GetNUA(phi, eta, vtxz);
+      weight_nua = mAcceptance->getNUA(phi, eta, vtxz);
     else
       weight_nua = 1;
     return true;
@@ -716,7 +716,7 @@ struct FlowGfwTask {
         continue;
 
       if (cfgOutputNUAWeights)
-        fWeights->Fill(track.phi(), track.eta(), vtxz, track.pt(), centrality, 0);
+        fWeights->fill(track.phi(), track.eta(), vtxz, track.pt(), centrality, 0);
 
       if (!setCurrentParticleWeights(weff, wacc, track.phi(), track.eta(), track.pt(), vtxz))
         continue;

PWGCF/Flow/Tasks/flowRunbyRun.cxx

@@ -319,23 +319,23 @@ struct FlowRunbyRun {
               LOGF(fatal, "Could not find the weight for run %d", runNumber);
               return;
             }
-            weight->Fill(track.phi(), track.eta(), collision.posZ(), track.pt(), cent, 0);
+            weight->fill(track.phi(), track.eta(), collision.posZ(), track.pt(), cent, 0);
           }
         } else {
           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);
+          weight->fill(track.phi(), track.eta(), collision.posZ(), track.pt(), cent, 0);
         }
       } else {
         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);
+        weight->fill(track.phi(), track.eta(), collision.posZ(), track.pt(), cent, 0);
       }
     }
 

PWGCF/Flow/Tasks/flowSP.cxx

@@ -186,14 +186,14 @@ struct FlowSP {
     int ptbins = ptbinning.size() - 1;
 
     if (cfgFillWeights) {
-      fWeights->SetPtBins(ptbins, &ptbinning[0]);
-      fWeights->Init(true, false);
+      fWeights->setPtBins(ptbins, &ptbinning[0]);
+      fWeights->init(true, false);
 
-      fWeightsPOS->SetPtBins(ptbins, &ptbinning[0]);
-      fWeightsPOS->Init(true, false);
+      fWeightsPOS->setPtBins(ptbins, &ptbinning[0]);
+      fWeightsPOS->init(true, false);
 
-      fWeightsNEG->SetPtBins(ptbins, &ptbinning[0]);
-      fWeightsNEG->Init(true, false);
+      fWeightsNEG->setPtBins(ptbins, &ptbinning[0]);
+      fWeightsNEG->init(true, false);
     }
 
     if ((doprocessData || doprocessMCReco)) {
@@ -410,7 +410,7 @@ struct FlowSP {
     weight_nue = 1. / eff;
     int sizeAcc = cfg.mAcceptance.size();
     if (sizeAcc > pID)
-      weight_nua = cfg.mAcceptance[pID]->GetNUA(phi, eta, vtxz);
+      weight_nua = cfg.mAcceptance[pID]->getNUA(phi, eta, vtxz);
     else
       weight_nua = 1;
     return true;
@@ -760,13 +760,13 @@ struct FlowSP {
 
         // Fill NUA weights
         if (cfgFillWeights) {
-          fWeights->Fill(track.phi(), track.eta(), vtxz, track.pt(), centrality, 0);
+          fWeights->fill(track.phi(), track.eta(), vtxz, track.pt(), centrality, 0);
         } else if (cfgFillWeightsPOS) {
           if (pos)
-            fWeightsPOS->Fill(track.phi(), track.eta(), vtxz, track.pt(), centrality, 0);
+            fWeightsPOS->fill(track.phi(), track.eta(), vtxz, track.pt(), centrality, 0);
         } else if (cfgFillWeightsNEG) {
           if (!pos)
-            fWeightsNEG->Fill(track.phi(), track.eta(), vtxz, track.pt(), centrality, 0);
+            fWeightsNEG->fill(track.phi(), track.eta(), vtxz, track.pt(), centrality, 0);
         }
 
         // Set weff and wacc for inclusice, negative and positive hadrons