remove debug, add comments

cms-sw · Apr 1, 2016 · 426feb3 · 426feb3
1 parent b4aa8ff
commit 426feb3
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 21 deletions.
diff --git a/RecoEgamma/EgammaElectronAlgos/src/ElectronSeedGenerator.cc b/RecoEgamma/EgammaElectronAlgos/src/ElectronSeedGenerator.cc
@@ -47,6 +47,8 @@
 #include <vector>
 #include <utility>
 
+
+#ifdef COUNT_ElectronSeeds
 namespace {
   struct Count {
     long long s=0;
@@ -56,7 +58,7 @@ namespace {
 
   Count stcount;
 }
-
+#endif
 
 
 
@@ -276,16 +278,18 @@ void  ElectronSeedGenerator::run
     // Find the seeds
     recHits_.clear();
 
-    LogDebug ("run") << "new cluster, calling seedsFromThisCluster";
+    LogDebug ("ElectronSeedGenerator") << "new cluster, calling seedsFromThisCluster";
     seedsFromThisCluster(sclRefs[i],hoe1s[i],hoe2s[i],out,tTopo);
   }
 
-  LogDebug ("run") << ": For event "<<e.id();
-  LogDebug ("run") <<"Nr of superclusters after filter: "<<sclRefs.size()
+  LogDebug ("ElectronSeedGenerator") << ": For event "<<e.id();
+  LogDebug ("ElectronSeedGenerator") <<"Nr of superclusters after filter: "<<sclRefs.size()
    <<", no. of ElectronSeeds found  = " << out.size();
 
+#ifdef COUNT_ElectronSeeds
    stcount.s+=sclRefs.size();
    stcount.n+=out.size();
+#endif
 
 }
 

diff --git a/RecoEgamma/EgammaElectronAlgos/src/PixelHitMatcher.cc b/RecoEgamma/EgammaElectronAlgos/src/PixelHitMatcher.cc
@@ -16,16 +16,6 @@
 using namespace reco ;
 using namespace std ;
 
-namespace {
-  struct Count { 
-    long long n=0;
-    ~Count() { std::cout << "PixelHitMatcher res " << n << std::endl;}
-  };
-
-  Count stcount;
-}
-
-
 PixelHitMatcher::PixelHitMatcher
  ( float phi1min, float phi1max,
    float phi2minB, float phi2maxB, float phi2minF, float phi2maxF,
@@ -135,7 +125,6 @@ PixelHitMatcher::compatibleSeeds
   // TrajectoryStateOnSurface vTsos[theTrackerGeometry->dets().size()];
 
   auto ndets = theTrackerGeometry->dets().size();
-  // std::vector<bool> away(ndets,false);
 
   int iTsos[ndets];
   for ( auto & i : iTsos) i=-1;
@@ -164,11 +153,10 @@ PixelHitMatcher::compatibleSeeds
       const GeomDet *geomdet1 = it1->det();
 
       auto ix1 = geomdet1->gdetIndex();
-      assert(ix1<int(ndets));
-      /*
-      if (away[ix1]) continue;
-      away[ix1] = geomdet1->position().basicVector().dot(xmeas.basicVector()) <0;
-      if (away[ix1]) continue;
+
+      /*  VI: this generates regression (other cut is just in phi). in my opinion it is safe and makes sense
+      auto away = geomdet1->position().basicVector().dot(xmeas.basicVector()) <0;
+      if (away) continue;
       */
 
       const GlobalPoint& hit1Pos = hit_gp_map_[idx1];
@@ -246,7 +234,6 @@ PixelHitMatcher::compatibleSeeds
 
   mapTsos2_fast_.clear() ;
 
-  stcount.n += result.size();
   return result ;
  }