Change return List to numpy array

Detector.py

@@ -25,7 +25,7 @@ class Layer:
             phiLow = np.arctan(int(x/0.0025-1)*0.0025/self.Position)    #^arctan    ^round x to next upper/lower 25 mikrometer      ^adjacent
             
         else:
-            return None # if the Layer is not hit, return "None"
+            return ((None, None), (None, None))				 # if the Layer is not hit, return "None"
             
         if 0 <= y < 50:
             thetaHigh = np.arctan(int(y/0.0025+1)*0.0025/self.Position)
@@ -36,7 +36,7 @@ class Layer:
             thetaLow = np.arctan(int(y/0.0025-1)*0.0025/self.Position)
         
         else:
-            return None
+            return ((None, None), (None, None))
         
         return ((phiHigh, phiLow), (thetaHigh, thetaLow))
 
@@ -56,9 +56,11 @@ class Detector:
         """Calculate for a given angles (phi, theta) the hitted grid.
         Returns the angles from source to grid edge or "None" if the Layer is not hitted"""
         
-        result = []
-        
         for Layer in [self.Layer1, self.Layer2, self.Layer3, self.Layer4, self.Layer5]:
-            result.append(Layer.detect((phi, theta)))
+            if Layer == self.Layer1:                            			#First Time creat numpy array
+                result = np.array([Layer.detect((phi, theta))])
+                
+            else:									#For rest, just add
+                result = np.append(result, [Layer.detect((phi, theta))], axis = 0)
         
         return result
\ No newline at end of file

Documentation_Detector.md

@@ -33,7 +33,7 @@ phi, theta: represents the angles of the particle starting from the source<br>
 phi is for the x-axis [-pi,pi]<br>
 theta is for the y-axis [-pi,pi]<br><br>
 *Return:*<br>
-Returns a List of 5 Tuples, each Tuple has 2 Tuples with a higher and a lower angle bound.<br>
+Returns a numpy array with 5 entries, each Tuple has 2 Tuples with a higher and a lower angle bound.<br>
 This means:<br>
 e.g. returnvalue [a][b][c]<br>
 a – [0,4] select Layer<br>
@@ -41,7 +41,7 @@ b
 c – 0 is the upper bound, 1 the lower bound<br><br>
 
 If a Layer is not hit, the Tuple is “None”<br>
-e.g. returnvalue [a] is “None”<br>
+e.g. returnvalue [a] is “((None, None)( None, None))”<br>
 
 
 
@@ -80,6 +80,6 @@ This means:<br>
 e.g. returnvalue [a][b]<br>
 a – 0 is phi, 1 is theta<br>
 b – 0 is the upper bound, 1 the lower bound<br><br>
-If this Layer is not hit, the Tuple is “None”<br>
+If this Layer is not hit, the Tuple is “((None, None)( None, None))”<br>
 
 

Documentation_Detector.rtf

