Merge pull request #3 from LSSTDESC/extractor

Extractor

covariances/proposal.txt

@@ -0,0 +1,14 @@
+Parameter A1 $A_1$ 9.595
+Parameter A2 $A_2$ 0.0508
+Parameter ozone ozone 312.875
+Parameter PWV PWV$\,$[mm] 5.035
+Parameter VAOD VAOD 0.0032932225
+Parameter reso reso$\,$[pix] 3.87
+Parameter shift $\lambda_{\mathrm{shift}}\,$[nm] -0.0515
+	0.002956	-0.000008	-0.255530	0.000580	0.000201	-0.000798	-0.003284
+	-0.000008	0.000001	-0.000997	0.000021	-0.000000	-0.000004	-0.000006
+	-0.255530	-0.000997	285.855017	0.660027	-0.033834	0.392632	0.843175
+	0.000580	0.000021	0.660027	0.024858	-0.000039	0.004769	0.004849
+	0.000201	-0.000000	-0.033834	-0.000039	0.000019	-0.000097	-0.000320
+	-0.000798	-0.000004	0.392632	0.004769	-0.000097	0.013215	0.004233
+	-0.003284	-0.000006	0.843175	0.004849	-0.000320	0.004233	0.013362

dispersers.py

@@ -141,15 +141,21 @@ def __init__(self,N,label="",D=DISTANCE2CCD,data_dir=HOLO_DIR,verbose=False):
     def N(self,x) :
         return self.N_input
 
-    def transmission(self,wavelength):
-        return np.ones_like(wavelength).astype(float)
-
     def load_files(self,verbose=False):
         filename = self.data_dir+self.label+"/N.txt"
         if os.path.isfile(filename):
             a = np.loadtxt(filename)
             self.N_input = a[0]
             self.N_err = a[1]
+        filename = self.data_dir+self.label+"/transmission.txt"
+        if os.path.isfile(filename):
+            a = np.loadtxt(filename)
+            l, t, e = a.T
+            self.transmission = interpolate.interp1d(l,t,bounds_error=False,fill_value=0.)
+            self.transmission_err = interpolate.interp1d(l,e,bounds_error=False,fill_value=0.)
+        else :
+            self.transmission = lambda x: np.ones_like(x).astype(float)
+            self.transmission = lambda x: np.zeros_like(x).astype(float)
         filename = self.data_dir+self.label+"/hologram_center.txt"
         if os.path.isfile(filename):
             lines = [line.rstrip('\n') for line in open(filename)]

dispersers/Ron200/N.txt

@@ -0,0 +1,2 @@
+2.00e+02
+1.278433101196952748e+00

dispersers/Ron200/hologram_center.txt

@@ -0,0 +1,2 @@
+#x_center y_center theta_tilt_in_degree
+741.000 741.000 -0.277