removed hard code for q vector track selection

Author: ypwangg

PWGDQ/Core/CutsLibrary.cxx

@@ -1593,6 +1593,34 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName)
     cut->AddCut(GetAnalysisCut("electronPID1shiftDown"));
     return cut;
   }
+  // -------------------------------------------------------------------------------------------------
+  //
+  // Q vector contributor cut
+  //
+  if (!nameStr.compare("selTPCCentral")) {
+    AnalysisCut* kineCut = new AnalysisCut("kineCut", "kine cut");
+    kineCut->AddCut(VarManager::kEta, -0.8, 0.8);
+    kineCut->AddCut(VarManager::kPt, 0.15, 5);
+
+    AnalysisCut* qualityCuts = new AnalysisCut("qualityCuts", "quality cuts");
+    qualityCuts->AddCut(VarManager::kTPCchi2, 0., 4.);
+    qualityCuts->AddCut(VarManager::kTPCnCRoverFindCls, 0.8, 1.);
+    qualityCuts->AddCut(VarManager::kIsITSibAny, 0.5, 1.5);
+    qualityCuts->AddCut(VarManager::kITSchi2, 0., 36.);
+
+    AnalysisCut* dcaCuts = new AnalysisCut("dcaCuts", "DCA cuts");
+    std::shared_ptr<TF1> f1dcaxyHigh = std::make_shared<TF1>("f1dcaxy", "[0]+[1]/pow(x,[2])", 0., 10.);
+    f1dcaxyHigh->SetParameters(0.0105, 0.035, 1.1);
+    std::shared_ptr<TF1> f1dcaxyLow = std::make_shared<TF1>("f1dcaxy_low", "[0]+[1]/pow(x,[2])", 0., 10.);
+    f1dcaxyLow->SetParameters(-0.0105, -0.035, 1.1);
+    dcaCuts->AddCut(VarManager::kTrackDCAxy, f1dcaxyLow, f1dcaxyHigh);
+    dcaCuts->AddCut(VarManager::kTrackDCAz, -2., 2.);
+
+    cut->AddCut(kineCut);
+    cut->AddCut(qualityCuts);
+    cut->AddCut(dcaCuts);
+  }
+
   // -------------------------------------------------------------------------------------------------
   //
   // LMee cuts

PWGDQ/Core/VarManager.h

@@ -823,8 +823,8 @@ class VarManager : public TObject
     kCos2DeltaPhiPP_FT0C,
     kNullA2,
     kInfA2,
-    kAmbi1,
-    kAmbi2,
+    kSel1,
+    kSel2,
     kDeltaPhiPair,
     kOpeningAngle,
     kQuadDCAabsXY,
@@ -1592,8 +1592,6 @@ class VarManager : public TObject
   static float calculatePhiV(const T1& t1, const T2& t2);
   template <typename T1, typename T2>
   static float LorentzTransformJpsihadroncosChi(TString Option, const T1& v1, const T2& v2);
-  template <typename T>
-  static bool isSelectedinTPC(const T& t);
 
   static o2::vertexing::DCAFitterN<2> fgFitterTwoProngBarrel;
   static o2::vertexing::DCAFitterN<3> fgFitterThreeProngBarrel;
@@ -3106,6 +3104,9 @@ void VarManager::FillTrack(T const& track, float* values)
           values[kITSncls] += ((track.itsClusterMap() & (1 << i)) ? 1 : 0);
         }
       }
