Merge pull request #45800 from SanghyunKo/egmNanoForRegression

Adapting EGM nano to use it for training energy regression

Author: cmsbuild

PhysicsTools/NanoAOD/python/egamma_custom_cff.py

@@ -83,14 +83,19 @@
 
 def addExtraEGammaVarsCustomize(process):
     #photon
+    process.finalPhotons.cut = cms.string("pt > 1 ")
     process.photonTable.variables.setValue(_phoVarsExtra.parameters_())
     process.triggerObjectTable.selections.Photon = customPhotonFilterBits
-    if process.nanoDQM:
+
+    if hasattr(process,'nanoDQM'):
       process.nanoDQM.vplots.Photon.plots = _Photon_extra_plots
+
     #electron
+    process.finalElectrons.cut = cms.string("pt > 1 ")
     process.electronTable.variables.setValue(_eleVarsExtra.parameters_())
     process.triggerObjectTable.selections.Electron = customElectronFilterBits
-    if process.nanoDQM:
+
+    if hasattr(process,'nanoDQM'):
       process.nanoDQM.vplots.Electron.plots = _Electron_extra_plots
 
     return process

PhysicsTools/NanoAOD/python/photons_cff.py

@@ -252,8 +252,9 @@ def make_bitmapVID_docstring(id_modules_working_points_pset):
     rawPreshowerEnergy = Var("superCluster.preshowerEnergy",float,doc="energy deposited in preshower",precision=10),
     seedClusEnergy = Var("superCluster.seed.energy",float,doc="seed cluster energy",precision=10),
     e5x5 = Var("full5x5_showerShapeVariables.e5x5",float,doc="energy in 5x5",precision=10),
-    dEtaSeedClusSuperClus = Var("superCluster.seed.eta-superCluster.position.Eta",float,doc="dEta(seed,SC)",precision=10),
-    dPhiSeedClusSuperClus = Var("deltaPhi(superCluster.seed.phi,superCluster.position.Phi)",float,doc="dPhi(seed,SC)",precision=10),
+    superclusterPhi = Var("superCluster().phi()",float,doc="supercluster phi",precision=10),
+    seedClusterEta = Var("superCluster().seed().eta()",float,doc="seed cluster eta",precision=10),
+    seedClusterPhi = Var("superCluster().seed().phi()",float,doc="seed cluster phi",precision=10),
     sigmaIphiIphiFull5x5 = Var("full5x5_showerShapeVariables().sigmaIphiIphi",float,doc="Full5x5 sigmaIPhiIPhi",precision=10),
     eMax = Var("full5x5_maxEnergyXtal()",float,doc="Emax",precision=10),
     e2nd = Var("full5x5_showerShapeVariables.e2nd",float,doc="E2nd",precision=10),