From 8e9e85623d5813118ea811124b0560fa9eb332f8 Mon Sep 17 00:00:00 2001
From: Chiara Zampolli <Chiara.Zampolli@cern.ch>
Date: Mon, 7 Oct 2024 14:59:56 +0200
Subject: [PATCH 1/2] bins in mult are now configurable

---
 .../include/GLOQC/ITSTPCMatchingQCParams.h    |  6 ++++
 Detectors/GLOQC/include/GLOQC/MatchITSTPCQC.h | 22 ++++++++++++--
 Detectors/GLOQC/src/MatchITSTPCQC.cxx         | 29 ++++++++++---------
 .../qc/src/ITSTPCMatchingQCSpec.cxx           |  6 ++++
 4 files changed, 48 insertions(+), 15 deletions(-)

diff --git a/Detectors/GLOQC/include/GLOQC/ITSTPCMatchingQCParams.h b/Detectors/GLOQC/include/GLOQC/ITSTPCMatchingQCParams.h
index 4ab442bcd259e..62c248209001a 100644
--- a/Detectors/GLOQC/include/GLOQC/ITSTPCMatchingQCParams.h
+++ b/Detectors/GLOQC/include/GLOQC/ITSTPCMatchingQCParams.h
@@ -40,6 +40,12 @@ struct ITSTPCMatchingQCParams : public o2::conf::ConfigurableParamHelper<ITSTPCM
   float cutK0Mass = 0.05f;
   float maxEtaK0 = 0.8f;
   float K0Scaling = 1.f;
+  float minTPCOccpp = 0.f;
+  float maxTPCOccpp = 1.e6;
+  int nBinsTPCOccpp = 6;
+  float minTPCOccPbPb = 0.f;
+  float maxTPCOccPbPb = 8.e6;
+  int nBinsTPCOccPbPb = 8;
 
   O2ParamDef(ITSTPCMatchingQCParams, "ITSTPCMatchingQC");
 };
diff --git a/Detectors/GLOQC/include/GLOQC/MatchITSTPCQC.h b/Detectors/GLOQC/include/GLOQC/MatchITSTPCQC.h
index 00862dd3c734d..044b8290c5e0b 100644
--- a/Detectors/GLOQC/include/GLOQC/MatchITSTPCQC.h
+++ b/Detectors/GLOQC/include/GLOQC/MatchITSTPCQC.h
@@ -279,6 +279,12 @@ class MatchITSTPCQC
   void setMaxK0Eta(float v) { mMaxEtaK0 = v; }
   void setRefitK0(bool v) { mRefit = v; }
   void setCutK0Mass(float v) { mCutK0Mass = v; }
+  void setMinTPCOccpp(float v) { mMinTPCOccpp = v; }
+  void setMaxTPCOccpp(float v) { mMaxTPCOccpp = v; }
+  void setNBinsTPCOccpp(int v) { mNBinsTPCOccpp = v; }
+  void setMinTPCOccPbPb(float v) { mMinTPCOccPbPb = v; }
+  void setMaxTPCOccPbPb(float v) { mMaxTPCOccPbPb = v; }
+  void setNBinsTPCOccPbPb(int v) { mNBinsTPCOccPbPb = v; }
 
   void printParams()
   {
@@ -296,6 +302,12 @@ class MatchITSTPCQC
     LOG(info) << "etaCut               = " << mEtaCut;
     LOG(info) << "cutK0Mass            = " << mCutK0Mass;
     LOG(info) << "maxEtaK0             = " << mMaxEtaK0;
+    LOG(info) << "minTPCOccpp          = " << mMinTPCOccpp;
+    LOG(info) << "maxTPCOccpp          = " << mMaxTPCOccpp;
+    LOG(info) << "nBinsTPCOccpp        = " << mNBinsTPCOccpp;
+    LOG(info) << "minTPCOccPbPb        = " << mMinTPCOccPbPb;
+    LOG(info) << "maxTPCOccPbPb        = " << mMaxTPCOccPbPb;
+    LOG(info) << "nBinsTPCOccPbPb      = " << mNBinsTPCOccPbPb;
   }
 
  private:
@@ -435,8 +447,14 @@ class MatchITSTPCQC
   std::vector<float> mTBinClOcc;                    ///< TPC occupancy histo: i-th entry is the integrated occupancy for ~1 orbit starting from the TB = i*mNTPCOccBinLength
   gsl::span<const unsigned int> mTPCRefitterOccMap; ///< externally set TPC clusters occupancy map
   bool mIsHI = false;
