Protections for jets and MET for PFEGamma and customize function to switch on PFEG in ParticleFlow REDUX

DataFormats/CaloRecHit/src/classes.h

@@ -15,6 +15,9 @@ namespace {
     edm::Wrapper<edm::ValueMap<reco::CaloCluster> > wvmv11;
     std::vector<reco::CaloClusterPtr> v12;
 //     reco::CaloClusterCollection v1; // ambiguity with std::vector<reco::CaloCluster> v11
+    edm::Wrapper<std::vector<std::pair<unsigned long,edm::Ptr<reco::CaloCluster> > > > wveepsassocold;
+    std::vector<std::pair<unsigned long,edm::Ptr<reco::CaloCluster> > > veepsassocold;
+    std::pair<unsigned long, edm::Ptr<reco::CaloCluster> > eepsassocold;
     std::pair<DetId,float>               hitAndFraction;
     std::vector<std::pair<DetId,float> > hitsAndFractions;
     edm::Ptr<reco::CaloCluster> p1;

DataFormats/CaloRecHit/src/classes_def.xml

@@ -6,7 +6,9 @@
    <version ClassVersion="10" checksum="3936140"/>
    <version ClassVersion="11" checksum="2938838489"/>
   </class>
-
+  <class name="edm::Wrapper<std::vector<std::pair<unsigned long,edm::Ptr<reco::CaloCluster> > > >"/>
+  <class name="std::vector<std::pair<unsigned long,edm::Ptr<reco::CaloCluster> > >"/>
+  <class name="std::pair<unsigned long, edm::Ptr<reco::CaloCluster> >"/>
   <class name="edm::RefToBase<CaloRecHit>"/>
   <class name="edm::Ptr<reco::CaloCluster>"/>
   <class name="edm::PtrVector<reco::CaloCluster>"/>

DataFormats/ParticleFlowCandidate/interface/PFCandidateEGammaExtra.h

@@ -6,6 +6,10 @@
 #include "DataFormats/Math/interface/LorentzVector.h"
 #include "DataFormats/EgammaReco/interface/SuperClusterFwd.h"
 #include "DataFormats/EgammaCandidates/interface/ConversionFwd.h"
+#include "DataFormats/ParticleFlowReco/interface/PFBlock.h"
+#include "DataFormats/ParticleFlowReco/interface/PFBlockFwd.h"
+#include "DataFormats/ParticleFlowReco/interface/PFBlockElementTrack.h"
+#include "DataFormats/ParticleFlowReco/interface/PFBlockElementCluster.h"
 
 #include <iosfwd>
 
@@ -15,6 +19,9 @@ namespace reco {
  * extra information on the photon/electron particle candidate from particle flow
  *
  */
+  typedef std::pair<reco::PFBlockRef, unsigned> ElementInBlock;
+  typedef std::vector< ElementInBlock > ElementsInBlocks;
+
   class PFCandidateEGammaExtra { 
   public:    
     enum StatusFlag {
@@ -47,6 +54,21 @@ namespace reco {
       MVA_LAST
     };
 
+    enum ElectronVetoes {
+      kFailsMVA,
+      kKFTracksOnGSFCluster, // any number of additional tracks on GSF cluster
+      kFailsTrackAndHCALIso, // > 3 kfs on Gsf-cluster, bad h/e
+      kKillAdditionalKFs,    // tracks with hcal linkbut good gsf etot/p_in 
+      kItIsAPion,            // bad H/P_in, H/H+E, and E_tot/P_in
+      kCrazyEoverP,          // screwey track linking / weird GSFs
+      kTooLargeAngle,        // angle between GSF and RSC centroid too large
+      kN_EVETOS
+    };
+
+    enum PhotonVetoes {
+      kFailsTrackIso, // the photon fails tracker isolation
+      kN_PHOVETOS
+    };
 
   public:
     /// constructor
@@ -62,11 +84,22 @@ namespace reco {
     /// set kf track reference
     void setKfTrackRef(const reco::TrackRef & ref);
 
+    /// set gsf electron cluster ref
+    void setGsfElectronClusterRef(const reco::PFBlockRef& blk,
+				  const reco::PFBlockElementCluster& ref) {
+      eleGsfCluster_ = ElementInBlock(blk,ref.index());
+    }
+
     /// return a reference to the corresponding GSF track
     reco::GsfTrackRef gsfTrackRef() const { return gsfTrackRef_; }     
 
     /// return a reference to the corresponding KF track
-    reco::TrackRef kfTrackRef() const { return kfTrackRef_; }     
+    reco::TrackRef kfTrackRef() const { return kfTrackRef_; }
+
+    /// return a reference to the electron cluster ref
+    const ElementInBlock& gsfElectronClusterRef() const { 
+      return eleGsfCluster_; 
+    }
 
     /// return a reference to the corresponding supercluster
     reco::SuperClusterRef superClusterRef() const {return scRef_ ; }
@@ -143,6 +176,16 @@ namespace reco {
     float hadEnergy() const {return hadEnergy_;}
     float sigmaEtaEta() const {return sigmaEtaEta_;}
 
+    /// track counting for electrons and photons
+    void addExtraNonConvTrack(const reco::PFBlockRef& blk,
+			      const reco::PFBlockElementTrack& tkref) {
+      if( !tkref.trackType(reco::PFBlockElement::T_FROM_GAMMACONV) ) {
+	assoNonConvExtraTracks_.push_back(std::make_pair(blk,tkref.index()));
+      }
+    }
+    const ElementsInBlocks& extraNonConvTracks() const {
+      return assoNonConvExtraTracks_;
+    }        
 
  private:
     void  setVariable(MvaVariable type,float var);
@@ -152,6 +195,8 @@ namespace reco {
     reco::GsfTrackRef gsfTrackRef_;
     /// Ref to the KF track
     reco::TrackRef kfTrackRef_;
+    /// Ref to the electron gsf cluster;
+    ElementInBlock eleGsfCluster_;
 
     /// Ref to (refined) supercluster
     reco::SuperClusterRef scRef_;
@@ -161,14 +206,18 @@ namespace reco {
 
     ///  vector of TrackRef from Single Leg conversions
     std::vector<reco::TrackRef> assoSingleLegRefTrack_;
+
+    // information for track matching
+    ElementsInBlocks assoNonConvExtraTracks_;    
 
     ///  vector of Mvas from Single Leg conversions
     std::vector<float> assoSingleLegMva_;
 
     /// vector of ConversionRef from PF
     reco::ConversionRefVector assoConversionsRef_;    
 
-    /// energy of individual clusters (corrected). The first cluster is the seed
+    /// energy of individual clusters (corrected). 
+    /// The first cluster is the seed
     std::vector<float> clusterEnergies_;
 
     /// mva variables  -  transient !

HLTriggerOffline/Top/interface/TopValidation.h

@@ -102,7 +102,7 @@ class TopValidation : public edm::EDAnalyzer {
 
   bool outputMEsInRootFile;
 
-
+  edm::InputTag offlineElectrons;
 
  edm::ParameterSet parameters;
 

HLTriggerOffline/Top/python/topvalidation_cfi.py

@@ -11,6 +11,7 @@
 
     OutputFileName = cms.string(''),
   #  DQMFolder = cms.untracked.string("HLT/Top")
-    FolderName = cms.string("HLT/Top/")
+    FolderName = cms.string("HLT/Top/"),
+    offlineElectrons = cms.InputTag('gsfElectrons')
 
  )

HLTriggerOffline/Top/src/TopValidation.cc

@@ -35,7 +35,9 @@ TopValidation::TopValidation(const edm::ParameterSet& iConfig)
   //   triggerTag_         = iConfig.getUntrackedParameter<string>("DQMFolder","HLT/Top");
      outputFileName      = iConfig.getParameter<std::string>("OutputFileName");
      outputMEsInRootFile = iConfig.getParameter<bool>("OutputMEsInRootFile");
-      FolderName_ = iConfig.getParameter<std::string>("FolderName");
+     FolderName_ = iConfig.getParameter<std::string>("FolderName");
+     offlineElectrons = 
+       iConfig.getParameter<edm::InputTag>("offlineElectrons");
 
       topFolder << FolderName_ ;  
 
@@ -82,7 +84,7 @@ TopValidation::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup)
   // electron collection
   Handle<reco::GsfElectronCollection> electronsH;
   //  iEvent.getByLabel("pixelMatchGsfElectrons",electronsH);
-  iEvent.getByLabel("gsfElectrons",electronsH);
+  iEvent.getByLabel(offlineElectrons,electronsH);
 
   // Trigger 
   Handle<TriggerResults> trh;

PhysicsTools/PatAlgos/python/tools/helpers.py

@@ -163,8 +163,8 @@ def standardizeInputTagFmt(inputTag):
 
     def enter(self,visitee):
         label = ''
-        try:    label = visitee.label_()
-        except AttributeError: label = '<Module not in a Process>'
+        #try:    label = visitee.label_()
+        #except AttributeError: label = '<Module not in a Process>'
         self.doIt(visitee, label)
     def leave(self,visitee):
         pass

RecoEcal/EgammaClusterAlgos/interface/PFECALSuperClusterAlgo.h

@@ -98,7 +98,7 @@ class PFECALSuperClusterAlgo {
 
   std::auto_ptr<reco::SuperClusterCollection>&
     getEBOutputSCCollection() { return superClustersEB_; }
-  std::auto_ptr<reco::SuperClusterCollection>
+  std::auto_ptr<reco::SuperClusterCollection>&
     getEEOutputSCCollection() { return superClustersEE_; }
 
   void loadAndSortPFClusters(const edm::View<reco::PFCluster>& ecalclusters,

RecoEcal/EgammaClusterAlgos/src/PFECALSuperClusterAlgo.cc

@@ -348,7 +348,7 @@ buildSuperCluster(CalibClusterPtr& seed,
     posZ += energyweight * cluspos.Z();    
 
     energyweighttot += energyweight;
-    corrSCEnergy    += clus->energy();    
+    corrSCEnergy    += clus->energy();   
     corrPS1Energy   += ePS1;
     corrPS2Energy   += ePS2;
   }

RecoEgamma/Configuration/python/customizePFforEGammaGED.py

@@ -0,0 +1,197 @@
+import FWCore.ParameterSet.Config as cms
+import FWCore.ParameterSet.Utilities as psu
+from  PhysicsTools.PatAlgos.tools.helpers import massSearchReplaceAnyInputTag as _replaceTags
+
+def customizePFforEGammaGED(process):
+    for path in process.paths:
+        sequences = getattr(process,path)
+        #for seq in path:
+        _replaceTags(sequences,
+                     cms.InputTag('gsfElectrons'),
+                     cms.InputTag('gedGsfElectrons'))
+        _replaceTags(sequences,
+                     cms.InputTag('gsfElectronCores'),
+                     cms.InputTag('gedGsfElectronCores'))
+
+    # all the rest:
+    if hasattr(process,'DigiToRaw'):
+        process=_customize_DigiToRaw(process)
+    if hasattr(process,'RawToDigi'):
+        process=_customize_RawToDigi(process)
+    if hasattr(process,'reconstruction'):
+        process=_customize_Reco(process)
+    if hasattr(process,'reconstructionWithFamos'):
+        process=_customize_FastSim(process)
+    if hasattr(process,'digitisation_step'):
+        process=_customize_Digi(process)
+    if hasattr(process,'HLTSchedule'):
+        process=_customize_HLT(process)
+    if hasattr(process,'L1simulation_step'):
+        process=_customize_L1Emulator(process)
+    if hasattr(process,'dqmoffline_step'):
+        process=_customize_DQM(process)
+    if hasattr(process,'dqmHarvesting'):
+        process=_customize_harvesting(process)
+    if hasattr(process,'validation_step'):
+        process=_customize_Validation(process)
+
+
+    return process
+
+def _configurePFForGEDEGamma(process):
+    process.particleFlowTmp.useEGammaFilters = cms.bool(True)
+    process.particleFlowTmp.usePFPhotons = cms.bool(False)
+    process.particleFlowTmp.usePFElectrons = cms.bool(False)
+    process.particleFlow.GsfElectrons = cms.InputTag('gedGsfElectrons')
+    process.particleFlow.Photons = cms.InputTag('gedPhotons')
+    return process
+
+
+
+def _customize_DQM(process):    
+    return process
+
+
+def _customize_Validation(process):
+    _replaceTags(process.validation_step,
+                 cms.InputTag('gsfElectrons'),
+                 cms.InputTag('gedGsfElectrons'))
+    _replaceTags(process.validation_step,
+                 cms.InputTag('gsfElectronCores'),
+                 cms.InputTag('gedGsfElectronCores'))
+    #don't ask... just don't ask
+    if hasattr(process,'HLTSusyExoValFastSim'):
+        process.HLTSusyExoValFastSim.PlotMakerRecoInput.electrons = \
+                                                 cms.string('gedGsfElectrons')
+        for pset in process.HLTSusyExoValFastSim.reco_parametersets:
+            pset.electrons = cms.string('gedGsfElectrons')
+    if hasattr(process,'HLTSusyExoVal'):
+        process.HLTSusyExoVal.PlotMakerRecoInput.electrons = \
+                                                 cms.string('gedGsfElectrons')
+        for pset in process.HLTSusyExoVal.reco_parametersets:
+            pset.electrons = cms.string('gedGsfElectrons')
+    if hasattr(process,'hltHiggsValidator'):
+        process.hltHiggsValidator.H2tau.recElecLabel = \
+                                                cms.string('gedGsfElectrons')
+        process.hltHiggsValidator.HZZ.recElecLabel = \
+                                                cms.string('gedGsfElectrons')
+        process.hltHiggsValidator.HWW.recElecLabel = \
+                                                cms.string('gedGsfElectrons')
+    if hasattr(process,'oldpfPhotonValidation'):
+        process.photonValidationSequence.remove(process.oldpfPhotonValidation)
+    return process
+
+
+def _customize_Digi(process):
+    return process
+
+
+def _customize_L1Emulator(process):
+    return process
+
+
+def _customize_RawToDigi(process):
+    return process
+
+
+def _customize_DigiToRaw(process):
+    return process
+
+
+def _customize_HLT(process):
+    return process
+
+def _customize_FastSim(process):    
+    process=_configurePFForGEDEGamma(process)
+    process.famosParticleFlowSequence.remove(process.pfElectronTranslatorSequence)
+    process.famosParticleFlowSequence.remove(process.pfPhotonTranslatorSequence)
+    process.egammaHighLevelRecoPostPF.remove(process.gsfElectronMergingSequence)
+    process.reducedEcalRecHitsEB.interestingDetIdCollections = cms.VInputTag(
+        # ecal
+        cms.InputTag("interestingEcalDetIdEB"),
+        cms.InputTag("interestingEcalDetIdEBU"),
+        # egamma
+        cms.InputTag("interestingEleIsoDetIdEB"),
+        cms.InputTag("interestingGamIsoDetIdEB"),
+        # tau
+        #cms.InputTag("caloRecoTauProducer"),
+        #pf
+        #cms.InputTag("pfElectronInterestingEcalDetIdEB"),
+        #cms.InputTag("pfPhotonInterestingEcalDetIdEB"),
+        # muons
+        cms.InputTag("muonEcalDetIds"),
+        # high pt tracks
+        cms.InputTag("interestingTrackEcalDetIds")
+        )
+    process.reducedEcalRecHitsEE.interestingDetIdCollections = cms.VInputTag(
+        # ecal
+        cms.InputTag("interestingEcalDetIdEE"),
+        # egamma
+        cms.InputTag("interestingEleIsoDetIdEE"),
+        cms.InputTag("interestingGamIsoDetIdEE"),
+        # tau
+        #cms.InputTag("caloRecoTauProducer"),
+        #pf
+        #cms.InputTag("pfElectronInterestingEcalDetIdEE"),
+        #cms.InputTag("pfPhotonInterestingEcalDetIdEE"),
+        # muons
+        cms.InputTag("muonEcalDetIds"),
+        # high pt tracks
+        cms.InputTag("interestingTrackEcalDetIds")
+        )
+
+    if hasattr(process,'ecalDrivenElectronSeeds'):
+        process.ecalDrivenElectronSeeds.barrelSuperClusters = cms.InputTag('particleFlowSuperClusterECAL:particleFlowSuperClusterECALBarrel')
+        process.ecalDrivenElectronSeeds.endcapSuperClusters = cms.InputTag('particleFlowSuperClusterECAL:particleFlowSuperClusterECALEndcapWithPreshower')
+    return process
+
+
+def _customize_Reco(process):
+    process=_configurePFForGEDEGamma(process)
+    process.particleFlowReco.remove(process.pfElectronTranslatorSequence)
+    process.particleFlowReco.remove(process.pfPhotonTranslatorSequence)
+    process.egammaHighLevelRecoPostPF.remove(process.gsfElectronMergingSequence)
+    process.reducedEcalRecHitsEB.interestingDetIdCollections = cms.VInputTag(
+        # ecal
+        cms.InputTag("interestingEcalDetIdEB"),
+        cms.InputTag("interestingEcalDetIdEBU"),
+        # egamma
+        cms.InputTag("interestingEleIsoDetIdEB"),
+        cms.InputTag("interestingGamIsoDetIdEB"),
+        # tau
+        #cms.InputTag("caloRecoTauProducer"),
+        #pf
+        #cms.InputTag("pfElectronInterestingEcalDetIdEB"),
+        #cms.InputTag("pfPhotonInterestingEcalDetIdEB"),
+        # muons
+        cms.InputTag("muonEcalDetIds"),
+        # high pt tracks
+        cms.InputTag("interestingTrackEcalDetIds")
+        )
+    process.reducedEcalRecHitsEE.interestingDetIdCollections = cms.VInputTag(
+        # ecal
+        cms.InputTag("interestingEcalDetIdEE"),
+        # egamma
+        cms.InputTag("interestingEleIsoDetIdEE"),
+        cms.InputTag("interestingGamIsoDetIdEE"),
+        # tau
+        #cms.InputTag("caloRecoTauProducer"),
+        #pf
+        #cms.InputTag("pfElectronInterestingEcalDetIdEE"),
+        #cms.InputTag("pfPhotonInterestingEcalDetIdEE"),
+        # muons
+        cms.InputTag("muonEcalDetIds"),
+        # high pt tracks
+        cms.InputTag("interestingTrackEcalDetIds")
+        )
+
+    if hasattr(process,'ecalDrivenElectronSeeds'):
+        process.ecalDrivenElectronSeeds.barrelSuperClusters = cms.InputTag('particleFlowSuperClusterECAL:particleFlowSuperClusterECALBarrel')
+        process.ecalDrivenElectronSeeds.endcapSuperClusters = cms.InputTag('particleFlowSuperClusterECAL:particleFlowSuperClusterECALEndcapWithPreshower')
+    return process
+
+
+def _customize_harvesting(process):
+    if hasattr(process,'oldpfPhotonPostprocessing'):
+        process.photonPostProcessor.remove(process.oldpfPhotonPostprocessing)
+    return process