DarkRecipe #40

megaradrp/recipes/calibration/dark.py

@@ -45,7 +45,10 @@ def run(self, rinput):
 
         hdu, data = self.hdu_creation(rinput.obresult, {'biasmap':mbias})
 
-        hdu[0].data = hdu[0].data/3600 #3600 is the exposure time. Should be taken from the header
+        try:
+            hdu[0].data = hdu[0].data/hdu[0].header['EXPTIME']
+        except:
+            pass
 
         result = self.create_result(darkframe=hdu)
         return result

megaradrp/recipes/calibration/tests/test_dark.py

@@ -4,8 +4,8 @@
 import pytest
 import shutil
 
-from megaradrp.tests.simulation import simulate_dark
-from megaradrp.tests.simulation import ReadParams, MegaraDetectorSat
+from megaradrp.tests.simulation import simulate_dark, simulate_dark_fits
+from megaradrp.tests.simulation import ReadParams, MegaraDetectorSat, MegaraImageFactory
 from numina.core import DataFrame, ObservationResult
 
 from megaradrp.recipes.calibration.tests.test_bpm_common import generate_bias
@@ -38,11 +38,11 @@ def test_dark():
 
     number = 10
 
-    fs = [simulate_dark(detector, exposure=3600) for i in range(number)]
+    factory = MegaraImageFactory()
+    fs = [simulate_dark_fits(factory, detector, exposure=3600) for i in range(number)]
 
     for aux in range(len(fs)):
-        fits.writeto('%s/dark_%s.fits' % (temporary_path, aux), fs[aux],
-                     clobber=True)
+        fs[aux].writeto('%s/dark_%s.fits' % (temporary_path, aux),clobber=True)
 
     master_bias = generate_bias(detector, number, temporary_path)
     master_bias_data = master_bias.biasframe.frame[0].data