Index: /trunk/psdemo/simdata/sim.pro
===================================================================
--- /trunk/psdemo/simdata/sim.pro	(revision 11495)
+++ /trunk/psdemo/simdata/sim.pro	(revision 11496)
@@ -5,6 +5,7 @@
 
 $flatlevel = 10000
-$biaslevel = 200
-$skylevel  = 20000
+$biaslevel = 500
+$skyrate  = 200
+$darkrate = 100
 
 macro cleanup
@@ -21,4 +22,5 @@
   exec mkdir -p proc
   mkbiases
+  mkdarks
   mkflats
   mkobjects
@@ -26,10 +28,14 @@
 end
 
-# create a bias detrun:
-# exec dettool -pretend -definebyquery -det_type bias -select_exp_type bias -workdir path://SIMTEST/mkbias.0 -dbname simtest
-# exec dettool -updatedetrun -det_id 2 -state stop -dbname isp
-
-# create a flat detrun:
-# exec dettool -pretend -definebyquery -inst ISP-Apogee -det_type dark -select_exp_type dark -workdir path://ISP/mkdark.1 -dbname isp -mode verify  -simple
+### create a bias detrun:
+# exec dettool -pretend -definebyquery -inst SIMPLE -filter NONE -det_type bias -select_exp_type bias -workdir path://SIMTEST/mkbias.0 -dbname simtest
+
+### If something goes wrong:
+# exec dettool -updatedetrun -det_id 1 -state stop -dbname simtest
+
+### create a dark detrun:
+# exec dettool -pretend -definebyquery -inst SIMPLE -filter NONE -det_type dark -select_exp_type dark -workdir path://SIMTEST/mkdark.0 -dbname simtest
+
+### create a flat detrun:
 # exec dettool -pretend -definebyquery -inst SIMPLE -filter B -det_type flat -select_exp_type flat -select_filter B -workdir path://SIMTEST/mkflat.0 -dbname simtest 
 # exec dettool -pretend -definebyquery -inst SIMPLE -filter V -det_type flat -select_exp_type flat -select_filter V -workdir path://SIMTEST/mkflat.1 -dbname simtest 
@@ -61,9 +67,36 @@
 end
 
+macro mkdarks
+  echo "generating 20 dark images"
+  for i 0 20
+    $exptime = 3 * ($i + 1)
+    mkimages.init 1024 1024 5 1000 0 2.0
+    set dark = blank + sqrt($mkiRD*$mkiRD + $darkrate*$exptime)*mki_noisei + $darkrate*$exptime + $biaslevel
+    keyword dark AIRMASS  -wf {1 + 0.1*$i}
+    keyword dark FILTER   -w  NONE
+    keyword dark POSANGLE -wf 0.0
+    keyword dark RA       -wf 0.0
+    keyword dark DEC      -wf 0.0
+    keyword dark EXPTIME  -wf $exptime
+    keyword dark DARKTIME -wf $exptime
+    keyword dark DATE-OBS -w "2006/10/01"
+    sprintf time "00:01:%02d" $i
+    keyword dark UTC-OBS  -w $time
+    keyword dark CCDSUM   -w "1 1"
+    keyword dark TELESCOP -w simscope
+    keyword dark INSTRUME -w SIMPLE
+    keyword dark OBSTYPE  -w DARK
+    keyword dark OBJECT   -w DARK
+    sprintf name "raw/dark.%02d.fits" $i
+    wd dark $name
+  end  
+end
+
 macro mkflats
   echo "generating 20 flat images in 2 filters"
+  $exptime = 10.0
   for i 0 10
     mkimages.init 1024 1024 5 1000 0 2.0
-    set flat = blank + $mkiRD*mki_noisei + sqrt($flatlevel)*mki_noisei + $flatlevel + $biaslevel
+    set flat = blank + sqrt($mkiRD*$mkiRD + $darkrate*$exptime + $flatlevel)*mki_noisei + $darkrate*$exptime + $flatlevel + $biaslevel
     keyword flat AIRMASS  -wf {1 + 0.1*$i}
     keyword flat FILTER   -w  V
@@ -71,6 +104,6 @@
     keyword flat RA       -wf 0.0
     keyword flat DEC      -wf 0.0
-    keyword flat EXPTIME  -wf 5.0
-    keyword flat DARKTIME -wf 0.0
+    keyword flat EXPTIME  -wf $exptime
+    keyword flat DARKTIME -wf $exptime
     keyword flat DATE-OBS -w "2006/10/01"
     sprintf time "00:01:%02d" $i
@@ -87,5 +120,5 @@
   for i 10 20
     mkimages.init 1024 1024 5 1000 0 2.0
-    set flat = blank + $mkiRD*mki_noisei + sqrt($flatlevel)*mki_noisei + $flatlevel + $biaslevel
+    set flat = blank + sqrt($mkiRD*$mkiRD + $darkrate*$exptime + $flatlevel)*mki_noisei + $darkrate*$exptime + $flatlevel + $biaslevel
     keyword flat AIRMASS  -wf {1 + 0.1*$i}
     keyword flat FILTER   -w  B
@@ -93,6 +126,6 @@
     keyword flat RA       -wf 0.0
     keyword flat DEC      -wf 0.0
-    keyword flat EXPTIME  -wf 5.0
-    keyword flat DARKTIME -wf 0.0
+    keyword flat EXPTIME  -wf $exptime
+    keyword flat DARKTIME -wf $exptime
     keyword flat DATE-OBS -w "2006/10/01"
     sprintf time "00:02:%02d" $i
@@ -111,28 +144,30 @@
   echo "generating 10 object images in 2 filters"
   for i 0 5
-    mkimages.init 1024 1024 5 1000 0 2.0
-    set flat = blank + $mkiRD*mki_noisei + sqrt($skylevel)*mki_noisei + $skylevel + $biaslevel
-    keyword flat AIRMASS  -wf {1 + 0.1*$i}
-    keyword flat FILTER   -w  V
-    keyword flat POSANGLE -wf 0.0
-    keyword flat RA       -wf 0.0
-    keyword flat DEC      -wf 0.0
-    keyword flat EXPTIME  -wf 5.0
-    keyword flat DARKTIME -wf 0.0
-    keyword flat DATE-OBS -w "2006/10/01"
+    $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
+    keyword obj AIRMASS  -wf {1 + 0.1*$i}
+    keyword obj FILTER   -w  V
+    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:01:%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 SIMPLE
+    keyword obj OBSTYPE  -w OBJECT
+    keyword obj OBJECT   -w OBJECT
     sprintf name "raw/obj.%02d.fits" $i
-    wd flat $name
+    wd obj $name
   end  
 
   for i 5 10
-    mkimages.init 1024 1024 5 1000 0 2.0
-    set flat = blank + $mkiRD*mki_noisei + sqrt($skylevel)*mki_noisei + $skylevel + $biaslevel
+    $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
@@ -140,6 +175,6 @@
     keyword flat RA       -wf 0.0
     keyword flat DEC      -wf 0.0
-    keyword flat EXPTIME  -wf 5.0
-    keyword flat DARKTIME -wf 0.0
+    keyword flat EXPTIME  -wf $exptime
+    keyword flat DARKTIME -wf $exptime
     keyword flat DATE-OBS -w "2006/10/01"
     sprintf time "00:02:%02d" $i