Merge branch 'master' of https://github.com/desihub/desisim

desihub · Jan 3, 2015 · a4ae737 · a4ae737
2 parents 9c17396 + f36ca4a
commit a4ae737
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/py/desisim/pixsim.py b/py/desisim/pixsim.py
@@ -171,9 +171,10 @@ def new_flatexp(nspec=None, nspectrographs=10, ncpu=None):
     for channel in ('b', 'r', 'z'):
         psf = io.load_psf(channel)
         thru = io.load_throughput(channel)
-        phot = thru.photons(wave, flux, units=hdr['BUNIT'])
+        phot = thru.photons(wave, flux, units=hdr['BUNIT'], objtype='CALIB')
         ### img = psf.project(wave, phot)
-        img = parallel_project(psf, wave, phot, ncpu=ncpu)
+        ii = (psf.wmin <= wave) & (wave <= psf.wmax)
+        img = parallel_project(psf, wave[ii], phot[:,ii], ncpu=ncpu)
 
         for i in range(nspectrographs):
             camera = channel+str(i)