study

Signed-off-by: Felix Schlepper <[email protected]>

Author: f3sch

Detectors/Upgrades/ITS3/study/include/ITS3TrackingStudy/ITS3TrackingStudyParam.h

@@ -20,13 +20,15 @@ namespace o2::its3::study
 struct ITS3TrackingStudyParam : o2::conf::ConfigurableParamHelper<ITS3TrackingStudyParam> {
   /// general track selection
   float maxChi2{36};
-  float maxEta{0.9};
+  float maxEta{1.0};
   float minPt{0.1};
   float maxPt{1e2};
   /// PV selection
   int minPVCont{5};
   /// ITS track selection
   int minITSCls{7};
+  /// TPC track selection
+  int minTPCCls{120};
 
   /// studies
   bool doDCA = true;

Detectors/Upgrades/ITS3/study/macros/PlotDCA.C

@@ -112,7 +112,7 @@ void PlotDCA(const char* dets = "all", const char* fName = "its3TrackStudy.root"
     hMapResDCAxyVsPtAllLayers[sPDG] = std::move(histsResDCAxy);
     hMapDCAzVsPtAllLayers[sPDG] = std::move(histsDCAz);
     hMapResDCAzVsPtAllLayers[sPDG] = std::move(histsResDCAz);
-    hMapDeltaPtVsPtAllLayers[sPDG] = std::move(histsDeltaPt); // <-- FIXED (was histsDCAz)
+    hMapDeltaPtVsPtAllLayers[sPDG] = std::move(histsDeltaPt);
     hMapResPtVsPtAllLayers[sPDG] = std::move(histsResDeltaPt);
   }
 

Detectors/Upgrades/ITS3/study/src/TrackingStudy.cxx

@@ -60,7 +60,7 @@ class TrackingStudySpec : public Task
   void process(o2::globaltracking::RecoContainer& recoData);
   void updateTimeDependentParams(ProcessingContext& pc);
   std::vector<o2::BaseCluster<float>> prepareITSClusters(const o2::globaltracking::RecoContainer& data) const;
-  bool selectITSTrack(GTrackID trkID, o2::globaltracking::RecoContainer& recoData, bool checkMCTruth = true) const;
+  bool selectTrack(GTrackID trkID, o2::globaltracking::RecoContainer& recoData, bool checkMCTruth = true) const;
   T2VMap buildT2V(o2::globaltracking::RecoContainer& recoData, bool includeCont = false, bool requireMCMatch = true) const;
   void doDCAStudy(o2::globaltracking::RecoContainer& recoData);
   void doDCARefitStudy(o2::globaltracking::RecoContainer& recoData);
@@ -205,7 +205,7 @@ std::vector<o2::BaseCluster<float>> TrackingStudySpec::prepareITSClusters(const
   return std::move(itscl);
 }
 
-bool TrackingStudySpec::selectITSTrack(GTrackID trkID, o2::globaltracking::RecoContainer& recoData, bool checkMCTruth) const
+bool TrackingStudySpec::selectTrack(GTrackID trkID, o2::globaltracking::RecoContainer& recoData, bool checkMCTruth) const
 {
   const auto& conf = ITS3TrackingStudyParam::Instance();
   if (!trkID.includesDet(GTrackID::ITS)) {
@@ -223,6 +223,11 @@ bool TrackingStudySpec::selectITSTrack(GTrackID trkID, o2::globaltracking::RecoC
   if (itsTrk.getChi2() > conf.maxChi2 || itsTrk.getNClusters() < conf.minITSCls) {
     return false;
   }
+  // TPC specific
+  const auto& tpcTrk = recoData.getTPCTrack(contributorsGID[GTrackID::TPC]);
+  if (tpcTrk.getChi2() > conf.maxChi2 || tpcTrk.getNClusters() < conf.minITSCls) {
+    return false;
+  }
   // general
   const auto& gTrk = recoData.getTrackParam(trkID);
   if (gTrk.getPt() < conf.minPt || gTrk.getPt() > conf.maxPt) {
@@ -353,7 +358,7 @@ void TrackingStudySpec::doDCAStudy(o2::globaltracking::RecoContainer& recoData)
             mTrackCounter &= cis;
             continue;
           }
-          if (!selectITSTrack(contributorsGID[cis], recoData)) {
+          if (!selectTrack(contributorsGID[cis], recoData)) {
             mTrackCounter &= vid.getSource();
             continue;
           }
@@ -416,16 +421,6 @@ void TrackingStudySpec::doDCARefitStudy(o2::globaltracking::RecoContainer& recoD
   TStopwatch sw;
   sw.Start();
 
-  auto selectTrack = [&](const VtxTrackID& trkID) -> bool {
-    if (trkID.isAmbiguous()) {
-      return false;
-    }
-    if (!trkID.isPVContributor()) {
-      return false;
-    }
-    return selectITSTrack(trkID, recoData);
-  };
-
   // build track->vertex assoc.
   auto pvvec = recoData.getPrimaryVertices();
   auto vtxRefs = recoData.getPrimaryVertexMatchedTrackRefs(); // references from vertex to these track IDs
@@ -456,7 +451,7 @@ void TrackingStudySpec::doDCARefitStudy(o2::globaltracking::RecoContainer& recoD
         mTrackCounter &= trkID.getSource();
         return false;
       }
-      if (!selectITSTrack(trkID, recoData, mUseMC)) {
+      if (!selectTrack(trkID, recoData, mUseMC)) {
         mTrackCounter &= trkID.getSource();
         return false;
       }
@@ -607,7 +602,7 @@ void TrackingStudySpec::doPullStudy(o2::globaltracking::RecoContainer& recoData)
   };
 
   auto checkInTrack = [&](GTrackID trkID) {
-    if (!selectITSTrack(trkID, recoData)) {
+    if (!selectTrack(trkID, recoData)) {
       mTrackCounter &= trkID.getSource();
       return;
     }