Index: /trunk/psdemo/simdata/sim.pro
===================================================================
--- /trunk/psdemo/simdata/sim.pro	(revision 11398)
+++ /trunk/psdemo/simdata/sim.pro	(revision 11399)
@@ -1,2 +1,4 @@
+
+list MODULES -add /home/kiawe/eugene/src/panstarrs/ipp/ippTasks
 
 input images.pro
@@ -5,23 +7,29 @@
 $biaslevel = 200
 
+macro cleanup
+  exec rm -f *.fit
+  exec rm -f *.jpg
+  exec rm -f *.fits
+  exec rm -rf logs
+end
+
 macro init
-  exec pxadmin -create
+  exec pxadmin -delete -dbname simtest
+  exec pxadmin -create -dbname simtest
+  exec mkdir -p raw
+  exec mkdir -p proc
   mkbiases
   mkflats
-  exec inject_test.pl .
+  exec inject.pl raw/*.fits --workdir path://SIMTEST/proc --dbname simtest
 end
 
-macro reinit
-  exec pxadmin -recreate
-  mkbiases
-  mkflats
-  exec inject_test.pl .
-end
+# create a bias detrun:
+# exec dettool -pretend -definebyquery -det_type bias -select_exp_type bias -workdir path://SIMTEST/mkbias.0 -dbname simtest
 
 # generate a set of fake biases
 macro mkbiases
   echo "generating 10 bias images"
-  mkimages.init 1024 1024 5 1000 0 2.0
   for i 0 10
+    mkimages.init 1024 1024 5 1000 0 2.0
     set bias = blank + $mkiRD*mki_noisei + $biaslevel
     keyword bias AIRMASS  -wf {1 + 0.1*$i}
@@ -40,5 +48,5 @@
     keyword bias OBSTYPE  -w BIAS
     keyword bias OBJECT   -w BIAS
-    sprintf name "bias.%02d.fits" $i
+    sprintf name "raw/bias.%02d.fits" $i
     wd bias $name
   end
@@ -47,6 +55,6 @@
 macro mkflats
   echo "generating 20 flat images in 2 filters"
-  mkimages.init 1024 1024 5 1000 0 2.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
     keyword flat AIRMASS  -wf {1 + 0.1*$i}
@@ -65,9 +73,10 @@
     keyword flat OBSTYPE  -w FLAT
     keyword flat OBJECT   -w FLAT
-    sprintf name "flat.%02d.fits" $i
+    sprintf name "raw/flat.%02d.fits" $i
     wd flat $name
   end  
 
   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
     keyword flat AIRMASS  -wf {1 + 0.1*$i}
@@ -86,5 +95,5 @@
     keyword flat OBSTYPE  -w FLAT
     keyword flat OBJECT   -w FLAT
-    sprintf name "flat.%02d.fits" $i
+    sprintf name "raw/flat.%02d.fits" $i
     wd flat $name
   end