@@ -36,9 +36,9 @@
 \af0\afs22\alang1025 \ltrch\fcs0 \fs22\lang1031\langfe1031\loch\f31506\hich\af31506\dbch\af31505\cgrid\langnp1031\langfenp1031 \snext0 \sqformat \spriority0 Normal;}{\*\cs10 \additive \ssemihidden \sunhideused \spriority1 Default Paragraph Font;}{\*
 \ts11\tsrowd\trftsWidthB3\trpaddl108\trpaddr108\trpaddfl3\trpaddft3\trpaddfb3\trpaddfr3\trcbpat1\trcfpat1\tblind0\tblindtype3\tsvertalt\tsbrdrt\tsbrdrl\tsbrdrb\tsbrdrr\tsbrdrdgl\tsbrdrdgr\tsbrdrh\tsbrdrv \ql \li0\ri0\sa160\sl259\slmult1
 \widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af0\afs22\alang1025 \ltrch\fcs0 \fs22\lang1031\langfe1031\loch\f31506\hich\af31506\dbch\af31505\cgrid\langnp1031\langfenp1031 \snext11 \ssemihidden \sunhideused 
-Normal Table;}}{\*\rsidtbl \rsid934076\rsid1719968\rsid2233600\rsid2823935\rsid5774843\rsid11427263\rsid11947466\rsid12345736\rsid12864162\rsid14355925\rsid14905652\rsid14970431}{\mmathPr\mmathFont34\mbrkBin0\mbrkBinSub0\msmallFrac0\mdispDef1\mlMargin0
-\mrMargin0\mdefJc1\mwrapIndent1440\mintLim0\mnaryLim1}{\info{\operator Ralph Weber}{\creatim\yr2018\mo11\dy9\hr14\min18}{\revtim\yr2018\mo11\dy13\hr19\min32}{\version9}{\edmins0}{\nofpages3}{\nofwords210}{\nofchars1330}{\nofcharsws1537}{\vern93}}
-{\*\xmlnstbl {\xmlns1 http://schemas.microsoft.com/office/word/2003/wordml}}\paperw12240\paperh15840\margl1417\margr1417\margt1417\margb1134\gutter0\ltrsect 
+Normal Table;}}{\*\rsidtbl \rsid934076\rsid1719968\rsid2233600\rsid2823935\rsid5000850\rsid5774843\rsid11427263\rsid11947466\rsid12345736\rsid12864162\rsid14099220\rsid14355925\rsid14905652\rsid14970431}{\mmathPr\mmathFont34\mbrkBin0\mbrkBinSub0
+\msmallFrac0\mdispDef1\mlMargin0\mrMargin0\mdefJc1\mwrapIndent1440\mintLim0\mnaryLim1}{\info{\operator Ralph Weber}{\creatim\yr2018\mo11\dy9\hr14\min18}{\revtim\yr2018\mo11\dy26\hr9\min43}{\version11}{\edmins0}{\nofpages3}{\nofwords218}{\nofchars1378}
+{\nofcharsws1593}{\vern93}}{\*\xmlnstbl {\xmlns1 http://schemas.microsoft.com/office/word/2003/wordml}}\paperw12240\paperh15840\margl1417\margr1417\margt1417\margb1134\gutter0\ltrsect 
 \widowctrl\ftnbj\aenddoc\hyphhotz425\trackmoves0\trackformatting1\donotembedsysfont0\relyonvml0\donotembedlingdata1\grfdocevents0\validatexml0\showplaceholdtext0\ignoremixedcontent0\saveinvalidxml0\showxmlerrors0\horzdoc\dghspace120\dgvspace120
 \dghorigin1701\dgvorigin1984\dghshow0\dgvshow3\jcompress\viewkind1\viewscale100\rsidroot934076 \fet0{\*\wgrffmtfilter 2450}\ilfomacatclnup0\ltrpar \sectd \ltrsect\linex0\sectdefaultcl\sftnbj {\*\pnseclvl1\pnucrm\pnstart1\pnindent720\pnhang {\pntxta .}}
 {\*\pnseclvl2\pnucltr\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl3\pndec\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl4\pnlcltr\pnstart1\pnindent720\pnhang {\pntxta )}}{\*\pnseclvl5\pndec\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}
@@ -47,12 +47,10 @@ Normal Table;}}{\*\rsidtbl \rsid934076\rsid1719968\rsid2233600\rsid2823935\rsid5
 \fs22\lang1031\langfe1031\loch\af31506\hich\af31506\dbch\af31505\cgrid\langnp1031\langfenp1031 {\rtlch\fcs1 \af0\afs28 \ltrch\fcs0 \b\fs28\lang2057\langfe1031\langnp2057\insrsid1719968\charrsid1719968 \hich\af31506\dbch\af31505\loch\f31506 
 Module: Detector
 \par }{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang2057\langfe1031\langnp2057\insrsid1719968 
-\par \hich\af31506\dbch\af31505\loch\f31506 This \hich\af31506\dbch\af31505\loch\f31506 module calculates \hich\af31506\dbch\af31505\loch\f31506 the\hich\af31506\dbch\af31505\loch\f31506  \hich\af31506\dbch\af31505\loch\f31506 possibl
-\hich\af31506\dbch\af31505\loch\f31506 e \hich\af31506\dbch\af31505\loch\f31506 ang\hich\af31506\dbch\af31505\loch\f31506 les for a parti\hich\af31506\dbch\af31505\loch\f31506 cle flying thro\hich\af31506\dbch\af31505\loch\f31506 w a 5 
-\hich\af31506\dbch\af31505\loch\f31506 layer detector.
+\par \hich\af31506\dbch\af31505\loch\f31506 This module calculates the possible angles for a particle flying throw a 5 layer detector.
 \par }{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang2057\langfe1031\langnp2057\insrsid934076 \hich\af31506\dbch\af31505\loch\f31506 To use this }{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang2057\langfe1031\langnp2057\insrsid12345736 \hich\af31506\dbch\af31505\loch\f31506 
-module, it\hich\f31506 \rquote \loch\f31506 s enough to create one instance of \hich\af31506\dbch\af31505\loch\f31506 Detector and use the function \hich\af31506\dbch\af31505\loch\f31506 Detector.detect (vector).}{\rtlch\fcs1 \af0 \ltrch\fcs0 
-\lang2057\langfe1031\langnp2057\insrsid934076\charrsid934076 
+module, it\hich\f31506 \rquote \hich\af31506\dbch\af31505\loch\f31506 s enough to create one instance of Detector and use the function Detector.detect (vector).}{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang2057\langfe1031\langnp2057\insrsid934076\charrsid934076 
+
 \par }{\rtlch\fcs1 \af0\afs28 \ltrch\fcs0 \b\fs28\lang2057\langfe1031\langnp2057\insrsid934076 
 \par }{\rtlch\fcs1 \af0\afs28 \ltrch\fcs0 \b\fs28\lang2057\langfe1031\langnp2057\insrsid934076\charrsid934076 \hich\af31506\dbch\af31505\loch\f31506 Classes:}{\rtlch\fcs1 \af0\afs28 \ltrch\fcs0 
 \b\fs28\lang2057\langfe1031\langnp2057\insrsid11947466\charrsid934076 
@@ -66,38 +64,42 @@ module, it\hich\f31506 \rquote \loch\f31506 s enough to create one instance of \
 \par \hich\af31506\dbch\af31505\loch\f31506 detect (vector)
 \par 
 \par }{\rtlch\fcs1 \af0 \ltrch\fcs0 \b\lang2057\langfe1031\langnp2057\insrsid934076\charrsid934076 \hich\af31506\dbch\af31505\loch\f31506 __init__():}{\rtlch\fcs1 \af0 \ltrch\fcs0 \b\lang2057\langfe1031\langnp2057\insrsid934076 
-\par }{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang2057\langfe1031\langnp2057\insrsid934076 \hich\af31506\dbch\af31505\loch\f31506 Creates 5 instances of CLayer with initvalues \{100, 110, 120, 130, 140\} which represents the (z-)position of the Layers.
+\par }{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang2057\langfe1031\langnp2057\insrsid934076 \hich\af31506\dbch\af31505\loch\f31506 Creates 5 instances of CLayer with initvalues \{100, 110, 120, 130, 140\} which\hich\af31506\dbch\af31505\loch\f31506 
+ represents the (z-)position of the Layers.
 \par 
 \par }{\rtlch\fcs1 \af0 \ltrch\fcs0 \b\lang2057\langfe1031\langnp2057\insrsid934076\charrsid934076 \hich\af31506\dbch\af31505\loch\f31506 detect (vector):
 \par }{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang2057\langfe1031\langnp2057\insrsid934076 \hich\af31506\dbch\af31505\loch\f31506 Loop over all Layers the function CLayer.detect (vector).
-\par }{\rtlch\fcs1 \af0 \ltrch\fcs0 \i\lang2057\langfe1031\langnp2057\insrsid934076 \hich\af31506\dbch\af31505\loch\f31506 Argument\hich\af31506\dbch\af31505\loch\f31506 s:
-\par }{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang2057\langfe1031\langnp2057\insrsid14355925 \hich\af31506\dbch\af31505\loch\f31506 phi, theta: represen\hich\af31506\dbch\af31505\loch\f31506 ts the angles of the parti\hich\af31506\dbch\af31505\loch\f31506 
-cle starting fro\hich\af31506\dbch\af31505\loch\f31506 m the source}{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang2057\langfe1031\langnp2057\insrsid934076 
-\par }{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang2057\langfe1031\langnp2057\insrsid14355925 \hich\af31506\dbch\af31505\loch\f31506 phi is\hich\af31506\dbch\af31505\loch\f31506  for th\hich\af31506\dbch\af31505\loch\f31506 e x-\hich\af31506\dbch\af31505\loch\f31506 
-axis\hich\af31506\dbch\af31505\loch\f31506  [\hich\af31506\dbch\af31505\loch\f31506 -pi,pi]
+\par }{\rtlch\fcs1 \af0 \ltrch\fcs0 \i\lang2057\langfe1031\langnp2057\insrsid934076 \hich\af31506\dbch\af31505\loch\f31506 Arguments:
+\par }{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang2057\langfe1031\langnp2057\insrsid14355925 \hich\af31506\dbch\af31505\loch\f31506 phi, theta: represents the angles of the particle starting from the source}{\rtlch\fcs1 \af0 \ltrch\fcs0 
+\lang2057\langfe1031\langnp2057\insrsid934076 
+\par }{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang2057\langfe1031\langnp2057\insrsid14355925 \hich\af31506\dbch\af31505\loch\f31506 phi is for the x-axis [-pi,pi]
 \par }\pard \ltrpar\ql \li0\ri0\sa160\sl259\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid14355925 {\rtlch\fcs1 \af0 \ltrch\fcs0 \lang2057\langfe1031\langnp2057\insrsid14355925 \hich\af31506\dbch\af31505\loch\f31506 
-theta}{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang2057\langfe1031\langnp2057\insrsid14355925 \hich\af31506\dbch\af31505\loch\f31506  is\hich\af31506\dbch\af31505\loch\f31506  for th\hich\af31506\dbch\af31505\loch\f31506 e }{\rtlch\fcs1 \af0 \ltrch\fcs0 
-\lang2057\langfe1031\langnp2057\insrsid14355925 \hich\af31506\dbch\af31505\loch\f31506 y}{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang2057\langfe1031\langnp2057\insrsid14355925 -\hich\af31506\dbch\af31505\loch\f31506 axis\hich\af31506\dbch\af31505\loch\f31506  [
-\hich\af31506\dbch\af31505\loch\f31506 -pi,pi]
+theta is for the y-\hich\af31506\dbch\af31505\loch\f31506 axis [-pi,pi]
 \par }\pard \ltrpar\ql \li0\ri0\sa160\sl259\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 {\rtlch\fcs1 \af0 \ltrch\fcs0 \lang2057\langfe1031\langnp2057\insrsid14355925 
 \par }{\rtlch\fcs1 \af0 \ltrch\fcs0 \i\lang2057\langfe1031\langnp2057\insrsid934076 \hich\af31506\dbch\af31505\loch\f31506 Return:
-\par }{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang2057\langfe1031\langnp2057\insrsid934076 \hich\af31506\dbch\af31505\loch\f31506 Returns a List of 5 Tuples, each Tuple has }{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang2057\langfe1031\langnp2057\insrsid14355925 
-\hich\af31506\dbch\af31505\loch\f31506 2\hich\af31506\dbch\af31505\loch\f31506  \hich\af31506\dbch\af31505\loch\f31506 T\hich\af31506\dbch\af31505\loch\f31506 u\hich\af31506\dbch\af31505\loch\f31506 p\hich\af31506\dbch\af31505\loch\f31506 l
-\hich\af31506\dbch\af31505\loch\f31506 e\hich\af31506\dbch\af31505\loch\f31506 s\hich\af31506\dbch\af31505\loch\f31506  with\hich\af31506\dbch\af31505\loch\f31506  a }{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang2057\langfe1031\langnp2057\insrsid2233600 
-\hich\af31506\dbch\af31505\loch\f31506 h}{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang2057\langfe1031\langnp2057\insrsid14355925 \hich\af31506\dbch\af31505\loch\f31506 i\hich\af31506\dbch\af31505\loch\f31506 gher and a lower }{\rtlch\fcs1 \af0 \ltrch\fcs0 
-\lang2057\langfe1031\langnp2057\insrsid2233600 \hich\af31506\dbch\af31505\loch\f31506 angle bound.}{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang2057\langfe1031\langnp2057\insrsid934076 
-\par }{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang2057\langfe1031\langnp2057\insrsid2233600 \hich\af31506\dbch\af31505\loch\f31506 Th\hich\af31506\dbch\af31505\loch\f31506 is \hich\af31506\dbch\af31505\loch\f31506 me\hich\af31506\dbch\af31505\loch\f31506 ans:
-\par \hich\af31506\dbch\af31505\loch\f31506 e.\hich\af31506\dbch\af31505\loch\f31506 g. re\hich\af31506\dbch\af31505\loch\f31506 turnvalue [a][b][c]
-\par \hich\af31506\dbch\af31505\loch\f31506 a \loch\af31506\dbch\af31505\hich\f31506 \endash \hich\af31506\dbch\af31505\loch\f31506  \hich\af31506\dbch\af31505\loch\f31506 [0,\hich\af31506\dbch\af31505\loch\f31506 4] s\hich\af31506\dbch\af31505\loch\f31506 ele
-\hich\af31506\dbch\af31505\loch\f31506 ct Layer
-\par \hich\af31506\dbch\af31505\loch\f31506 b \loch\af31506\dbch\af31505\hich\f31506 \endash \hich\af31506\dbch\af31505\loch\f31506  0 \hich\af31506\dbch\af31505\loch\f31506 is phi, 1 is th\hich\af31506\dbch\af31505\loch\f31506 eta
-\par \hich\af31506\dbch\af31505\loch\f31506 c \loch\af31506\dbch\af31505\hich\f31506 \endash \hich\af31506\dbch\af31505\loch\f31506  0 \hich\af31506\dbch\af31505\loch\f31506 is the \hich\af31506\dbch\af31505\loch\f31506 upper bou
-\hich\af31506\dbch\af31505\loch\f31506 nd\hich\af31506\dbch\af31505\loch\f31506 , 1 the lower bo\hich\af31506\dbch\af31505\loch\f31506 und
+\par }{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang2057\langfe1031\langnp2057\insrsid934076 \hich\af31506\dbch\af31505\loch\f31506 Returns a }{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang2057\langfe1031\langnp2057\insrsid14099220 \hich\af31506\dbch\af31505\loch\f31506 n}{
+\rtlch\fcs1 \af0 \ltrch\fcs0 \lang2057\langfe1031\langnp2057\insrsid5000850 \hich\af31506\dbch\af31505\loch\f31506 umpy}{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang2057\langfe1031\langnp2057\insrsid14099220 \hich\af31506\dbch\af31505\loch\f31506  }{\rtlch\fcs1 
+\af0 \ltrch\fcs0 \lang2057\langfe1031\langnp2057\insrsid5000850 \hich\af31506\dbch\af31505\loch\f31506 array}{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang2057\langfe1031\langnp2057\insrsid934076 \hich\af31506\dbch\af31505\loch\f31506  }{\rtlch\fcs1 \af0 
+\ltrch\fcs0 \lang2057\langfe1031\langnp2057\insrsid14099220 \hich\af31506\dbch\af31505\loch\f31506 with}{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang2057\langfe1031\langnp2057\insrsid934076 \hich\af31506\dbch\af31505\loch\f31506  5 }{\rtlch\fcs1 \af0 \ltrch\fcs0 
+\lang2057\langfe1031\langnp2057\insrsid14099220 \hich\af31506\dbch\af31505\loch\f31506 entries}{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang2057\langfe1031\langnp2057\insrsid934076 \hich\af31506\dbch\af31505\loch\f31506 , each Tuple has }{\rtlch\fcs1 \af0 
+\ltrch\fcs0 \lang2057\langfe1031\langnp2057\insrsid14355925 \hich\af31506\dbch\af31505\loch\f31506 2 Tuples with a }{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang2057\langfe1031\langnp2057\insrsid2233600 \hich\af31506\dbch\af31505\loch\f31506 h}{\rtlch\fcs1 \af0 
+\ltrch\fcs0 \lang2057\langfe1031\langnp2057\insrsid14355925 \hich\af31506\dbch\af31505\loch\f31506 igher and a lower }{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang2057\langfe1031\langnp2057\insrsid2233600 \hich\af31506\dbch\af31505\loch\f31506 angle bound.}{
+\rtlch\fcs1 \af0 \ltrch\fcs0 \lang2057\langfe1031\langnp2057\insrsid934076 
+\par }{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang2057\langfe1031\langnp2057\insrsid2233600 \hich\af31506\dbch\af31505\loch\f31506 This means:
+\par \hich\af31506\dbch\af31505\loch\f31506 e.g. returnvalue [a][b][c]
+\par \hich\af31506\dbch\af31505\loch\f31506 a \hich\f31506 \endash \loch\f31506  [0,4] select Layer
+\par \hich\af31506\dbch\af31505\loch\f31506 b \hich\f31506 \endash \loch\f31506  0 is phi, 1 is theta
+\par \hich\af31506\dbch\af31505\loch\f31506 c \hich\f31506 \endash \loch\f31506  0 is the upper bound\hich\af31506\dbch\af31505\loch\f31506 , 1 the lower bound
 \par }\pard \ltrpar\ql \li0\ri0\sa160\sl259\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid14970431 {\rtlch\fcs1 \af0 \ltrch\fcs0 \lang2057\langfe1031\langnp2057\insrsid2233600 
 \par }{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang2057\langfe1031\langnp2057\insrsid14970431 \hich\af31506\dbch\af31505\loch\f31506 \hich\f31506 If a Layer is not hit, the Tuple is \'93\loch\f31506 \hich\f31506 None\'94
-\par }{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang2057\langfe1031\langnp2057\insrsid2233600 \hich\af31506\dbch\af31505\loch\f31506 e.g. }{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang2057\langfe1031\langnp2057\insrsid2233600 \hich\af31506\dbch\af31505\loch\f31506 re
-\hich\af31506\dbch\af31505\loch\f31506 turnvalue [a}{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang2057\langfe1031\langnp2057\insrsid2233600 \hich\af31506\dbch\af31505\loch\f31506 ] is \loch\af31506\dbch\af31505\hich\f31506 \'93\hich\af31506\dbch\af31505\loch\f31506 
-None\loch\af31506\dbch\af31505\hich\f31506 \'94}{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang2057\langfe1031\langnp2057\insrsid2233600\charrsid934076 
+\par }{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang2057\langfe1031\langnp2057\insrsid2233600 \hich\af31506\dbch\af31505\loch\f31506 \hich\f31506 e.g. returnvalue [a] is \'93}{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang2057\langfe1031\langnp2057\insrsid5000850 
+\hich\af31506\dbch\af31505\loch\f31506 (\hich\af31506\dbch\af31505\loch\f31506 (}{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang2057\langfe1031\langnp2057\insrsid2233600 \hich\af31506\dbch\af31505\loch\f31506 None}{\rtlch\fcs1 \af0 \ltrch\fcs0 
+\lang2057\langfe1031\langnp2057\insrsid5000850 ,}{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang2057\langfe1031\langnp2057\insrsid5000850\charrsid5000850 \hich\af31506\dbch\af31505\loch\f31506  }{\rtlch\fcs1 \af0 \ltrch\fcs0 
+\lang2057\langfe1031\langnp2057\insrsid5000850 \hich\af31506\dbch\af31505\loch\f31506 None}{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang2057\langfe1031\langnp2057\insrsid5000850 \hich\af31506\dbch\af31505\loch\f31506 )\hich\af31506\dbch\af31505\loch\f31506 (}{
+\rtlch\fcs1 \af0 \ltrch\fcs0 \lang2057\langfe1031\langnp2057\insrsid5000850\charrsid5000850 \hich\af31506\dbch\af31505\loch\f31506  }{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang2057\langfe1031\langnp2057\insrsid5000850 \hich\af31506\dbch\af31505\loch\f31506 None}{
+\rtlch\fcs1 \af0 \ltrch\fcs0 \lang2057\langfe1031\langnp2057\insrsid5000850 ,}{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang2057\langfe1031\langnp2057\insrsid5000850\charrsid5000850 \hich\af31506\dbch\af31505\loch\f31506  }{\rtlch\fcs1 \af0 \ltrch\fcs0 
+\lang2057\langfe1031\langnp2057\insrsid5000850 \hich\af31506\dbch\af31505\loch\f31506 None}{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang2057\langfe1031\langnp2057\insrsid5000850 \hich\af31506\dbch\af31505\loch\f31506 ))}{\rtlch\fcs1 \af0 \ltrch\fcs0 
+\lang2057\langfe1031\langnp2057\insrsid2233600 \loch\af31506\dbch\af31505\hich\f31506 \'94}{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang2057\langfe1031\langnp2057\insrsid2233600\charrsid934076 
 \par }\pard \ltrpar\ql \li0\ri0\sa160\sl259\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 {\rtlch\fcs1 \af0 \ltrch\fcs0 \lang2057\langfe1031\langnp2057\insrsid14970431 
 \par 
 \par }\pard \ltrpar\ql \li0\ri0\sa160\sl259\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid14970431 {\rtlch\fcs1 \af0\afs28 \ltrch\fcs0 \b\fs28\lang2057\langfe1031\langnp2057\insrsid14970431 
@@ -115,31 +117,28 @@ None\loch\af31506\dbch\af31505\hich\f31506 \'94}{\rtlch\fcs1 \af0 \ltrch\fcs0 \l
 \par 
 \par }{\rtlch\fcs1 \af0 \ltrch\fcs0 \b\lang2057\langfe1031\langnp2057\insrsid14970431\charrsid934076 \hich\af31506\dbch\af31505\loch\f31506 detect (vector):
 \par }{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang2057\langfe1031\langnp2057\insrsid14970431 \hich\af31506\dbch\af31505\loch\f31506 Calculate }{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang2057\langfe1031\langnp2057\insrsid2823935 \hich\af31506\dbch\af31505\loch\f31506 
-the bounds of hit \hich\af31506\dbch\af31505\loch\f31506 gri\hich\af31506\dbch\af31505\loch\f31506 d.}{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang2057\langfe1031\langnp2057\insrsid14970431 
+the bounds of hit grid.}{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang2057\langfe1031\langnp2057\insrsid14970431 
 \par }{\rtlch\fcs1 \af0 \ltrch\fcs0 \i\lang2057\langfe1031\langnp2057\insrsid14970431 \hich\af31506\dbch\af31505\loch\f31506 Arguments:
 \par }\pard \ltrpar\ql \li0\ri0\sa160\sl259\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid5774843 {\rtlch\fcs1 \af0 \ltrch\fcs0 \lang2057\langfe1031\langnp2057\insrsid5774843 \hich\af31506\dbch\af31505\loch\f31506 
-phi, theta: represen\hich\af31506\dbch\af31505\loch\f31506 ts the angles of the parti\hich\af31506\dbch\af31505\loch\f31506 cle starting fro\hich\af31506\dbch\af31505\loch\f31506 m the source
-\par \hich\af31506\dbch\af31505\loch\f31506 phi is\hich\af31506\dbch\af31505\loch\f31506  for th\hich\af31506\dbch\af31505\loch\f31506 e x-\hich\af31506\dbch\af31505\loch\f31506 axis\hich\af31506\dbch\af31505\loch\f31506  [
-\hich\af31506\dbch\af31505\loch\f31506 -pi,pi]
-\par \hich\af31506\dbch\af31505\loch\f31506 theta\hich\af31506\dbch\af31505\loch\f31506  is\hich\af31506\dbch\af31505\loch\f31506  for th\hich\af31506\dbch\af31505\loch\f31506 e \hich\af31506\dbch\af31505\loch\f31506 y-\hich\af31506\dbch\af31505\loch\f31506 
-axis\hich\af31506\dbch\af31505\loch\f31506  [\hich\af31506\dbch\af31505\loch\f31506 -pi,pi]
+phi, theta: represents the angles of the particle starting from the source
+\par \hich\af31506\dbch\af31505\loch\f31506 phi is for the x-axis [-pi,pi]
+\par \hich\af31506\dbch\af31505\loch\f31506 theta is for the y-axis [-pi,pi]
 \par }\pard \ltrpar\ql \li0\ri0\sa160\sl259\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid14970431 {\rtlch\fcs1 \af0 \ltrch\fcs0 \i\lang2057\langfe1031\langnp2057\insrsid14970431 
 \hich\af31506\dbch\af31505\loch\f31506 Return:
 \par }\pard \ltrpar\ql \li0\ri0\sa160\sl259\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid5774843 {\rtlch\fcs1 \af0 \ltrch\fcs0 \lang2057\langfe1031\langnp2057\insrsid14970431 \hich\af31506\dbch\af31505\loch\f31506 
-Returns }{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang2057\langfe1031\langnp2057\insrsid5774843 \hich\af31506\dbch\af31505\loch\f31506 2 Tuples\hich\af31506\dbch\af31505\loch\f31506  with\hich\af31506\dbch\af31505\loch\f31506  a 
-\hich\af31506\dbch\af31505\loch\f31506 h\hich\af31506\dbch\af31505\loch\f31506 i\hich\af31506\dbch\af31505\loch\f31506 gher and a lower \hich\af31506\dbch\af31505\loch\f31506 angle bound.
-\par \hich\af31506\dbch\af31505\loch\f31506 Th\hich\af31506\dbch\af31505\loch\f31506 is \hich\af31506\dbch\af31505\loch\f31506 me\hich\af31506\dbch\af31505\loch\f31506 ans:
-\par \hich\af31506\dbch\af31505\loch\f31506 e.\hich\af31506\dbch\af31505\loch\f31506 g. re\hich\af31506\dbch\af31505\loch\f31506 turnvalue \hich\af31506\dbch\af31505\loch\f31506 [}{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang2057\langfe1031\langnp2057\insrsid5774843 
-\hich\af31506\dbch\af31505\loch\f31506 a}{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang2057\langfe1031\langnp2057\insrsid5774843 \hich\af31506\dbch\af31505\loch\f31506 ][}{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang2057\langfe1031\langnp2057\insrsid5774843 
-\hich\af31506\dbch\af31505\loch\f31506 b}{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang2057\langfe1031\langnp2057\insrsid5774843 \hich\af31506\dbch\af31505\loch\f31506 ]
-\par }{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang2057\langfe1031\langnp2057\insrsid5774843 \hich\af31506\dbch\af31505\loch\f31506 a}{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang2057\langfe1031\langnp2057\insrsid5774843 \hich\af31506\dbch\af31505\loch\f31506  
-\loch\af31506\dbch\af31505\hich\f31506 \endash \hich\af31506\dbch\af31505\loch\f31506  0 \hich\af31506\dbch\af31505\loch\f31506 is phi, 1 is th\hich\af31506\dbch\af31505\loch\f31506 eta
-\par }{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang2057\langfe1031\langnp2057\insrsid5774843 \hich\af31506\dbch\af31505\loch\f31506 b}{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang2057\langfe1031\langnp2057\insrsid5774843 \hich\af31506\dbch\af31505\loch\f31506  
-\loch\af31506\dbch\af31505\hich\f31506 \endash \hich\af31506\dbch\af31505\loch\f31506  0 \hich\af31506\dbch\af31505\loch\f31506 is the \hich\af31506\dbch\af31505\loch\f31506 upper bou\hich\af31506\dbch\af31505\loch\f31506 nd
-\hich\af31506\dbch\af31505\loch\f31506 , 1 the lower bo\hich\af31506\dbch\af31505\loch\f31506 und}{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang2057\langfe1031\langnp2057\insrsid5774843 
+Returns }{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang2057\langfe1031\langnp2057\insrsid5774843 \hich\af31506\dbch\af31505\loch\f31506 2 \hich\af31506\dbch\af31505\loch\f31506 Tuples with a higher and a lower angle bound.
+\par \hich\af31506\dbch\af31505\loch\f31506 This means:
+\par \hich\af31506\dbch\af31505\loch\f31506 e.g. returnvalue [a][b]
+\par \hich\af31506\dbch\af31505\loch\f31506 a \hich\f31506 \endash \loch\f31506  0 is phi, 1 is theta
+\par \hich\af31506\dbch\af31505\loch\f31506 b \hich\f31506 \endash \loch\f31506  0 is the upper bound, 1 the lower bound
 \par }{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang2057\langfe1031\langnp2057\insrsid14905652 
 \par }{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang2057\langfe1031\langnp2057\insrsid14970431 \hich\af31506\dbch\af31505\loch\f31506 If }{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang2057\langfe1031\langnp2057\insrsid12864162 \hich\af31506\dbch\af31505\loch\f31506 this }{
-\rtlch\fcs1 \af0 \ltrch\fcs0 \lang2057\langfe1031\langnp2057\insrsid14970431 \hich\af31506\dbch\af31505\loch\f31506 \hich\f31506 Layer is not hit, the Tuple is \'93\loch\f31506 \hich\f31506 None\'94}{\rtlch\fcs1 \af0 \ltrch\fcs0 
+\rtlch\fcs1 \af0 \ltrch\fcs0 \lang2057\langfe1031\langnp2057\insrsid14970431 \hich\af31506\dbch\af31505\loch\f31506 Layer is not hit, the Tuple is }{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang2057\langfe1031\langnp2057\insrsid5000850 
+\loch\af31506\dbch\af31505\hich\f31506 \'93\hich\af31506\dbch\af31505\loch\f31506 (\hich\af31506\dbch\af31505\loch\f31506 (\hich\af31506\dbch\af31505\loch\f31506 None,}{\rtlch\fcs1 \af0 \ltrch\fcs0 
+\lang2057\langfe1031\langnp2057\insrsid5000850\charrsid5000850 \hich\af31506\dbch\af31505\loch\f31506  }{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang2057\langfe1031\langnp2057\insrsid5000850 \hich\af31506\dbch\af31505\loch\f31506 None
+\hich\af31506\dbch\af31505\loch\f31506 )\hich\af31506\dbch\af31505\loch\f31506 (}{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang2057\langfe1031\langnp2057\insrsid5000850\charrsid5000850 \hich\af31506\dbch\af31505\loch\f31506  }{\rtlch\fcs1 \af0 \ltrch\fcs0 
+\lang2057\langfe1031\langnp2057\insrsid5000850 \hich\af31506\dbch\af31505\loch\f31506 None,}{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang2057\langfe1031\langnp2057\insrsid5000850\charrsid5000850 \hich\af31506\dbch\af31505\loch\f31506  }{\rtlch\fcs1 \af0 
+\ltrch\fcs0 \lang2057\langfe1031\langnp2057\insrsid5000850 \hich\af31506\dbch\af31505\loch\f31506 None\hich\af31506\dbch\af31505\loch\f31506 ))\loch\af31506\dbch\af31505\hich\f31506 \'94}{\rtlch\fcs1 \af0 \ltrch\fcs0 
 \lang2057\langfe1031\langnp2057\insrsid14970431\charrsid934076 
 \par }\pard \ltrpar\ql \li0\ri0\sa160\sl259\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid14970431 {\rtlch\fcs1 \af0 \ltrch\fcs0 \lang2057\langfe1031\langnp2057\insrsid14970431\charrsid934076 
 \par }{\*\themedata 504b030414000600080000002100e9de0fbfff0000001c020000130000005b436f6e74656e745f54797065735d2e786d6cac91cb4ec3301045f748fc83e52d4a
@@ -286,8 +285,8 @@ fffffffffffffffffdfffffffeffffffffffffffffffffffffffffffffffffffffffffffffffffff
 ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
 ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
 ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffff52006f006f007400200045006e00740072007900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000016000500ffffffffffffffffffffffff0c6ad98892f1d411a65f0040963251e5000000000000000000000000208f
-944a7f7bd401feffffff00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff00000000000000000000000000000000000000000000000000000000
+ffffffffffffffffffffffffffffffff52006f006f007400200045006e00740072007900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000016000500ffffffffffffffffffffffff0c6ad98892f1d411a65f0040963251e5000000000000000000000000203c
+32256485d401feffffff00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff00000000000000000000000000000000000000000000000000000000
 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff0000000000000000000000000000000000000000000000000000
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff000000000000000000000000000000000000000000000000
 0000000000000000000000000000000000000000000000000105000000000000}}
\ No newline at end of file