Merge pull request cms-sw#167 from mariadalfonso/PhotonFix72X

fixed dataFormat change 706-->723
parbol · Dec 10, 2014 · f1844dd · f1844dd
2 parents 28a2e58 + d4c4fca
commit f1844dd
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/CMGTools/RootTools/python/physicsobjects/Photon.py b/CMGTools/RootTools/python/physicsobjects/Photon.py
@@ -5,7 +5,10 @@ class Photon(PhysicsObject ):
     '''                                                                                                                                                                                                                                                                return object from the photon 
     '''
     def hOVERe(self):
-        return self.physObj.full5x5_hadTowOverEm()
+#        return self.physObj.full5x5_hadTowOverEm()
+        hadTowDepth1O = self.physObj.hadTowDepth1OverEm() * (self.physObj.superCluster().energy()/self.physObj.full5x5_e5x5() if self.physObj.full5x5_e5x5() else 1)
+        hadTowDepth2O = self.physObj.hadTowDepth2OverEm() * (self.physObj.superCluster().energy()/self.physObj.full5x5_e5x5() if self.physObj.full5x5_e5x5() else 1)
+        return hadTowDepth1O + hadTowDepth2O
 
     def r9(self):
         return self.physObj.full5x5_r9()