Merge branch 'master-dev' into 'master'

Cleanup typos in barcode checker

See merge request faser/calypso!246

Control/CalypsoExample/BarcodeChecker/python/BarcodeCheckerAlg.py

@@ -4,7 +4,7 @@ import AthenaPython.PyAthena as PyAthena
 from AthenaPython.PyAthena import StatusCode, McEventCollection, HepMC, CLHEP
 import McParticleEvent.Pythonizations
 
-__author__ = "Dave Caser <dcasper@uci.edu>"
+__author__ = "Dave Casper <dcasper@uci.edu>"
 
 class BarcodeCheckerAlg(PyAthena.Alg):
     def __init__(self, name="BarcodeChecker", MCEventKey="TruthEvent"):
@@ -24,15 +24,16 @@ class BarcodeCheckerAlg(PyAthena.Alg):
         for mcEvt in evtCollection:
             for mcParticle in mcEvt.particles:
                 barCode = mcParticle.barcode()
-                self.maxLow = max(self.maxLow, barCode%200000)
+                if barCode%1000000 <= 200000:
+                    self.maxLow = max(self.maxLow, barCode%1000000)
                 if barCode%1000000 > 200000:
                     self.maxMid = max(self.maxMid, barCode%1000000 - 200000)
                 self.maxHi = max(self.maxHi, barCode//1000000)
         return StatusCode.Success
 
     def finalize(self):
-        print("Low part: ", self.maxLow, " out of 200000 (",100*self.maxLow/200000,"% of overflow)")
-        print("Mid part: ", self.maxMid, " out of ", 1000000 - 200000, " (",100*self.maxMid/(1000000-200000),"% of overflow")
-        print("Hi  part: ", self.maxHi, " out of ", (1<<31)//1000000, " (", 100*self.maxHi/((1<<31)//1000000),"% of overflow")
+        print("Low part: ", self.maxLow, " out of 200000 (",100*self.maxLow/200000,"% of overflow )")
+        print("Mid part: ", self.maxMid, " out of ", 1000000 - 200000, " (",100*self.maxMid/(1000000-200000),"% of overflow )")
+        print("Hi  part: ", self.maxHi, " out of ", (1<<31)//1000000, " (", 100*self.maxHi/((1<<31)//1000000),"% of overflow )")
 
         return StatusCode.Success
\ No newline at end of file