+      if (fgUsedVars[kTPCnCRoverFindCls]) {
+        values[kTPCnCRoverFindCls] = values[kTPCnclsCR] / values[kTPCncls];
+      }
       values[kTrackDCAxy] = track.dcaXY();
       values[kTrackDCAz] = track.dcaZ();
       if constexpr ((fillMap & ReducedTrackBarrelCov) > 0) {
@@ -6078,15 +6079,15 @@ void VarManager::FillPairVn(T1 const& t1, T2 const& t2, float* values)
     float nNorm = values[kMultA];
 
     // checkTrack(t1);
-    if (isSelectedinTPC(t1) && values[kAmbi1] > 0) {
+    if (values[kSel1] > 0) {
       float qx1 = t1.pt() * TMath::Cos(2. * t1.phi());
       float qy1 = t1.pt() * TMath::Sin(2. * t1.phi());
       Q2X0A = Q2X0A - qx1;
       Q2Y0A = Q2Y0A - qy1;
       nNorm = nNorm - 1.;
     }
     // checkTrack(t2);
-    if (isSelectedinTPC(t2) && values[kAmbi2] > 0) {
+    if (values[kSel2] > 0) {
       float qx2 = t2.pt() * TMath::Cos(2. * t2.phi());
       float qy2 = t2.pt() * TMath::Sin(2. * t2.phi());
       Q2X0A = Q2X0A - qx2;
@@ -7024,48 +7025,6 @@ float VarManager::LorentzTransformJpsihadroncosChi(TString Option, T1 const& v1,
   return value;
 }
 
-template <typename T>
-bool VarManager::isSelectedinTPC(const T& t)
-{
-  bool trackSelected = false;
-  if constexpr (requires { t.hasTPC(); }) {
-    trackSelected = true;
-    if (!t.hasTPC()) {
-      trackSelected = false;
-      return trackSelected;
-    }
-    if (std::abs(t.eta()) > 0.8) { // eta cut used in q vector table. Todo: read from config
-      trackSelected = false;
-      return trackSelected;
-    }
-    if (t.pt() < 0.15 || t.pt() > 5.) { // pt cut used in q vector table. Todo: read from config
-      trackSelected = false;
-      return trackSelected;
-    }
-    if (t.tpcNClsCrossedRows() / t.tpcNClsFound() < 0.8 || t.tpcChi2NCl() > 4.) {
-      trackSelected = false;
-      return trackSelected;
-    }
-    if (!((t.itsClusterMap() & (1 << uint8_t(0))) > 0 || (t.itsClusterMap() & (1 << uint8_t(1))) > 0 || (t.itsClusterMap() & (1 << uint8_t(2))) > 0)) {
-      trackSelected = false;
-      return trackSelected;
-    }
-    if (t.itsChi2NCl() > 36.) {
-      trackSelected = false;
-      return trackSelected;
-    }
-    if (t.dcaZ() > 2) {
-      trackSelected = false;
-      return trackSelected;
-    }
-    if (t.dcaXY() > 0.0105 + 0.0350 / std::pow(t.pt(), 1.1)) {
-      trackSelected = false;
-      return trackSelected;
-    }
-  }
-  return trackSelected;
-}
-
 template <typename T1, typename T2, typename T3, typename T4, typename T5>
 void VarManager::FillFIT(T1 const& bc, T2 const& bcs, T3 const& ft0s, T4 const& fv0as, T5 const& fdds, float* values)
 {

PWGDQ/Tasks/tableReader_withAssoc.cxx

@@ -1313,6 +1313,7 @@ struct AnalysisSameEventPairing {
     Configurable<std::string> track{"cfgTrackCuts", "jpsiO2MCdebugCuts2", "Comma separated list of barrel track cuts"};
     Configurable<std::string> muon{"cfgMuonCuts", "", "Comma separated list of muon cuts"};
     Configurable<std::string> pair{"cfgPairCuts", "", "Comma separated list of pair cuts"};
+    Configurable<std::string> qVector{"cfgQvectorTrackCut", "", "Track cut of Q-vector, enable this if you want to remove the auto-correlation in TPC"};
     Configurable<bool> event{"cfgRemoveCollSplittingCandidates", false, "If true, remove collision splitting candidates as determined by the event selection task upstream"};
     // TODO: Add pair cuts via JSON
   } fConfigCuts;
@@ -1390,6 +1391,7 @@ struct AnalysisSameEventPairing {
 
   uint32_t fTrackFilterMask = 0; // mask for the track cuts required in this task to be applied on the barrel cuts produced upstream
   uint32_t fMuonFilterMask = 0;  // mask for the muon cuts required in this task to be applied on the muon cuts produced upstream
+  uint32_t fQvectorFilterMask = 0; // mask for the track cuts required to be applied on the tracks used for the Q-vector calculation
   int fNCutsBarrel = 0;
   int fNCutsMuon = 0;
   int fNPairCuts = 0;
@@ -1462,6 +1464,7 @@ struct AnalysisSameEventPairing {
     if (!muonCutsStr.IsNull()) {
       objArrayMuonCuts = muonCutsStr.Tokenize(",");
     }
+    TString qVectorCutStr = fConfigCuts.qVector.value;
 
     if (fConfigML.applyBDT) {
       // BDT cuts via JSON
@@ -1529,6 +1532,9 @@ struct AnalysisSameEventPairing {
       fNCutsBarrel = objArray->GetEntries();
       for (int icut = 0; icut < objArray->GetEntries(); ++icut) {
         TString tempStr = objArray->At(icut)->GetName();
+        if (tempStr.CompareTo(qVectorCutStr) == 0) {
+          fQvectorFilterMask |= (static_cast<uint32_t>(1) << icut);
+        }
         fTrackCuts.push_back(tempStr);
         if (objArrayTrackCuts->FindObject(tempStr.Data()) != nullptr) {
           fTrackFilterMask |= (static_cast<uint32_t>(1) << icut);
@@ -1966,13 +1972,17 @@ struct AnalysisSameEventPairing {
 
           fNPairPerEvent++;
 
-          VarManager::fgValues[VarManager::kAmbi1] = -999.;
-          VarManager::fgValues[VarManager::kAmbi2] = -999.;
-          if (t1.reducedeventId() != event.globalIndex()) {
-            VarManager::fgValues[VarManager::kAmbi1] = 1.;
+          VarManager::fgValues[VarManager::kSel1] = -999.;
+          VarManager::fgValues[VarManager::kSel2] = -999.;
+          if (t1.reducedeventId() == event.globalIndex()) {
+            if ((a1.isBarrelSelected_raw() & fQvectorFilterMask) > 0) {
+              VarManager::fgValues[VarManager::kSel1] = 1.;
+            }
           }
-          if (t2.reducedeventId() != event.globalIndex()) {
-            VarManager::fgValues[VarManager::kAmbi2] = 1.;
+          if (t2.reducedeventId() == event.globalIndex()) {
+            if ((a2.isBarrelSelected_raw() & fQvectorFilterMask) > 0) {
+              VarManager::fgValues[VarManager::kSel2] = 1.;
+            }
           }
           VarManager::FillPair<TPairType, TTrackFillMap>(t1, t2);
           // compute quantities which depend on the associated collision, such as DCA