finalised all variables

cms-sw · Aug 18, 2023 · 6b4bfae · 6b4bfae
1 parent fc3cd1c
commit 6b4bfae
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/PhysicsTools/NanoAOD/python/electrons_cff.py b/PhysicsTools/NanoAOD/python/electrons_cff.py
@@ -2,7 +2,7 @@
 from PhysicsTools.NanoAOD.simpleCandidateFlatTableProducer_cfi import simpleCandidateFlatTableProducer
 from PhysicsTools.NanoAOD.nano_eras_cff import *
 from PhysicsTools.NanoAOD.common_cff import *
-from math import ceil,log,fmod
+from math import ceil,log
 
 ############################FOR bitmapVIDForEle main defn#############################
 electron_id_modules_WorkingPoints_nanoAOD = cms.PSet(
@@ -409,6 +409,7 @@ def _get_bitmapVIDForEle_docstring(modules,WorkingPoints):
     phiWidth = Var("superCluster.phiWidth",float,doc="phiwidth of supercluster",precision=10),
     seedClusEnergy = Var("superCluster.seed.energy",float,doc="seed cluster energy",precision=10),
     hoeSingleTower = Var("hcalOverEcalBc",float,doc="Single HCAL tower based H/E",precision=10),
+    hoeFull5x5 = Var("full5x5_hcalOverEcal",float,doc="Full5x5 cone-based H/E",precision=10),
     sigmaIetaIphiFull5x5 = Var("full5x5_showerShape.sigmaIetaIphi",float,doc="Full5x5 sigmaIEtaIPhi",precision=10),
     eMax = Var("full5x5_showerShape.eMax",float,doc="Emax",precision=10),
     e2nd = Var("full5x5_showerShape.e2nd",float,doc="E2nd",precision=10),
@@ -438,8 +439,12 @@ def _get_bitmapVIDForEle_docstring(modules,WorkingPoints):
     ecalEnergyError = Var("ecalEnergyError",float,doc="ecalEnergy error",precision=10),
     trackMomentumError = Var("trackMomentumError",float,doc="trackMomentum error",precision=10),
     trackMomentum = Var("trackMomentumAtVtx().R()",float,doc="trackMomentum at vertex",precision=10),
-    #iEtaOriXMod5 = Var("?superCluster().seedCrysIEtaOrIx()>0?((superCluster().seedCrysIEtaOrIx()-1)%5):((superCluster().seedCrysIEtaOrIx()+1)%5)",int,doc="iEta/iX Mod 5"),
-    #iEtaOriXMod5 = Var("80%5",int,doc="iEta/iX Mod 5"),
+    trkLayersWithMeas = Var("gsfTrack.hitPattern.trackerLayersWithMeasurement",int,doc="trackerLayersWithMeasurement"),
+    nValidPixBarrelHits = Var("gsfTrack.hitPattern.numberOfValidPixelBarrelHits",int,doc="numberOfValidPixelBarrelHits"),
+    nValidPixEndcapHits = Var("gsfTrack.hitPattern.numberOfValidPixelEndcapHits",int,doc="numberOfValidPixelEndcapHits"),
+    superClusterFbrem = Var("superClusterFbrem",float,doc="superClusterFbrem",precision=10),
+    convVtxFitProb = Var("convVtxFitProb",float,doc="convVtxFitProb",precision=10),
+    clustersSize = Var("superCluster.clustersSize",int,doc="clustersSize"),
 
 )
 

diff --git a/PhysicsTools/NanoAOD/python/photons_cff.py b/PhysicsTools/NanoAOD/python/photons_cff.py
@@ -285,7 +285,14 @@ def make_bitmapVID_docstring(id_modules_working_points_pset):
     e2x5Left = Var("full5x5_showerShapeVariables.e2x5Left",float,doc="E2x5Left",precision=10),
     e2x5Right = Var("full5x5_showerShapeVariables.e2x5Right",float,doc="E2x5Right",precision=10),
     nSaturatedXtals = Var("nSaturatedXtals",int,doc="number of saturated crystals"),
-    numberOfClusters = Var("superCluster.clusters.size",int,doc="number of clusters")
+    numberOfClusters = Var("superCluster.clusters.size",int,doc="number of clusters"),
+    hadTowOverEm = Var("hadTowOverEm",float,doc="single tower based H/E",precision=10),
+    ecalRecHitIsolation = Var("ecalRecHitSumEtConeDR03",float,doc="ECAL RecHit isolation",precision=10),
+    sigmaIetaIetaFrac = Var("sigmaIetaIeta",float,doc="fractional sigmaIetaIeta",precision=10),
+    ecalPFClusterIso = Var("ecalPFClusterIso",float,doc="ecal PFCluster Isolation",precision=10),
+    hcalPFClusterIso = Var("hcalPFClusterIso",float,doc="hcal PFCluster Isolation",precision=10),
+    chargedHadronIso = Var("chargedHadronIso",float,doc="charged hadron Isolation",precision=10),
+    trkSumPtSolidConeDR04 = Var("trkSumPtSolidConeDR04",float,doc="track isolation solid cone 0.4",precision=10)
 )
 
 photonExtraTable.variables = cms.PSet(