Merge pull request #17 from Sam-Harper/vid_heepV51_ecalDrivenFix

adding EcalDriven cut to VID for HEEP
slava77 · May 24, 2015 · 9c36eb5 · 9c36eb5
2 parents a1a639a + e74fc05
commit 9c36eb5
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 6 deletions.
diff --git a/RecoEgamma/ElectronIdentification/plugins/cuts/GsfEleEcalDrivenCut.cc b/RecoEgamma/ElectronIdentification/plugins/cuts/GsfEleEcalDrivenCut.cc
@@ -0,0 +1,37 @@
+#include "PhysicsTools/SelectorUtils/interface/CutApplicatorBase.h"
+#include "DataFormats/EgammaCandidates/interface/GsfElectron.h"
+#include "DataFormats/GsfTrackReco/interface/GsfTrack.h"
+
+class GsfEleEcalDrivenCut : public CutApplicatorBase {
+public:
+  GsfEleEcalDrivenCut(const edm::ParameterSet& c) :
+    CutApplicatorBase(c),
+    ecalDrivenEB_(c.getParameter<int>("ecalDrivenEB")),
+    ecalDrivenEE_(c.getParameter<int>("ecalDrivenEE")),
+    barrelCutOff_(c.getParameter<double>("barrelCutOff")){
+  }
+
+  result_type operator()(const reco::GsfElectronPtr&) const override final;
+
+  CandidateType candidateType() const override final { 
+    return ELECTRON; 
+  }
+
+private:
+  const int ecalDrivenEB_, ecalDrivenEE_;// -1 ignore, 0 = fail ecalDriven, 1 =pass ecalDriven
+  const double barrelCutOff_;
+};
+
+DEFINE_EDM_PLUGIN(CutApplicatorFactory,
+		  GsfEleEcalDrivenCut,
+		  "GsfEleEcalDrivenCut");
+
+CutApplicatorBase::result_type 
+GsfEleEcalDrivenCut::
+operator()(const reco::GsfElectronPtr& cand) const{ 
+  const bool ecalDriven =  std::abs(cand->superCluster()->position().eta()) < barrelCutOff_ ? 
+    ecalDrivenEB_ : ecalDrivenEE_;
+  if(ecalDriven<0) return true;
+  else if(ecalDriven==0) return !cand->ecalDriven();
+  else return cand->ecalDriven();
+}
diff --git a/RecoEgamma/ElectronIdentification/python/Identification/heepElectronID_HEEPV51_cff.py b/RecoEgamma/ElectronIdentification/python/Identification/heepElectronID_HEEPV51_cff.py
@@ -45,7 +45,8 @@
     effAreaForEHIso=0.28,        
     # other cuts
     dxyCut=0.02,
-    maxMissingHitsCut=1          
+    maxMissingHitsCut=1,
+    ecalDrivenCut=1
     )
 
 WP_HEEP51_EE = HEEP_WorkingPoint_V1(
@@ -78,7 +79,8 @@
     effAreaForEHIso=0.28,        
     # other cuts
     dxyCut=0.05,
-    maxMissingHitsCut=1
+    maxMissingHitsCut=1,
+    ecalDrivenCut=1
 
     )
 
@@ -95,6 +97,6 @@
 # 3) update the MD5 sum strings below and uncomment the lines again.
 #
 
-central_id_registry.register(heepElectronID_HEEPV51.idName,"d930c34a554f86e6d4e8c247c4737140")
+central_id_registry.register(heepElectronID_HEEPV51.idName,"b0e84f87acbc411de145ab2b8187ef1c")
 
 heepElectronID_HEEPV51.isPOGApproved = cms.untracked.bool(True)
diff --git a/RecoEgamma/ElectronIdentification/python/Identification/heepElectronID_tools.py b/RecoEgamma/ElectronIdentification/python/Identification/heepElectronID_tools.py
@@ -45,7 +45,8 @@ def __init__(self,
                  effAreaForEHIso, 
                  # other cuts:
                  dxyCut,
-                 maxMissingHitsCut
+                 maxMissingHitsCut,
+                 ecalDrivenCut
                  ):
         # assign values taken from all the arguments above
         self.idName                  = idName
@@ -66,7 +67,7 @@ def __init__(self,
         self.effAreaForEHIso         = effAreaForEHIso
         self.dxyCut                  = dxyCut                 
         self.maxMissingHitsCut       = maxMissingHitsCut      
-
+        self.ecalDrivenCut           = ecalDrivenCut
 # ==============================================================
 # Define individual cut configurations used by complete cut sets
 # ==============================================================
@@ -215,6 +216,15 @@ def psetGsfEleMissingHitsCut(wpEB, wpEE):
         needsAdditionalProducts = cms.bool(False),
         isIgnored = cms.bool(False)
         )
+def psetGsfEleEcalDrivenCut(wpEB, wpEE):
+    return cms.PSet(
+        cutName = cms.string('GsfEleEcalDrivenCut'),
+        ecalDrivenEB = cms.int32( wpEB.ecalDrivenCut ),
+        ecalDrivenEE = cms.int32( wpEE.ecalDrivenCut ),
+        barrelCutOff = cms.double(ebCutOff),
+        needsAdditionalProducts = cms.bool(False),
+        isIgnored = cms.bool(False)
+        ) 
 
 # ==============================================================
 # Define the complete cut sets
@@ -239,7 +249,8 @@ def configureHEEPElectronID_V51(wpEB, wpEE):
             psetGsfEleTrkPtIsoCut(wpEB,wpEE),             #7
             psetGsfEleEmHadD1IsoRhoCut(wpEB,wpEE),        #8
             psetGsfEleDxyCut(wpEB,wpEE),                  #9
-            psetGsfEleMissingHitsCut(wpEB,wpEE)           #10
+            psetGsfEleMissingHitsCut(wpEB,wpEE),          #10,
+            psetGsfEleEcalDrivenCut(wpEB,wpEE)            #11
             )
         )
     return parameterSet