Added Mathars exponential refraction model

scripts/ADC.py

@@ -9,9 +9,11 @@ class ADC:
 		self.p2 = prism('S-FPL51', 15, wedge[1], wedge[2])
 		self.p3 = prism('S-FPL51', 15, wedge[2], wedge[1])
 		self.p4 = prism('S-LAH71', 15, wedge[1], wedge[0])
-		self.theta = 90
+		self.theta 	= 90
+		self.FR 	= 0
 
 	def setOrientation(self, theta):
+		theta = float(theta)
 		self.p1.setPrismOrientation(theta)
 		self.p2.setPrismOrientation(theta)
 		self.p3.setPrismOrientation(180-1*theta)
@@ -19,10 +21,12 @@ class ADC:
 		self.theta = theta
 
 	def setFieldRotation(self, FR):
+		FR = float(FR)
 		self.p1.setPrismOrientation(self.theta-FR)
 		self.p2.setPrismOrientation(self.theta-FR)
 		self.p3.setPrismOrientation(180-1*self.theta-FR)
 		self.p4.setPrismOrientation(180-1*self.theta-FR)
+		self.FR = FR
 
 	def calculateDispersion(self, l1, l2, hx=0, hy=0, refraction=False):
 		'''
@@ -96,6 +100,7 @@ class prism:
 		self.tilt1y 	= 0
 		self.tilt2x		= tilt2
 		self.tilt2y 	= 0
+		self.theta 		= 90
 
 		# Remember original tilts for reset:
 		self.tilt1x_OG	= tilt1
@@ -116,7 +121,7 @@ class prism:
 	def setPrismOrientation(self, theta):
 		self.tilt1x, self.tilt1y = tiltRotation(self.tilt1x_OG, self.tilt1y_OG, theta)
 		self.tilt2x, self.tilt2y = tiltRotation(self.tilt2x_OG, self.tilt2y_OG, theta)
-	
+		self.theta = theta
 
 
 def tiltRotation(tx,ty, theta):