Merge pull request #15114 from VinInn/HipMitigation

Hip mitigation
cms-sw · Jul 12, 2016 · 7ff241d · 7ff241d
2 parents 7311162 + ce75214
commit 7ff241d
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 7 deletions.
diff --git a/RecoTracker/MeasurementDet/plugins/TkGluedMeasurementDet.cc b/RecoTracker/MeasurementDet/plugins/TkGluedMeasurementDet.cc
@@ -16,6 +16,9 @@
 
 #include <typeinfo>
 
+#include "DataFormats/SiStripDetId/interface/TOBDetId.h"
+
+
 namespace {
   inline
   std::pair<LocalPoint,LocalError> projectedPos(const TrackingRecHit& hit,
@@ -130,6 +133,16 @@ bool TkGluedMeasurementDet::measurements( const TrajectoryStateOnSurface& stateO
 
    if (result.size()>oldSize) return true;
 
+   auto id = geomDet().geographicalId().subdetId()-3;
+   auto l = TOBDetId(geomDet().geographicalId()).layer();
+   bool killHIP = (1==l) && (2==id); //TOB1
+   killHIP &= stateOnThisDet.globalMomentum().perp2()>0.81f;
+   if (killHIP) {
+        result.add(theInactiveHit, 0.F); 
+        return true;
+   }
+
+
    //LogDebug("TkStripMeasurementDet") << "No hit found on TkGlued. Testing strips...  ";
    const BoundPlane &gluedPlane = geomDet().surface();
    if (  // sorry for the big IF, but I want to exploit short-circuiting of logic
@@ -139,7 +152,8 @@ bool TkGluedMeasurementDet::measurements( const TrajectoryStateOnSurface& stateO
 				      (theMonoDet->hasAllGoodChannels() || 
 				       testStrips(stateOnThisDet,gluedPlane,*theMonoDet)
 				       )
-				      ) /*Mono OK*/ || 
+				      ) /*Mono OK*/ 
+                                     && // was || 
 				     (theStereoDet->isActive(data) && 
 				      (theStereoDet->hasAllGoodChannels() || 
 				       testStrips(stateOnThisDet,gluedPlane,*theStereoDet)

diff --git a/RecoTracker/MeasurementDet/plugins/doubleMatch.icc b/RecoTracker/MeasurementDet/plugins/doubleMatch.icc
@@ -149,12 +149,13 @@ void TkGluedMeasurementDet::doubleMatch(const TrajectoryStateOnSurface& ts, cons
 			    gluedDet, trdir, chelper);
   }
 
-  // if no match found try add mon than try to add stereo...
-//  if (0==collector.size()) 
-//    projectOnGluedDet( collector, monoHits, glbDir);
-//  if (0==collector.size())
-//    projectOnGluedDet( collector, stereoHits, glbDir);
-
+  if (ts.globalMomentum().perp2()>0.81f) {
+    // if no match found try add mon than try to add stereo...
+    if (0==collector.size()) 
+      projectOnGluedDet( collector, monoHits, glbDir);
+    if (0==collector.size())
+      projectOnGluedDet( collector, stereoHits, glbDir);
+  }
   /*
   // recover hits outside 
   if ( collector.filter() && 0==collector.size())  {