Merge branch 'master' into 'master'

Fix entry logic error

See merge request faser/calypso!113

Generators/FaserCosmicGenerator/python/cosmicSampler.py

@@ -123,10 +123,16 @@ class CosmicRay:
         r = random()
         if r < self.sampler.weightedXZ/self.sampler.weightedYZ :
             self.top = True
+            self.frontback = False
+            self.sides = False
         elif r < self.sampler.weightedXY/self.sampler.weightedYZ :
             self.frontback = True
+            self.top = False
+            self.sides = False
         else :
             self.sides = True
+            self.top = False
+            self.frontback = False
 
     def genCosTh(self):
         cosmin,cosmax=self.sampler.cosThMin,self.sampler.cosThMax