Merge pull request cms-sw#2295 from VinInn/Matcher

Reco speedup -- Matcher

Author: ktf

CalibTracker/SiPixelErrorEstimation/src/SiPixelErrorEstimation.cc

@@ -25,6 +25,7 @@
 #include "SimDataFormats/Track/interface/SimTrackContainer.h"
 
 #include "DataFormats/SiStripDetId/interface/SiStripDetId.h"
+#include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h"
 
 #include "CalibTracker/SiStripCommon/interface/SiStripDetInfoFileReader.h"
 #include "FWCore/ParameterSet/interface/FileInPath.h"

CommonTools/Utils/test/testCutParser.cc

@@ -83,7 +83,7 @@ void testCutParser::checkAll() {
   reco::TrackBase::CovarianceMatrix cov(e, e + 15);
   trk = reco::Track(chi2, ndof, v, p, -1, cov);
 
-  hitOk = SiStripRecHit2D(LocalPoint(1,1), LocalError(1,1,1), 0, SiStripRecHit2D::ClusterRef());
+  hitOk = SiStripRecHit2D(LocalPoint(1,1), LocalError(1,1,1), 0, 0, SiStripRecHit2D::ClusterRef());
 
   edm::TypeWithDict t(typeid(reco::Track));
   o = edm::ObjectWithDict(t, & trk);
@@ -196,8 +196,7 @@ void testCutParser::checkAll() {
   checkHit( "hasPositionAndError" , false, hitThrow );
   CPPUNIT_ASSERT(hitOk.localPosition().x() == 1);
   checkHit( ".99 < localPosition.x < 1.01", true, hitOk);
-  CPPUNIT_ASSERT_THROW(hitThrow.localPosition().x(), cms::Exception);
-  CPPUNIT_ASSERT_THROW( checkHit(".99 < localPosition.x < 1.01", true, hitThrow) , cms::Exception);
+  checkHit( ".99 < localPosition.x < 1.01", false, hitThrow);
 
   // check underscores
   checkHit("cluster_regional.isNull()",true,hitOk);

DataFormats/TrackerRecHit2D/doc/TrackerRecHit2D.doc

@@ -20,7 +20,6 @@ This package contains the RecHit and RecHit collection definition for pixel and
 \subsection interface Public interface
 <!-- List the classes that are provided for use in other packages (if any) -->
 
-- BaseSiTrackerRecHit2DLocalPos Base class for silicon detector RecHits.
 - SiPixelRecHitCollectionfwd 
 - SiPixelRecHitCollection Collection of Pixel RecHits
 - SiPixelRecHitfwd
@@ -31,8 +30,6 @@ This package contains the RecHit and RecHit collection definition for pixel and
 - SiStripRecHit2DLocalPos Class for silicon strip detector RecHits. It contains a reference to the corresponding SiStripCluster.
 - SiStripRecHit2DMatchedLocalPosCollectionfwd
 - SiStripRecHit2DMatchedLocalPosCollection Collection of matched ilicon strip detector RecHits.
-- SiStripRecHit2DMatchedLocalPosfwd
-- SiStripRecHit2DMatchedLocalPos  Class for silicon strip detector matched RecHits. It contains a reference to the corresponding SiStripRecHit2DLocalPos of mono and stereo detectors.
 
 \subsection modules Modules
 <!-- Describe modules implemented in this package and their parameter set -->

DataFormats/TrackerRecHit2D/interface/BaseSiTrackerRecHit2DLocalPos.h

@@ -43,9 +43,9 @@ class BaseTrackerRecHit : public TrackingRecHit {
   // verify that hits can share clusters...
   inline bool sameDetModule(TrackingRecHit const & hit) const;
 
-  virtual LocalPoint localPosition() const  GCC11_FINAL;
+  virtual LocalPoint localPosition() const  GCC11_FINAL { return pos_;}
 
-  virtual LocalError localPositionError() const  GCC11_FINAL;
+  virtual LocalError localPositionError() const  GCC11_FINAL { return err_;}
 
   bool hasPositionAndError() const  GCC11_FINAL; 
 

DataFormats/TrackerRecHit2D/interface/BaseTrackerRecHit.h

@@ -21,24 +21,25 @@ class SiStripRecHit2D GCC11_FINAL : public TrackerSingleRecHit {
     sigmaPitch_(-1.) {}
 
 
-  SiStripRecHit2D( const LocalPoint& pos, const LocalError& err,
+  SiStripRecHit2D( const LocalPoint& pos, const LocalError& err, float isigmaPitch,
 		   const DetId& id,
 		   OmniClusterRef const& clus) : 
     TrackerSingleRecHit(pos,err,id, clus),
-    sigmaPitch_(-1.) {}
+    sigmaPitch_(isigmaPitch) {}
 
-  SiStripRecHit2D( const LocalPoint& pos, const LocalError& err,
+  SiStripRecHit2D( const LocalPoint& pos, const LocalError& err, float isigmaPitch,
 		   const DetId& id,
 		   ClusterRef const& clus) : 
     TrackerSingleRecHit(pos,err,id, clus),
-    sigmaPitch_(-1.) {}
+    sigmaPitch_(isigmaPitch) {}
 
 
-  SiStripRecHit2D(const LocalPoint& pos, const LocalError& err,
+  SiStripRecHit2D(const LocalPoint& pos, const LocalError& err, float isigmaPitch,
 		  const DetId& id,
 		  ClusterRegionalRef const& clus) : 
     TrackerSingleRecHit(pos,err,id, clus),
-    sigmaPitch_(-1.) {}
+    sigmaPitch_(isigmaPitch) {}
+
 
   ClusterRef cluster()  const { return cluster_strip() ; }
   void setClusterRef(ClusterRef const & ref)  {setClusterStripRef(ref);}
@@ -49,14 +50,13 @@ class SiStripRecHit2D GCC11_FINAL : public TrackerSingleRecHit {
   virtual void getKfComponents( KfComponentsHolder & holder ) const { getKfComponents2D(holder); }
 
 
-  double sigmaPitch() const { return sigmaPitch_;}
-  void setSigmaPitch(double sigmap) const { sigmaPitch_=sigmap;}
+  float sigmaPitch() const { return sigmaPitch_;}
 
 
 private:
 
   /// cache for the matcher....
-  mutable double sigmaPitch_;  // transient....
+  float sigmaPitch_;  // transient....
 
 
 };

DataFormats/TrackerRecHit2D/interface/SiStripRecHit2D.h

@@ -25,22 +25,12 @@ bool BaseTrackerRecHit::hasPositionAndError() const {
            (pos_.x()  != 0) || (pos_.y()  != 0) || (pos_.z()  != 0);
 }
 
-LocalPoint BaseTrackerRecHit::localPosition() const {
-    if (!hasPositionAndError()) throwExceptionUninitialized("localPosition");
-    return pos_;
-}
-
-LocalError BaseTrackerRecHit::localPositionError() const{ 
-    if (!hasPositionAndError()) throwExceptionUninitialized("localPositionError");
-    return err_;
-}
-
 
 
 void
 BaseTrackerRecHit::getKfComponents1D( KfComponentsHolder & holder ) const 
 {
-  if (!hasPositionAndError()) throwExceptionUninitialized("getKfComponents");
+  // if (!hasPositionAndError()) throwExceptionUninitialized("getKfComponents");
   AlgebraicVector1 & pars = holder.params<1>();
   pars[0] = pos_.x(); 
 
@@ -57,7 +47,7 @@ BaseTrackerRecHit::getKfComponents1D( KfComponentsHolder & holder ) const
 void
 BaseTrackerRecHit::getKfComponents2D( KfComponentsHolder & holder ) const 
 {
-  if (!hasPositionAndError()) throwExceptionUninitialized("getKfComponents");
+  //if (!hasPositionAndError()) throwExceptionUninitialized("getKfComponents");
    AlgebraicVector2 & pars = holder.params<2>();
    pars[0] = pos_.x(); 
    pars[1] = pos_.y();

DataFormats/TrackerRecHit2D/src/BaseSiTrackerRecHit2DLocalPos.cc

@@ -1,9 +1,6 @@
 #ifndef TrackerRecHit2D_CLASSES_H
 #define TrackerRecHit2D_CLASSES_H
 
-//obsolete: still needed for backcomp??
-#include "DataFormats/TrackerRecHit2D/interface/BaseSiTrackerRecHit2DLocalPos.h"
-
 #include "DataFormats/TrackerRecHit2D/interface/OmniClusterRef.h"
 #include "DataFormats/TrackerRecHit2D/interface/SiStripRecHit2DCollection.h"
 #include "DataFormats/TrackerRecHit2D/interface/SiStripRecHit1DCollection.h"

DataFormats/TrackerRecHit2D/src/BaseTrackerRecHit.cc

@@ -1,9 +1,4 @@
 <lcgdict>
-  <class name="BaseSiTrackerRecHit2DLocalPos" ClassVersion="10">
-   <version ClassVersion="10" checksum="1111914457"/>
-     <field name="pos_" transient="true" />	 
-     <field name="err_" transient="true" />	 
-   </class>	 
   <class name="GSSiTrackerRecHit2DLocalPos" ClassVersion="10">
    <version ClassVersion="10" checksum="2474445311"/>
   </class>

DataFormats/TrackerRecHit2D/src/classes.h

@@ -44,7 +44,6 @@
 #include "TrackingTools/PatternTools/interface/TrajectoryStateUpdator.h"
 #include "TrackingTools/KalmanUpdators/interface/KFUpdator.h"
 
-#include "RecoLocalTracker/SiStripRecHitConverter/interface/SiStripRecHitMatcher.h"
 #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
 #include "RecoTracker/TkDetLayers/interface/GeometricSearchTracker.h"
 #include "TrackingTools/TransientTrackingRecHit/interface/TransientTrackingRecHit.h" 
@@ -62,6 +61,7 @@ class KFUpdator;
 class MeasurementTracker;
 class MeasurementTrackerEvent;
 class NavigationSchool;
+class SiStripRecHitMatcher;
 
 class SiStripElectronSeedGenerator
 {

DataFormats/TrackerRecHit2D/src/classes_def.xml

@@ -54,14 +54,7 @@ void SiStripRecHitMatcher::doubleMatch(MonoIterator monoRHiter, MonoIterator mon
     const SiStripRecHit2D & secondHit = CollectorHelper::stereoHit(seconditer);
 
     double sigmap22 =secondHit.sigmaPitch();
-    if (sigmap22<0) {
-      LocalError tmpError( secondHit.localPositionErrorFast());
-      HelpertRecHit2DLocalPos::updateWithAPE(tmpError, *partnerstripdet);
-      MeasurementError errorstereoRH=partnertopol.measurementError(secondHit.localPositionFast(),tmpError);
-      
-      double pitch=partnertopol.localPitch(secondHit.localPositionFast());
-      secondHit.setSigmaPitch(sigmap22=errorstereoRH.uu()*pitch*pitch);
-    }
+
 
 
     double STEREOpointX=partnertopol.measurementPosition( secondHit.localPositionFast()).x();
@@ -163,15 +156,7 @@ void SiStripRecHitMatcher::doubleMatch(MonoIterator monoRHiter, MonoIterator mon
 
     // FIXME: here for test...
     double sigmap12 = monoRH.sigmaPitch();
-    if (sigmap12<0) {
-      
-      LocalError tmpError(monoRH.localPositionErrorFast());
-      HelpertRecHit2DLocalPos::updateWithAPE(tmpError,*stripdet);
-      MeasurementError errormonoRH=topol.measurementError(monoRH.localPositionFast(),tmpError);
-      
-      double pitch=topol.localPitch(monoRH.localPositionFast());
-      monoRH.setSigmaPitch(sigmap12=errormonoRH.uu()*pitch*pitch);
-    }
+
 
     //float code
     float fc1(c1), fs1(s1);