Merge remote-tracking branch 'origin/CMSSW_7_0_X' into CMSSW_7_0_X

cms-sw · Nov 27, 2013 · 3297369 · 3297369
2 parents 84b7281 + 59ee5d2
commit 3297369
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/RecoEcal/EgammaClusterProducers/interface/PreshowerPhiClusterProducer.h b/RecoEcal/EgammaClusterProducers/interface/PreshowerPhiClusterProducer.h
@@ -64,6 +64,8 @@ class PreshowerPhiClusterProducer : public edm::EDProducer {
   double aEta_[4];
   double bEta_[4];
 
+  double etThresh_;
+
   PreshowerPhiClusterAlgo * presh_algo; // algorithm doing the real work
    // The set of used DetID's
   //std::set<DetId> used_strips;

diff --git a/RecoEcal/EgammaClusterProducers/src/PreshowerPhiClusterProducer.cc b/RecoEcal/EgammaClusterProducers/src/PreshowerPhiClusterProducer.cc
@@ -65,6 +65,8 @@ PreshowerPhiClusterProducer::PreshowerPhiClusterProducer(const edm::ParameterSet
   esPhiClusterDeltaEta_      = ps.getParameter<double>("esPhiClusterDeltaEta");
   esPhiClusterDeltaPhi_      = ps.getParameter<double>("esPhiClusterDeltaPhi");
 
+  etThresh_                  = ps.getParameter<double>("etThresh");
+
   presh_algo = new PreshowerPhiClusterAlgo(esStripECut);
 }
 
@@ -250,8 +252,13 @@ void PreshowerPhiClusterProducer::produce(edm::Event& evt, const edm::EventSetup
     else if (condP1 == 0 && condP2 == 1) sc.setPreshowerPlanesStatus(2);
     else if (condP1 == 0 && condP2 == 0) sc.setPreshowerPlanesStatus(3);
 
-    new_SC.push_back(sc);
-    //cout<<"result : "<<sc.energy()<<" "<<it_super->energy()<<" "<<deltaE<<" "<<e1*mip_<<" "<<e2*mip_<<endl;    
+    if (etThresh_>0){ // calling postion().theta can be expensive
+        if (sc.energy()*sin(sc.position().theta())>etThresh_ ) 
+            new_SC.push_back(sc);
+    } else {
+        new_SC.push_back(sc);
+    }
+
   } // end of cycle over SCs
 
   // copy the preshower clusters into collections and put in the Event: