Skip to content
GitLab
Commit 64a44b34 authored by Zhang Xin's avatar Zhang Xin
Browse files

disperse speed improve

parent baa82f5a
release_v3.0 11-csst 29-darktime-exptime-shtopen-shtstat-t current_stable_for_tests develop master milky_way_extinction new_sim release_v1.0 release_v2.0 revert-914004c1 sim_scheduler sls_psf_pca_convolve wcs_test_gridGalaxy v3.1.0 v3.0.0 v2.1.0 v2.0.0 v1.0.5
3 merge requests!11release_v1.0.5,!10version 1.0.5,!8Sls rot wcs
Hide whitespace changes
Inline Side-by-side
Showing
with 3 additions and 4 deletions
+3 -4
ObservationSim/MockObject/SpecDisperser/disperse_c/disperse.pyx
+ 3
- 4
View file @ 64a44b34
......@@ -53,7 +53,6 @@ def disperse_grism_object(np.ndarray[FTYPE_t, ndim=2] flam,
nk = len(idxl)
nl = len(full)
yfrac_off = 1-yfrac
if (flat is not None):
nlamb = len(wlambda)
......@@ -92,7 +91,7 @@ def disperse_grism_object(np.ndarray[FTYPE_t, ndim=2] flam,
k2 = idxl[k]+(j-1)*shg[1]+i
if (k2 >= 0) & (k2 < nl):
flat_ids = k2*nlamb+k
full[k2] += fl_ij*yfrac_off[k]*flat_eff_all[flat_ids]
full[k2] += fl_ij*(1-yfrac[k])*flat_eff_all[flat_ids]
else:
for i in range(0-x0[1], x0[1]):
......@@ -110,11 +109,11 @@ def disperse_grism_object(np.ndarray[FTYPE_t, ndim=2] flam,
for k in range(nk):
k1 = idxl[k]+j*shg[1]+i
if (k1 >= 0) & (k1 < nl):
full[k1] += fl_ij*yfrac[k]*ysens[k]
full[k1] += ysens[k]*fl_ij*yfrac[k]
k2 = idxl[k]+(j-1)*shg[1]+i
if (k2 >= 0) & (k2 < nl):
full[k2] += fl_ij*yfrac_off[k]*ysens[k]
full[k2] += ysens[k]*fl_ij*(1-yfrac[k])
return True
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment