Generalize Detector class

Detector.py

@@ -4,6 +4,7 @@ class Layer:
     def __init__(self, Position, BField):
         self.Position = Position
         self.BField = BField
+        self.GridSize = 0.0025 #micrometer
         
     
     #Newton-method to calculate the hit time    
@@ -45,41 +46,40 @@ class Layer:
         
 
         if 0 <= x < 50:
-            xHigh = int(x/0.0025+1)*0.0025   #upper edge of hit grid
-            xLow = int(x/0.0025)*0.0025      #lower edge of hit grid
+            xHigh = int(x/self.GridSize+1)*self.GridSize   #upper edge of hit grid
+            xLow = int(x/self.GridSize)*self.GridSize      #lower edge of hit grid
             
         elif -50 < x < 0:                   #slight different if x<0 or x>0
-            xHigh = int(x/0.0025)*0.0025 
-            xLow = int(x/0.0025-1)*0.0025    
+            xHigh = int(x/self.GridSize)*self.GridSize 
+            xLow = int(x/self.GridSize)*self.GridSize    
             
         else:
             return ((None, None), (None, None), (self.Position,	self.Position))			 # if the Layer is not hit, return "None"
             
         if 0 <= y < 50:
-            yHigh = int(y/0.0025+1)*0.0025
-            yLow = int(y/0.0025)*0.0025
+            yHigh = int(y/self.GridSize+1)*self.GridSize
+            yLow = int(y/self.GridSize)*self.GridSize
         
         elif -50 < y < 0:
-            yHigh = int(y/0.0025)*0.0025
-            yLow = int(y/0.0025-1)*0.0025
+            yHigh = int(y/self.GridSize)*self.GridSize
+            yLow = int(y/self.GridSize-1)*self.GridSize
         
         else:
             return ((None, None), (None, None), (self.Position,	self.Position))
         
-        return ((xHigh, xLow), (yHigh, yLow), (self.Position+0.005,	self.Position-0.005))
+        return ((xHigh, xLow), (yHigh, yLow), (self.Position+0.0001,	self.Position-0.0001))
 
 
 
 class Detector:
     
-    def __init__ (self, Magnet=0.522):
+    def __init__ (self, LayerArray = [100,110,120,130,140], Magnet=0.522):
         """5 Layer of Tracker"""
         self.BField = Magnet #Tesla
-        self.Layer1 = Layer (100, self.BField)
-        self.Layer2 = Layer (110, self.BField)
-        self.Layer3 = Layer (120, self.BField)
-        self.Layer4 = Layer (130, self.BField)
-        self.Layer5 = Layer (140, self.BField)
+        self.Layers = []
+
+        for zPos in LayerArray:
+            self.Layers.append(Layer (zPos, self.BField))
         
     def detect (self, particle):
         """Calculate for a given particle class the hit grid. The class needs the membervalues: vx, vy, vz, q, m - Velocity in 3 dimensions, charge, mass.
@@ -87,7 +87,7 @@ class Detector:
         
         result = np.array([[(0+0.0001,0-0.0001),(0+0.0001,0-0.0001),(0+0.0001,0-0.0001)]])
         
-        for Layer in [self.Layer1, self.Layer2, self.Layer3, self.Layer4, self.Layer5]:
+        for Layer in self.Layers:
             result = np.append(result, [Layer.detect(particle)], axis = 0)
             if result[-1][0][0] == None:    #If any layer is not hit, exit the detection
                 return None