squash

f3sch · Nov 27, 2023 · 24b2564 · 24b2564
1 parent a1e93f6
commit 24b2564
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/Detectors/Vertexing/include/DetectorsVertexing/SVertexer.h b/Detectors/Vertexing/include/DetectorsVertexing/SVertexer.h
@@ -100,7 +100,7 @@ class SVertexer
     VBracket vBracket{};
     float minR = 0; // track lowest point r
     bool hasTPC = false;
-    uint8_t nITSclu = 0;
+    int8_t nITSclu = -1;
     bool compatibleProton = false; // dE/dx compatibility with proton hypothesis (FIXME: use better, uint8_t compat mask?)
     bool hasITS() const
     {

diff --git a/Detectors/Vertexing/include/DetectorsVertexing/SVertexerParams.h b/Detectors/Vertexing/include/DetectorsVertexing/SVertexerParams.h
@@ -102,7 +102,7 @@ struct SVertexerParams : public o2::conf::ConfigurableParamHelper<SVertexerParam
   float mTPCTrackDR = 90.f;        // check if preliminary conversion point can lie somewhere reasonable
   float minTPCdEdx = 250;          // starting from this dEdx value, tracks with p > minMomTPCdEdx are always accepted
   float minMomTPCdEdx = 0.8;       // minimum p for tracks with dEdx > mMinTPCdEdx to be accepted
-  float maxV0TglAbsDiff = 0.4;     ///< max absolute difference in tgl for V0 for photons only
+  float maxV0TglAbsDiff = 0.05;    ///< max absolute difference in tgl for V0 for photons only
   float maxV0PhiAbsDiff = 2.0;     ///< max absolute difference in phi for V0 for photons only
 
   uint8_t mITSSAminNclu = 6;             // global requirement of at least this many ITS clusters if no TPC info present (N.B.: affects all secondary vertexing)

diff --git a/Detectors/Vertexing/src/SVertexer.cxx b/Detectors/Vertexing/src/SVertexer.cxx
@@ -509,7 +509,7 @@ void SVertexer::buildT2V(const o2::globaltracking::RecoContainer& recoData) // a
       }
 
       // get Nclusters in the ITS if available
-      uint8_t nITSclu = -1;
+      int8_t nITSclu = -1;
       auto itsGID = recoData.getITSContributorGID(tvid);
       if (itsGID.getSource() == GIndex::ITS && isITSloaded) {
         auto& itsTrack = recoData.getITSTrack(itsGID);
@@ -558,7 +558,7 @@ void SVertexer::buildT2V(const o2::globaltracking::RecoContainer& recoData) // a
 bool SVertexer::checkV0(const TrackCand& seedP, const TrackCand& seedN, int iP, int iN, int ithread)
 {
   // Fast rough cuts on pairs before feeding to DCAFitter, tracks are not in the same Frame or at same X
-  bool isTPConly = !(seedP.hasITS() && seedN.hasITS());
+  bool isTPConly = (seedP.gid.getSource() == GIndex::TPC || seedN.gid.getSource() == GIndex::TPC);
   if (mSVParams->mTPCTrackPhotonTune && isTPConly) {
     // Check if Tgl and Phi are close enough
     auto dTgl = std::abs(seedP.getTgl() - seedN.getTgl()), dPhi = std::abs(seedP.getPhi() - seedN.getPhi());
@@ -859,7 +859,7 @@ int SVertexer::checkCascades(const V0Index& v0Idx, const V0& v0, float rv0, std:
       continue; // skip the track used by V0
     }
     auto& bach = tracks[it];
-    if (mSVParams->mSkipTPCOnlyCascade && !bach.hasITS()) {
+    if (mSVParams->mSkipTPCOnlyCascade && !(bach.gid.getSource() == GIndex::TPC)) {
       continue; // reject TPC-only bachelors
     }
     if (!bach.hasTPC && bach.nITSclu < mSVParams->mITSSAminNcluCascades) {
@@ -1030,7 +1030,7 @@ int SVertexer::check3bodyDecays(const V0Index& v0Idx, const V0& v0, float rv0, s
       continue; // skip the track used by V0
     }
     auto& bach = tracks[it];
-    if (mSVParams->mSkipTPCOnly3Body && !bach.hasITS()) {
+    if (mSVParams->mSkipTPCOnly3Body && !(bach.gid.getSource() == GIndex::TPC)) {
       continue; // reject TPC-only bachelors
     }
     if (bach.vBracket > v0vlist.getMax()) {
@@ -1259,7 +1259,7 @@ bool SVertexer::processTPCTrack(const o2::tpc::TrackTPC& trTPC, GIndex gid, int
   const auto& vtx = mPVertices[vtxid];
   auto twe = vtx.getTimeStamp();
   int posneg = trTPC.getSign() < 0 ? 1 : 0;
-  auto& trLoc = mTracksPool[posneg].emplace_back(TrackCand{trTPC, gid, {vtxid, vtxid}, 0.});
+  auto& trLoc = mTracksPool[posneg].emplace_back(TrackCand{trTPC, gid, {vtxid, vtxid}, 0., true});
   auto err = correctTPCTrack(trLoc, trTPC, twe.getTimeStamp(), twe.getTimeStampError());
   if (err < 0) {
     mTracksPool[posneg].pop_back(); // discard