Merge pull request #48684 from mmasciov/followupCMSHLT3534-151X

Update of strip overlap check for different product ID

Author: cmsbuild

DataFormats/TrackerRecHit2D/interface/OmniClusterRef.h

@@ -70,11 +70,14 @@ class OmniClusterRef {
       return false;
     const auto& tc = stripCluster();
     const uint16_t tf = tc.firstStrip();
-    const uint16_t tl = tf + tc.amplitudes().size();
+    const uint16_t tl = tf + tc.amplitudes().size() - 1;
     const auto& oc = lh.stripCluster();
     const uint16_t of = oc.firstStrip();
-    const uint16_t ol = of + oc.amplitudes().size();
+    const uint16_t ol = of + oc.amplitudes().size() - 1;
     // By default, include edge overlaps
+    // For single-strip clusters with non-matching edges, edge overlaps are excluded
+    if (((tl - tf) <= 1 || (ol - of) <= 1) && (tf != of || tl != ol))
+      includeEdges = false;
     const auto e = includeEdges ? 1 : 0;
     // Check that last strip of "other" cluster is within first and last strip of "this", or viceversa
     // Edge strips are considered for determining overlap (e=1) if includeEdges = true (default)

DataFormats/TrackerRecHit2D/interface/TrackerSingleRecHit.h

@@ -69,7 +69,6 @@ class TrackerSingleRecHit : public BaseTrackerRecHit {
   bool sharesInput(const TrackingRecHit* other, SharedInputType what) const final;
 
   bool sharesInput(TrackerSingleRecHit const& other) const {
-    //auto const& otherClus = reinterpret_cast<const BaseTrackerRecHit*>(other)->firstClusterRef();
     if (cluster_.id() == other.cluster_.id())
       return (cluster_ == other.cluster_);
     else {

DataFormats/TrackerRecHit2D/src/SiStripMatchedRecHit2D.cc

@@ -22,9 +22,8 @@ bool SiStripMatchedRecHit2D::sharesInput(const TrackingRecHit* other, SharedInpu
   if (monoClusterRef().id() == otherClus.id() || stereoClusterRef().id() == otherClus.id())
     return (otherClus == stereoClusterRef()) || (otherClus == monoClusterRef());
   else {
-    const bool sameDetId = (geographicalId() == other->geographicalId());
-    bool stereoOverlap = (sameDetId) ? otherClus.stripOverlap(stereoClusterRef()) : false;
-    bool monoOverlap = (sameDetId) ? otherClus.stripOverlap(monoClusterRef()) : false;
+    bool stereoOverlap = otherClus.stripOverlap(stereoClusterRef());
+    bool monoOverlap = otherClus.stripOverlap(monoClusterRef());
     return (stereoOverlap || monoOverlap);
   }
 }
@@ -34,7 +33,7 @@ bool SiStripMatchedRecHit2D::sharesInput(TrackerSingleRecHit const& other) const
   if (monoClusterRef().id() == otherClus.id() || stereoClusterRef().id() == otherClus.id())
     return (otherClus == stereoClusterRef()) || (otherClus == monoClusterRef());
   else {
-    const bool sameDetId = (geographicalId() == other.geographicalId());
+    const bool sameDetId = sameDetModule(other);
     bool stereoOverlap = (sameDetId) ? otherClus.stripOverlap(stereoClusterRef()) : false;
     bool monoOverlap = (sameDetId) ? otherClus.stripOverlap(monoClusterRef()) : false;
     return (stereoOverlap || monoOverlap);

DataFormats/TrackerRecHit2D/src/VectorHit.cc

@@ -76,12 +76,8 @@ bool VectorHit::sharesInput(const TrackingRecHit* other, SharedInputType what) c
   if (lowerClusterRef().id() == otherClus.id() || upperClusterRef().id() == otherClus.id())
     return (otherClus == lowerClusterRef()) || (otherClus == upperClusterRef());
   else {
-    bool lowerOverlap = false;
-    bool upperOverlap = false;
-    if (geographicalId() == other->geographicalId()) {
-      lowerOverlap = otherClus.stripOverlap(lowerClusterRef());
-      upperOverlap = otherClus.stripOverlap(upperClusterRef());
-    }
+    bool lowerOverlap = otherClus.stripOverlap(lowerClusterRef());
+    bool upperOverlap = otherClus.stripOverlap(upperClusterRef());
     return (lowerOverlap || upperOverlap);
   }
 }
@@ -93,7 +89,7 @@ bool VectorHit::sharesClusters(VectorHit const& other, SharedInputType what) con
     const bool upperIdentity = this->upperClusterRef() == other.upperClusterRef();
     return (what == TrackingRecHit::all) ? (lowerIdentity && upperIdentity) : (lowerIdentity || upperIdentity);
   } else {
-    const bool sameDetId = (geographicalId() == other.geographicalId());
+    const bool sameDetId = sameDetModule(other);
     bool lowerOverlap = (sameDetId) ? other.lowerClusterRef().stripOverlap(this->lowerClusterRef()) : false;
     bool upperOverlap = (sameDetId) ? other.upperClusterRef().stripOverlap(this->upperClusterRef()) : false;
     return (what == TrackingRecHit::all) ? (lowerOverlap && upperOverlap) : (lowerOverlap || upperOverlap);