Index: trunk/simtest/sim.pro
===================================================================
--- trunk/simtest/sim.pro	(revision 12102)
+++ trunk/simtest/sim.pro	(revision 12138)
@@ -1,11 +1,11 @@
-
-#list MODULES -add /home/kiawe/eugene/src/panstarrs/ipp/ippTasks
+### Generate simulated test data for testing the Image Processing Pipeline
 
 module images.pro
 
-$flatlevel = 10000
+$flatlevel = 1000
 $biaslevel = 500
 $skyrate  = 200
 $darkrate = 100
+$shutter = 0.5
 
 macro cleanup
@@ -61,8 +61,10 @@
     keyword bias CCDSUM   -w "1 1"
     keyword bias TELESCOP -w simscope
-    keyword bias INSTRUME -w SIMPLE
+    keyword bias INSTRUME -w SIMTEST
     keyword bias OBSTYPE  -w BIAS
     keyword bias OBJECT   -w BIAS
     sprintf name "$simdir/raw/bias.%02d.fits" $i
+    keyword bias GAIN     -wf 1.0
+    keyword bias RDNOISE  -wf $mkiRD
     wd bias $name
   end
@@ -87,10 +89,41 @@
     keyword dark CCDSUM   -w "1 1"
     keyword dark TELESCOP -w simscope
-    keyword dark INSTRUME -w SIMPLE
+    keyword dark INSTRUME -w SIMTEST
     keyword dark OBSTYPE  -w DARK
     keyword dark OBJECT   -w DARK
+    keyword dark GAIN     -wf 1.0
+    keyword dark RDNOISE  -wf $mkiRD
     sprintf name "$simdir/raw/dark.%02d.fits" $i
     wd dark $name
   end  
+end
+
+macro mkshutter
+  echo "generating 10 shutter images"
+  for i 0 20
+    $exptime = 3 * ($i + 1)
+    $opentime = $exptime - $shutter
+    mkimages.init 1024 1024 5 1000 0 2.0
+    set shutter = blank + sqrt($mkiRD*$mkiRD + $darkrate*$exptime + $flatlevel*$opentime)*mki_noisei + $flatlevel*$opentime + $darkrate*$exptime + $biaslevel
+    keyword shutter AIRMASS  -wf 1.0
+    keyword shutter FILTER   -w  NONE
+    keyword shutter POSANGLE -wf 0.0
+    keyword shutter RA       -wf 0.0
+    keyword shutter DEC      -wf 0.0
+    keyword shutter EXPTIME  -wf $exptime
+    keyword shutter DARKTIME -wf $exptime
+    keyword shutter DATE-OBS -w "2006/10/01"
+    sprintf time "00:01:%02d" $i
+    keyword shutter UTC-OBS  -w $time
+    keyword shutter CCDSUM   -w "1 1"
+    keyword shutter TELESCOP -w simscope
+    keyword shutter INSTRUME -w SIMTEST
+    keyword shutter OBSTYPE  -w SHUTTER
+    keyword shutter OBJECT   -w SHUTTER
+    keyword shutter GAIN     -wf 1.0
+    keyword shutter RDNOISE  -wf $mkiRD
+    sprintf name "$simdir/raw/shutter.%02d.fits" $i
+    wd dark $name
+  end
 end
 
@@ -98,7 +131,8 @@
   echo "generating 20 flat images in 2 filters"
   $exptime = 10.0
+  $opentime = $exptime - $shutter
   for i 0 10
     mkimages.init 1024 1024 5 1000 0 2.0
-    set flat = blank + sqrt($mkiRD*$mkiRD + $darkrate*$exptime + $flatlevel)*mki_noisei + $darkrate*$exptime + $flatlevel + $biaslevel
+    set flat = blank + sqrt($mkiRD*$mkiRD + $darkrate*$exptime + $flatlevel*$opentime)*mki_noisei + $darkrate*$exptime + $flatlevel*$opentime + $biaslevel
     keyword flat AIRMASS  -wf {1 + 0.1*$i}
     keyword flat FILTER   -w  V
@@ -113,7 +147,9 @@
     keyword flat CCDSUM   -w "1 1"
     keyword flat TELESCOP -w simscope
-    keyword flat INSTRUME -w SIMPLE
+    keyword flat INSTRUME -w SIMTEST
     keyword flat OBSTYPE  -w FLAT
     keyword flat OBJECT   -w FLAT
+    keyword flat GAIN     -wf 1.0
+    keyword flat RDNOISE  -wf $mkiRD
     sprintf name "$simdir/raw/flat.%02d.fits" $i
     wd flat $name
@@ -122,5 +158,5 @@
   for i 10 20
     mkimages.init 1024 1024 5 1000 0 2.0
