fixed bug in get_eclipse_depth

tomlouden · Oct 9, 2017 · 455fd17 · 455fd17
1 parent 5426754
commit 455fd17
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/c_src/web.c b/c_src/web.c
@@ -136,6 +136,7 @@ double *lightcurve(int n_layers, int n_points, double *t, double tc, double per,
 
         if(t_dist < (r2+1)){
             printf("IMPROPERLY SPECIFIED PARAMETERS, PLANET IS INSIDE STAR! ABORT!\n");
+            exit(0);
             return output;
         }
 

diff --git a/spiderman/params.py b/spiderman/params.py
@@ -375,7 +375,17 @@ def eclipse_depth(self,phase=0.5,stellar_grid=False):
 		if(self.a_abs == None):
 			self.a_abs = 1.0
 
-		out = _web.lightcurve(self.n_layers,t,0.0,1.0,self.a_abs,self.inc,0.0,0.0,self.a,self.rp,self.p_u1,self.p_u2,self.brightness_type,brightness_params,teffs,totals,len(totals),0)[0] - _web.lightcurve(self.n_layers,t,0.0,1.0,self.a_abs,self.inc,0.0,0.0,self.a,self.rp,self.p_u1,self.p_u2,self.brightness_type,brightness_params,teffs,totals,len(totals),1)[0]
+		if self.filter != False:
+			use_filter = 1
+			filter = get_filter(self.filter)
+		else:
+			use_filter = 0
+			filter = [[],[]]
+
+		n_wvls = len(filter[0])
+
+
+		out = _web.lightcurve(self.n_layers,t,0.0,1.0,self.a_abs,self.inc,0.0,0.0,self.a,self.rp,self.p_u1,self.p_u2,self.brightness_type,brightness_params,teffs,totals,len(totals),0, filter[0], filter[1], n_wvls,use_filter,self.grid[0],self.grid[1],self.grid[2])[0] - _web.lightcurve(self.n_layers,t,0.0,1.0,self.a_abs,self.inc,0.0,0.0,self.a,self.rp,self.p_u1,self.p_u2,self.brightness_type,brightness_params,teffs,totals,len(totals),1, filter[0], filter[1], n_wvls,use_filter,self.grid[0],self.grid[1],self.grid[2])[0]
 
 		return np.array(out)