GLO: QC: set reasonable defaults and steering

Author: f3sch

Detectors/GLOQC/include/GLOQC/ITSTPCMatchingQCParams.h

@@ -17,26 +17,25 @@
 #include "CommonUtils/ConfigurableParam.h"
 #include "CommonUtils/ConfigurableParamHelper.h"
 
-namespace o2
-{
-namespace gloqc
+namespace o2::gloqc
 {
 
 // There are configurable params for TPC-ITS matching
 struct ITSTPCMatchingQCParams : public o2::conf::ConfigurableParamHelper<ITSTPCMatchingQCParams> {
 
-  float minPtITSCut = 0.f;
-  float etaITSCut = 1e10f;
+  int nBinsPt = 100;
+  float minPtITSCut = 0.1;
+  float etaITSCut = 1.4;
   int32_t minNITSClustersCut = 0;
-  int32_t maxChi2PerClusterITS = 100000;
-  float minPtTPCCut = 0.1f;
-  float etaTPCCut = 0.9f;
+  float maxChi2PerClusterITS = 1e10;
+  float minPtTPCCut = 0.1;
+  float etaTPCCut = 1.4;
   int32_t minNTPCClustersCut = 60;
-  float minDCACut = 100.f;
-  float minDCACutY = 10.f;
-  float minPtCut = 0.f;
-  float maxPtCut = 1e10f;
-  float etaCut = 1.e10f;
+  float minDCACut = 100.;
+  float minDCACutY = 10.;
+  float minPtCut = 0.1;
+  float maxPtCut = 20;
+  float etaCut = 1.4;
   float etaNo0Cut = 0.05;
   float cutK0Mass = 0.05f;
   float maxEtaK0 = 0.8f;
@@ -53,7 +52,7 @@ struct ITSTPCMatchingQCParams : public o2::conf::ConfigurableParamHelper<ITSTPCM
   O2ParamDef(ITSTPCMatchingQCParams, "ITSTPCMatchingQC");
 };
 
-} // namespace gloqc
-} // end namespace o2
+} // namespace o2::gloqc
+  // end namespace o2
 
 #endif

Detectors/GLOQC/include/GLOQC/MatchITSTPCQC.h

@@ -138,7 +138,6 @@ class MatchITSTPCQC
 
   TH3F* getHistoEtaPhiPtNum(matchType m) const { return mEtaPhiPtNum[m]; }
   TH3F* getHistoEtaPhiPtDen(matchType m) const { return mEtaPhiPtDen[m]; }
-  TEfficiency* getFractionITSTPCmatchEtaPhiPt(matchType m) const { return mFractionITSTPCmatchEtaPhiPt[m]; }
 
   TH3F* getHistoK0MassVsPtVsOccpp() const { return mK0MassVsPtVsOccpp; }
   TH3F* getHistoK0MassVsPtVsOccPbPb() const { return mK0MassVsPtVsOccPbPb; }
@@ -197,7 +196,6 @@ class MatchITSTPCQC
       // 3D eta/phi/pt
       publisher->startPublishing(mEtaPhiPtNum[i]);
       publisher->startPublishing(mEtaPhiPtDen[i]);
-      publisher->startPublishing(mFractionITSTPCmatchEtaPhiPt[i]);
 
       if (mUseTrkPID) { // Vs Tracking PID hypothesis
         for (int j = 0; j < o2::track::PID::NIDs; ++j) {
@@ -278,6 +276,7 @@ class MatchITSTPCQC
   void setMinDCAtoBeamPipeDistanceCut(float v) { mDCATPCCut = v; }
   void setMinDCAtoBeamPipeYCut(float v) { mDCATPCCutY = v; }
   // ITS-TPC kinematics
+  void setNBinsPt(int v) { mPtBins = v; }
   void setPtCut(float v) { mPtCut = v; }
   void setMaxPtCut(float v) { mPtMaxCut = v; }
   void setEtaCut(float v) { mEtaCut = v; }
@@ -419,7 +418,6 @@ class MatchITSTPCQC
   // 3D Efficiency in eta/phi/pt
   TH3F* mEtaPhiPtNum[matchType::SIZE] = {};
   TH3F* mEtaPhiPtDen[matchType::SIZE] = {};
-  TEfficiency* mFractionITSTPCmatchEtaPhiPt[matchType::SIZE] = {};
 
   template <int DIM = 1, bool DEBUG = false>
   void setEfficiency(TEfficiency* eff, TH1* hnum, TH1* hden);
@@ -442,8 +440,9 @@ class MatchITSTPCQC
   float mDCATPCCut = 100.f;      // max DCA 3D to PV for TPC track
   float mDCATPCCutY = 10.f;      // max DCA xy to PV for TPC track
   // ITS-TPC kinematics
+  int mPtBins = 100;
   float mPtCut = 0.1f;
-  float mPtMaxCut = 1e10f;
+  float mPtMaxCut = 20;
   float mEtaCut = 1.4f;
   float mEtaNo0Cut = 0.05f;
   // TODO: define 2 different values for min and max (*)