-    set flat = blank + sqrt($mkiRD*$mkiRD + $darkrate*$exptime + $flatlevel)*mki_noisei + $darkrate*$exptime + $flatlevel + $biaslevel
+    set flat = blank + sqrt($mkiRD*$mkiRD + $darkrate*$exptime + $flatlevel*$opentime)*mki_noisei + $darkrate*$exptime + $flatlevel*$opentime + $biaslevel
     keyword flat AIRMASS  -wf {1 + 0.1*$i}
     keyword flat FILTER   -w  B
@@ -135,7 +171,9 @@
     keyword flat CCDSUM   -w "1 1"
     keyword flat TELESCOP -w simscope
-    keyword flat INSTRUME -w SIMPLE
+    keyword flat INSTRUME -w SIMTEST
     keyword flat OBSTYPE  -w FLAT
     keyword flat OBJECT   -w FLAT
+    keyword flat GAIN     -wf 1.0
+    keyword flat RDNOISE  -wf $mkiRD
     sprintf name "$simdir/raw/flat.%02d.fits" $i
     wd flat $name
@@ -147,6 +185,7 @@
   for i 0 5
     $exptime = 3 * ($i + 1)
-    mkimages.init 1024 1024 5 1000 0 2.0
-    set obj = blank + sqrt($mkiRD*$mkiRD + $darkrate*$exptime + $skyrate*$exptime)*mki_noisei + $darkrate*$exptime + $skyrate*$exptime + $biaslevel
+    $opentime = $exptime - $shutter
+    mkimages.init 1024 1024 5 1000 0 2.0
+    set obj = blank + sqrt($mkiRD*$mkiRD + $darkrate*$exptime + $skyrate*$opentime)*mki_noisei + $darkrate*$exptime + $skyrate*$opentime + $biaslevel
     keyword obj AIRMASS  -wf {1 + 0.1*$i}
     keyword obj FILTER   -w  V
@@ -161,7 +200,9 @@
     keyword obj CCDSUM   -w "1 1"
     keyword obj TELESCOP -w simscope
-    keyword obj INSTRUME -w SIMPLE
+    keyword obj INSTRUME -w SIMTEST
     keyword obj OBSTYPE  -w OBJECT
     keyword obj OBJECT   -w OBJECT
+    keyword obj GAIN     -wf 1.0
+    keyword obj RDNOISE  -wf $mkiRD
     sprintf name "$simdir/raw/obj.%02d.fits" $i
     wd obj $name
@@ -170,21 +211,24 @@
   for i 5 10
     $exptime = 3 * ($i - 4)
-    mkimages.init 1024 1024 5 1000 0 2.0
-    set flat = blank + sqrt($mkiRD*$mkiRD + $darkrate*$exptime + $skyrate*$exptime)*mki_noisei + $darkrate*$exptime + $skyrate*$exptime + $biaslevel
-    keyword flat AIRMASS  -wf {1 + 0.1*$i}
-    keyword flat FILTER   -w  B
-    keyword flat POSANGLE -wf 0.0
-    keyword flat RA       -wf 0.0
-    keyword flat DEC      -wf 0.0
-    keyword flat EXPTIME  -wf $exptime
-    keyword flat DARKTIME -wf $exptime
-    keyword flat DATE-OBS -w "2006/10/01"
+    $opentime = $exptime - $shutter
+    mkimages.init 1024 1024 5 1000 0 2.0
+    set obj = blank + sqrt($mkiRD*$mkiRD + $darkrate*$exptime + $skyrate*$opentime)*mki_noisei + $darkrate*$exptime + $skyrate*$opentime + $biaslevel
+    keyword obj AIRMASS  -wf {1 + 0.1*$i}
+    keyword obj FILTER   -w  B
+    keyword obj POSANGLE -wf 0.0
+    keyword obj RA       -wf 0.0
+    keyword obj DEC      -wf 0.0
+    keyword obj EXPTIME  -wf $exptime
+    keyword obj DARKTIME -wf $exptime
+    keyword obj DATE-OBS -w "2006/10/01"
     sprintf time "00:02:%02d" $i
-    keyword flat UTC-OBS  -w $time
-    keyword flat CCDSUM   -w "1 1"
-    keyword flat TELESCOP -w simscope
-    keyword flat INSTRUME -w SIMPLE
-    keyword flat OBSTYPE  -w OBJECT
-    keyword flat OBJECT   -w OBJECT
+    keyword obj UTC-OBS  -w $time
+    keyword obj CCDSUM   -w "1 1"
+    keyword obj TELESCOP -w simscope
+    keyword obj INSTRUME -w SIMTEST
+    keyword obj OBSTYPE  -w OBJECT
+    keyword obj OBJECT   -w OBJECT
+    keyword obj GAIN     -wf 1.0
+    keyword obj RDNOISE  -wf $mkiRD
     sprintf name "$simdir/raw/obj.%02d.fits" $i
     wd flat $name