-  float mK0Scaling = 1.f; // permill that we want to keep of K0S
-  uint64_t mNK0 = 0;      // number of found V0s
+  float mK0Scaling = 1.f;  // permill that we want to keep of K0S
+  uint64_t mNK0 = 0;       // number of found V0s
+  float mMinTPCOccpp = 0.f;  // min TPC occupancy for K0s plot for pp collisions
+  float mMaxTPCOccpp = 1.e6; // max TPC occupancy for K0s plot for pp collisions
+  int mNBinsTPCOccpp = 6;    // number of bins in TPC occupancy for K0s plot for pp collisions
+  float mMinTPCOccPbPb = 0.f;  // min TPC occupancy for K0s plot for PbPb collisions
+  float mMaxTPCOccPbPb = 8.e6; // max TPC occupancy for K0s plot for PbPb collisions
+  int mNBinsTPCOccPbPb = 8;    // number of bins in TPC occupancy for K0s plot for PbPb collisions
 
   ClassDefNV(MatchITSTPCQC, 3);
 };
diff --git a/Detectors/GLOQC/src/MatchITSTPCQC.cxx b/Detectors/GLOQC/src/MatchITSTPCQC.cxx
index 32cdb413cd890..6cbe886109762 100644
--- a/Detectors/GLOQC/src/MatchITSTPCQC.cxx
+++ b/Detectors/GLOQC/src/MatchITSTPCQC.cxx
@@ -404,27 +404,30 @@ bool MatchITSTPCQC::init()
   for (int i = 0; i <= nbinsMassK0; i++) {
     ybinsMassK0[i] = yminMassK0 + i * dyMassK0;
   }
