Merge pull request cms-sw#1644 from lgray/fixes_for_pre10

Reco fixes -- Cleanup of Old MVA assignment / kill dead code / bugfixes

Author: ktf

RecoParticleFlow/PFProducer/interface/PFEGammaAlgo.h

@@ -132,32 +132,6 @@ class PFEGammaAlgo {
     eetops_ = eetops;
   }
 
-  void setGBRForest(const GBRForest *LCorrForest,
-		    const GBRForest *GCorrForest,
-		    const GBRForest *ResForest
-		    )
-  {
-    ReaderLC_=LCorrForest;
-    ReaderGC_=GCorrForest;
-    ReaderRes_=ResForest;
-  }  
-  
-  void setGBRForest(
-		    const GBRForest *LCorrForestEB,
-		    const GBRForest *LCorrForestEE,
-		    const GBRForest *GCorrForestBarrel,
-		    const GBRForest *GCorrForestEndcapHr9,
-		    const GBRForest *GCorrForestEndcapLr9,
-		    const GBRForest *PFEcalResolution
-		    )
-  {
-    ReaderLCEB_=LCorrForestEB;
-    ReaderLCEE_=LCorrForestEE;
-    ReaderGCEB_=GCorrForestBarrel;
-    ReaderGCEEhR9_=GCorrForestEndcapHr9;
-    ReaderGCEElR9_=GCorrForestEndcapLr9;
-    ReaderRes_=PFEcalResolution;
-  }  
   void setnPU(int nVtx){
     nVtx_=nVtx;
   }
@@ -171,9 +145,7 @@ class PFEGammaAlgo {
 
   //check candidate validity
   bool isEGValidCandidate(const reco::PFBlockRef&  blockRef,
-			      std::vector< bool >&  active
-			      //      std::auto_ptr< reco::PFCandidateCollection > &pfElectronCandidates_  
-			      ){
+			  std::vector< bool >&  active){
     RunPFEG(blockRef,active);
     return (egCandidate_.size()>0);
   };
@@ -271,8 +243,7 @@ class PFEGammaAlgo {
   void linkRefinableObjectConvSecondaryKFsToSecondaryKFs(ProtoEGObject&);
   void linkRefinableObjectSecondaryKFsToECAL(ProtoEGObject&);
   // helper function for above
-  const PFClusterElement* 
-    linkKFTrackToECAL(const PFKFFlaggedElement&, ProtoEGObject&);
+  void linkKFTrackToECAL(const PFKFFlaggedElement&, ProtoEGObject&);
 
   // refining steps doing the ECAL -> track piece
   // this is the factorization of the old PF photon algo stuff
@@ -417,22 +388,6 @@ class PFEGammaAlgo {
   bool EvaluateSingleLegMVA(const reco::PFBlockRef& blockref, 
 			    const reco::Vertex& primaryvtx, 
 			    unsigned int track_index);
-  
-  double ClustersPhiRMS(const std::vector<reco::CaloCluster>& PFClusters, 
-			float PFPhoPhi) const ;
-  float EvaluateLCorrMVA(const reco::PFClusterRef& clusterRef );
-  float EvaluateGCorrMVA(const reco::PFCandidate&, 
-		    const std::vector<reco::CaloCluster>& PFClusters) ;
-  float EvaluateResMVA(const reco::PFCandidate& ,
-		     const std::vector<reco::CaloCluster>& PFClusters ) ;
- 
-  void EarlyConversion(
-		       //std::auto_ptr< reco::PFCandidateCollection > 
-		       //&pfElectronCandidates_,
-		       const std::vector<reco::PFCandidate>& 
-		       tempElectronCandidates,
-		       const reco::PFBlockElementSuperCluster* sc
-		       ); 
 };
 
 #endif

RecoParticleFlow/PFProducer/plugins/PFEGammaProducer.cc

@@ -228,12 +228,6 @@ PFEGammaProducer::beginRun(const edm::Run & run,
 
 
   //pfAlgo_->setPFPhotonRegWeights(ReaderLC_, ReaderGC_, ReaderRes_);
-  setPFPhotonRegWeights(ReaderLCEB_,
-			ReaderLCEE_,
-			ReaderGCBarrel_,
-			ReaderGCEndCapHighr9_, 
-			ReaderGCEndCapLowr9_, 
-			ReaderEcalRes_ );
 
 }
 
@@ -486,18 +480,6 @@ void PFAlgo::setPFPhotonRegWeights(
     pfpho_->setGBRForest(LCorrForest, GCorrForest, ResForest);
 } 
 */
-void PFEGammaProducer::setPFPhotonRegWeights(
-                                   const GBRForest *LCorrForestEB,
-                                   const GBRForest *LCorrForestEE,
-                                   const GBRForest *GCorrForestBarrel,
-                                   const GBRForest *GCorrForestEndcapHr9,
-                                   const GBRForest *GCorrForestEndcapLr9,
-				   const GBRForest *PFEcalResolution
-                                   ){  
-  pfeg_->setGBRForest(LCorrForestEB,LCorrForestEE,
-		      GCorrForestBarrel, GCorrForestEndcapHr9, 
-		      GCorrForestEndcapLr9, PFEcalResolution);
-}
 
 void
 PFEGammaProducer::setPFVertexParameters(bool useVertex,

RecoParticleFlow/PFProducer/plugins/PFEGammaProducer.h

@@ -63,15 +63,6 @@ class PFEGammaProducer : public edm::EDProducer {
   void setPFVertexParameters(bool useVertex,
 			     const reco::VertexCollection*  primaryVertices);	  
 
-  void setPFPhotonRegWeights(
-			     const GBRForest *LCorrForestEB,
-			     const GBRForest *LCorrForestEE,
-			     const GBRForest *GCorrForestBarrel,
-			     const GBRForest *GCorrForestEndcapHr9,
-			     const GBRForest *GCorrForestEndcapLr9,
-			     const GBRForest *PFEcalResolution
-			     );   
-  
   edm::EDGetTokenT<reco::PFBlockCollection>  inputTagBlocks_;
   edm::EDGetTokenT<reco::PFCluster::EEtoPSAssociation> eetopsSrc_;
   edm::EDGetTokenT<reco::VertexCollection>  vertices_;