[PWGDQ] Adding correct initialisation of V2ME for cumulants (AliceO2Group#10190)

Author: victorvalenciatorres

PWGDQ/Core/VarManager.h

@@ -1986,38 +1986,48 @@ void VarManager::FillTwoMixEventsFlowResoFactor(T const& hs_sp, T const& hs_ep,
 }
 
 template <typename T, typename T1, typename T2>
-void VarManager::FillTwoMixEventsCumulants(T const& h_v22m, T const& h_v24m, T const& h_v22p, T const& h_v24p, T1 const& t1, T2 const& t2, float* values)
+void VarManager::FillTwoMixEventsCumulants(T const& h_v22ev1, T const& h_v24ev1, T const& h_v22ev2, T const& h_v24ev2, T1 const& t1, T2 const& t2, float* values)
 {
   if (!values) {
     values = fgValues;
   }
-  float ptp, ptm, centp, centm;
-  if (t1.sign() < 0) {
-    ptm = t1.sign();
-    ptp = t2.sign();
-    centm = values[kTwoEvCentFT0C1];
-    centp = values[kTwoEvCentFT0C2];
-  } else {
-    ptm = t2.sign();
-    ptp = t1.sign();
-    centm = values[kTwoEvCentFT0C2];
-    centp = values[kTwoEvCentFT0C1];
-  }
 
-  if (centm >= 0.) {
-    int idx_v22m = h_v22m->FindBin(centm, ptm);
-    int idx_v24m = h_v24m->FindBin(centm, ptm);
+  int idx_v22ev1;
+  int idx_v24ev1;
+  int idx_v22ev2;
+  int idx_v24ev2;
+
+  if (values[kTwoEvCentFT0C1] >= 0.) {
+    if (t1.sign() < 0) {
+
+      idx_v22ev1 = h_v22ev1->FindBin(values[kTwoEvCentFT0C1], t1.pt());
+      idx_v24ev1 = h_v24ev1->FindBin(values[kTwoEvCentFT0C1], t1.pt());
+      values[kV22m] = h_v22ev1->GetBinContent(idx_v22ev1);
+      values[kV24m] = h_v24ev1->GetBinContent(idx_v24ev1);
+
+    } else {
 
-    values[kV22m] = h_v22m->GetBinContent(idx_v22m);
-    values[kV24m] = h_v24m->GetBinContent(idx_v24m);
+      idx_v22ev1 = h_v22ev2->FindBin(values[kTwoEvCentFT0C1], t1.pt());
+      idx_v24ev1 = h_v24ev2->FindBin(values[kTwoEvCentFT0C1], t1.pt());
+      values[kV22m] = h_v22ev2->GetBinContent(idx_v22ev1);
+      values[kV24m] = h_v24ev2->GetBinContent(idx_v24ev1);
+    }
   }
+  if (values[kTwoEvCentFT0C2] >= 0.) {
+    if (t2.sign() < 0) {
 
-  if (centp >= 0.) {
-    int idx_v22p = h_v22p->FindBin(centp, ptp);
-    int idx_v24p = h_v24p->FindBin(centp, ptp);
+      idx_v22ev2 = h_v22ev1->FindBin(values[kTwoEvCentFT0C2], t2.pt());
+      idx_v24ev2 = h_v24ev1->FindBin(values[kTwoEvCentFT0C2], t2.pt());
+      values[kV22p] = h_v22ev1->GetBinContent(idx_v22ev2);
+      values[kV24p] = h_v24ev1->GetBinContent(idx_v24ev2);
 
-    values[kV22p] = h_v22p->GetBinContent(idx_v22p);
-    values[kV24p] = h_v24p->GetBinContent(idx_v24p);
+    } else {
+
+      idx_v22ev2 = h_v22ev2->FindBin(values[kTwoEvCentFT0C2], t2.pt());
+      idx_v24ev2 = h_v24ev2->FindBin(values[kTwoEvCentFT0C2], t2.pt());
+      values[kV22p] = h_v22ev2->GetBinContent(idx_v22ev2);
+      values[kV24p] = h_v24ev2->GetBinContent(idx_v24ev2);
+    }
   }
 }