PFEGamma Rewrite for CMSSW 70X

DataFormats/EgammaReco/interface/SuperCluster.h

@@ -19,7 +19,7 @@
 namespace reco {
   class SuperCluster : public CaloCluster {
   public:
-
+    typedef std::vector<std::pair<CaloClusterPtr::key_type,CaloClusterPtr> > EEtoPSAssociation;
     typedef math::XYZPoint Point;
 
     /// default constructor
@@ -67,6 +67,12 @@ namespace reco {
     /// seed BasicCluster
     const CaloClusterPtr & seed() const { return seed_; }
 
+    /// const access to the cluster list itself
+    const CaloClusterPtrVector& clusters() const { return clusters_; }
+
+    /// const access to the preshower cluster list itself
+    const CaloClusterPtrVector& preshowerClusters() const { return preshowerClusters_; }
+
     /// fist iterator over BasicCluster constituents
     CaloCluster_iterator clustersBegin() const { return clusters_.begin(); }
 
@@ -77,11 +83,14 @@ namespace reco {
     CaloCluster_iterator preshowerClustersBegin() const { return preshowerClusters_.begin(); }
 
     /// last iterator over PreshowerCluster constituents
-    CaloCluster_iterator preshowerClustersEnd() const { return preshowerClusters_.end(); }
+    CaloCluster_iterator preshowerClustersEnd() const { return preshowerClusters_.end(); }    
 
     /// number of BasicCluster constituents
     size_t clustersSize() const { return clusters_.size(); }
 
+    /// number of BasicCluster PreShower constituents
+    size_t preshowerClustersSize() const { return preshowerClusters_.size(); }
+
     /// list of used xtals by DetId // now inherited by CaloCluster
     //std::vector<DetId> getHitsByDetId() const { return usedHits_; }
 
@@ -92,10 +101,10 @@ namespace reco {
     void addCluster( const CaloClusterPtr & r ) { 
       clusters_.push_back( r ); 
       computeRawEnergy();
-    }
+    }    
 
     /// add reference to constituent BasicCluster
-    void addPreshowerCluster( const CaloClusterPtr & r ) { preshowerClusters_.push_back( r ); }
+    void addPreshowerCluster( const CaloClusterPtr & r ) { preshowerClusters_.push_back( r ); }    
 
     /** Set preshower planes status :
         0 : both planes working

DataFormats/EgammaReco/src/SuperCluster.cc

@@ -1,6 +1,7 @@
 // $Id: SuperCluster.cc,v 1.17 2011/02/17 22:42:03 argiro Exp $
 #include "DataFormats/EgammaReco/interface/BasicCluster.h"
 #include "DataFormats/EgammaReco/interface/SuperCluster.h"
+#include <algorithm>
 using namespace reco;
 
 SuperCluster::SuperCluster( double energy, const math::XYZPoint& position ) :
@@ -80,8 +81,6 @@ SuperCluster::SuperCluster( double energy, const math::XYZPoint& position,
   computeRawEnergy();
 }
 
-
-
 void SuperCluster::computeRawEnergy() {
 
   rawEnergy_ = 0.;

DataFormats/EgammaReco/src/classes.h

@@ -37,6 +37,10 @@ namespace {
     edm::Wrapper<edm::RefVector<reco::BasicClusterCollection> > wrv1;
     std::vector<reco::BasicClusterRef> vr1;
 
+    reco::SuperCluster::EEtoPSAssociation sceepsassoc;
+    edm::Wrapper<reco::SuperCluster::EEtoPSAssociation> wsceepsassoc;
+    std::pair<unsigned long,std::vector<size_t> > sceepsassocintval;
+    std::pair<reco::CaloClusterPtr::key_type,reco::CaloClusterPtr> sceepsassocval;
     std::vector<reco::SuperCluster> sv3;
     reco::SuperClusterCollection v3;
     edm::Wrapper<reco::SuperClusterCollection> w3;

DataFormats/EgammaReco/src/classes_def.xml

@@ -39,6 +39,9 @@
   <class name="edm::Wrapper<edm::RefVector<std::vector<reco::BasicCluster>,reco::BasicCluster,edm::refhelper::FindUsingAdvance<std::vector<reco::BasicCluster>,reco::BasicCluster> > >"/>
   <class name="std::vector<edm::Ref<std::vector<reco::BasicCluster>,reco::BasicCluster,edm::refhelper::FindUsingAdvance<std::vector<reco::BasicCluster>,reco::BasicCluster> > >"/>
 
+  <class name="std::pair<edm::Ptr<reco::CaloCluster>::key_type,edm::Ptr<reco::CaloCluster> >"/>
+  <class name="reco::SuperCluster::EEtoPSAssociation"/>
+  <class name="edm::Wrapper<reco::SuperCluster::EEtoPSAssociation>"/>
   <class name="reco::SuperCluster" ClassVersion="11">
    <version ClassVersion="11" checksum="83023066"/>
    <version ClassVersion="10" checksum="3131732439"/>

DataFormats/ParticleFlowCandidate/interface/PFCandidateEGammaExtra.h

@@ -87,7 +87,7 @@ namespace reco {
     const std::vector<reco::TrackRef>& singleLegConvTrackRef() const {return assoSingleLegRefTrack_;}
 
     /// add Single Leg Conversion mva
-    void addSingleLegConvMva(float& mvasingleleg);
+    void addSingleLegConvMva(const float& mvasingleleg);
 
     /// return Single Leg Conversion mva
     const std::vector<float>& singleLegConvMva() const {return assoSingleLegMva_;}

DataFormats/ParticleFlowCandidate/src/PFCandidateEGammaExtra.cc

@@ -157,7 +157,7 @@ void PFCandidateEGammaExtra::addSingleLegConvTrackRef(const reco::TrackRef& trac
   assoSingleLegRefTrack_.push_back(trackref);
 }
 
-void PFCandidateEGammaExtra::addSingleLegConvMva(float& mvasingleleg){
+void PFCandidateEGammaExtra::addSingleLegConvMva(const float& mvasingleleg){
   assoSingleLegMva_.push_back(mvasingleleg);
 }
 

RecoEcal/EgammaClusterAlgos/interface/PFECALSuperClusterAlgo.h

@@ -35,18 +35,11 @@ class TH2F;
   Additional Authors (Mustache): Y. Gershtein, R. Patel, L. Gray
   \date July 2012
 */
-// hash function for edm::Ptr<reco::PFCluster
-namespace std {
-  template <> struct hash<edm::Ptr<reco::PFCluster> > {
-    size_t operator()(const edm::Ptr<reco::PFCluster> & x) const {
-      return hash<ptrdiff_t>()((ptrdiff_t)x.get());
-    }
-  };
-}
 
 class PFECALSuperClusterAlgo {  
  public:
   enum clustering_type{kBOX=1, kMustache=2};
+  enum energy_weight{kRaw, kCalibratedNoPS, kCalibratedTotal};
 
   // simple class for associating calibrated energies
   class CalibratedPFCluster {
@@ -78,6 +71,10 @@ class PFECALSuperClusterAlgo {
 
   void setClusteringType(clustering_type thetype) { _clustype = thetype; } 
 
+  void setEnergyWeighting(energy_weight thetype) { _eweight = thetype; } 
+
+  void setUseETForSeeding(bool useET) { threshIsET_ = useET; } 
+
   void setUseDynamicDPhi(bool useit) { _useDynamicDPhi = useit; } 
 
   void setThreshPFClusterSeedBarrel(double thresh){ threshPFClusterSeedBarrel_ = thresh;}
@@ -106,7 +103,9 @@ class PFECALSuperClusterAlgo {
   std::auto_ptr<reco::SuperClusterCollection>
     getEBOutputSCCollection() { return superClustersEB_; }
   std::auto_ptr<reco::SuperClusterCollection>
-    getEEOutputSCCollection() { return superClustersEE_; }  
+    getEEOutputSCCollection() { return superClustersEE_; } 
+  std::auto_ptr<reco::SuperCluster::EEtoPSAssociation>
+    getEEtoPSAssociation() { return EEtoPS_; } 
 
   void loadAndSortPFClusters(const edm::View<reco::PFCluster>& ecalclusters,
 			     const edm::View<reco::PFCluster>& psclusters);
@@ -117,12 +116,12 @@ class PFECALSuperClusterAlgo {
 
   CalibratedClusterPtrVector _clustersEB;
   CalibratedClusterPtrVector _clustersEE;
-  std::unordered_map<edm::Ptr<reco::PFCluster>, 
-    edm::PtrVector<reco::PFCluster> > _psclustersforee;
   std::auto_ptr<reco::SuperClusterCollection> superClustersEB_;
   std::auto_ptr<reco::SuperClusterCollection> superClustersEE_;
+  std::auto_ptr<reco::SuperCluster::EEtoPSAssociation> EEtoPS_;
   std::shared_ptr<PFEnergyCalibration> _pfEnergyCalibration;
   clustering_type _clustype;
+  energy_weight   _eweight;
   void buildAllSuperClusters(CalibratedClusterPtrVector&,
 			     double seedthresh);
   void buildSuperCluster(CalibratedClusterPtr&,
@@ -152,7 +151,8 @@ class PFECALSuperClusterAlgo {
   bool _useDynamicDPhi;
 
   bool applyCrackCorrections_;
-
+  bool threshIsET_;
+
   bool usePS;
 
 };