-  const Int_t nbinsMultK0 = 6;
-  Double_t* zbinsMultK0pp = new Double_t[nbinsMultK0 + 1];
-  Double_t* zbinsMultK0PbPb = new Double_t[nbinsMultK0 + 1];
-  Double_t zminMultK0pp = 0.f;
-  Double_t zmaxMultK0pp = 1.e6;
-  Double_t zminMultK0PbPb = 0.f;
-  Double_t zmaxMultK0PbPb = 6.e6;
-  Double_t dzMultK0pp = (zmaxMultK0pp - zminMultK0pp) / nbinsMultK0;
-  for (int i = 0; i <= nbinsMultK0; i++) {
+  const Int_t nbinsMultK0pp = mNBinsTPCOccpp;
+  Double_t* zbinsMultK0pp = new Double_t[nbinsMultK0pp + 1];
+  Double_t zminMultK0pp = mMinTPCOccpp;
+  Double_t zmaxMultK0pp = mMaxTPCOccpp;
+  Double_t dzMultK0pp = (zmaxMultK0pp - zminMultK0pp) / nbinsMultK0pp;
+  for (int i = 0; i <= nbinsMultK0pp; i++) {
     zbinsMultK0pp[i] = zminMultK0pp + i * dzMultK0pp;
   }
-  Double_t dzMultK0PbPb = (zmaxMultK0PbPb - zminMultK0PbPb) / nbinsMultK0;
-  for (int i = 0; i <= nbinsMultK0; i++) {
+
+  const Int_t nbinsMultK0PbPb = mNBinsTPCOccPbPb;
+  Double_t* zbinsMultK0PbPb = new Double_t[nbinsMultK0PbPb + 1];
+  Double_t zminMultK0PbPb = mMinTPCOccPbPb;
+  Double_t zmaxMultK0PbPb = mMaxTPCOccPbPb;
+  LOG(info) << "************************************** zminMultK0PbPb = " << zminMultK0PbPb << " zmaxMultK0PbPb = " << zmaxMultK0PbPb;
+  Double_t dzMultK0PbPb = (zmaxMultK0PbPb - zminMultK0PbPb) / nbinsMultK0PbPb;
+  for (int i = 0; i <= nbinsMultK0PbPb; i++) {
     zbinsMultK0PbPb[i] = zminMultK0PbPb + i * dzMultK0PbPb;
   }
 
   if (mDoK0QC) {
     // V0s
-    mK0MassVsPtVsOccpp = new TH3F("mK0MassVsPtVsOccpp", "K0 invariant mass vs Pt vs TPC occupancy; Pt [GeV/c]; K0s mass [GeV/c^2]; TPC occ.", nbinsPtK0, xbinsPtK0, nbinsMassK0, ybinsMassK0, nbinsMultK0, zbinsMultK0pp);
+    mK0MassVsPtVsOccpp = new TH3F("mK0MassVsPtVsOccpp", "K0 invariant mass vs Pt vs TPC occupancy; Pt [GeV/c]; K0s mass [GeV/c^2]; TPC occ.", nbinsPtK0, xbinsPtK0, nbinsMassK0, ybinsMassK0, nbinsMultK0pp, zbinsMultK0pp);
 
-    mK0MassVsPtVsOccPbPb = new TH3F("mK0MassVsPtVsOccPbPb", "K0 invariant mass vs Pt vs TPC occupancy; Pt [GeV/c]; K0s mass [GeV/c^2]; TPC occ", nbinsPtK0, xbinsPtK0, nbinsMassK0, ybinsMassK0, nbinsMultK0, zbinsMultK0PbPb);
+    mK0MassVsPtVsOccPbPb = new TH3F("mK0MassVsPtVsOccPbPb", "K0 invariant mass vs Pt vs TPC occupancy; Pt [GeV/c]; K0s mass [GeV/c^2]; TPC occ", nbinsPtK0, xbinsPtK0, nbinsMassK0, ybinsMassK0, nbinsMultK0PbPb, zbinsMultK0PbPb);
   }
 
   LOG(info) << "Printing configuration cuts";
diff --git a/Detectors/GlobalTrackingWorkflow/qc/src/ITSTPCMatchingQCSpec.cxx b/Detectors/GlobalTrackingWorkflow/qc/src/ITSTPCMatchingQCSpec.cxx
index d49b875317b64..91cbdc9f7b7ce 100644
--- a/Detectors/GlobalTrackingWorkflow/qc/src/ITSTPCMatchingQCSpec.cxx
+++ b/Detectors/GlobalTrackingWorkflow/qc/src/ITSTPCMatchingQCSpec.cxx
@@ -52,6 +52,12 @@ void ITSTPCMatchingQCDevice::init(InitContext& /*ic*/)
   mMatchITSTPCQC->setCutK0Mass(params.cutK0Mass);
   mMatchITSTPCQC->setMaxK0Eta(params.maxEtaK0);
   mMatchITSTPCQC->setK0Scaling(params.K0Scaling);
+  mMatchITSTPCQC->setMinTPCOccpp(params.minTPCOccpp);
+  mMatchITSTPCQC->setMaxTPCOccpp(params.maxTPCOccpp);
+  mMatchITSTPCQC->setNBinsTPCOccpp(params.nBinsTPCOccpp);
+  mMatchITSTPCQC->setMinTPCOccPbPb(params.minTPCOccPbPb);
+  mMatchITSTPCQC->setMaxTPCOccPbPb(params.maxTPCOccPbPb);
+  mMatchITSTPCQC->setNBinsTPCOccPbPb(params.nBinsTPCOccPbPb);
   o2::base::GRPGeomHelper::instance().setRequest(mCCDBRequest);
   if (mUseMC) {
     mMatchITSTPCQC->setUseMC(mUseMC);

From dca88aa75d49de737d7a78887d8ce7e5ba244a77 Mon Sep 17 00:00:00 2001
From: ALICE Action Bot <alibuild@cern.ch>
Date: Mon, 7 Oct 2024 13:00:55 +0000
Subject: [PATCH 2/2] Please consider the following formatting changes

---
 Detectors/GLOQC/include/GLOQC/MatchITSTPCQC.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Detectors/GLOQC/include/GLOQC/MatchITSTPCQC.h b/Detectors/GLOQC/include/GLOQC/MatchITSTPCQC.h
index 044b8290c5e0b..c3f7c47c8b981 100644
--- a/Detectors/GLOQC/include/GLOQC/MatchITSTPCQC.h
+++ b/Detectors/GLOQC/include/GLOQC/MatchITSTPCQC.h
@@ -447,11 +447,11 @@ class MatchITSTPCQC
   std::vector<float> mTBinClOcc;                    ///< TPC occupancy histo: i-th entry is the integrated occupancy for ~1 orbit starting from the TB = i*mNTPCOccBinLength
   gsl::span<const unsigned int> mTPCRefitterOccMap; ///< externally set TPC clusters occupancy map
   bool mIsHI = false;
-  float mK0Scaling = 1.f;  // permill that we want to keep of K0S
-  uint64_t mNK0 = 0;       // number of found V0s
-  float mMinTPCOccpp = 0.f;  // min TPC occupancy for K0s plot for pp collisions
-  float mMaxTPCOccpp = 1.e6; // max TPC occupancy for K0s plot for pp collisions
-  int mNBinsTPCOccpp = 6;    // number of bins in TPC occupancy for K0s plot for pp collisions
+  float mK0Scaling = 1.f;      // permill that we want to keep of K0S
+  uint64_t mNK0 = 0;           // number of found V0s
+  float mMinTPCOccpp = 0.f;    // min TPC occupancy for K0s plot for pp collisions
+  float mMaxTPCOccpp = 1.e6;   // max TPC occupancy for K0s plot for pp collisions
+  int mNBinsTPCOccpp = 6;      // number of bins in TPC occupancy for K0s plot for pp collisions
   float mMinTPCOccPbPb = 0.f;  // min TPC occupancy for K0s plot for PbPb collisions
   float mMaxTPCOccPbPb = 8.e6; // max TPC occupancy for K0s plot for PbPb collisions
   int mNBinsTPCOccPbPb = 8;    // number of bins in TPC occupancy for K0s plot for PbPb collisions