Index: trunk/ippTasks/simtest.pro
===================================================================
--- trunk/ippTasks/simtest.pro	(revision 17575)
+++ trunk/ippTasks/simtest.pro	(revision 17592)
@@ -4,5 +4,7 @@
   if ($0 != 4)
     echo "USAGE: simtest (dbname) (hostname) (init)"
-    echo " if (init) == 1, recreate and inject the images"
+    echo " if (init) == 0, just run the analysis tasks"
+    echo " if (init) == 1, (re)create the database and (re)inject the images"
+    echo " if (init) == 2, restart completely from scratch"
     break
   end
@@ -11,5 +13,5 @@
   $hostname = $2
  
-  if ($3 == 1)
+  if ($3 > 0)
     # XXX this will fail and exit the script if the db does not exist or is old...
     exec pxadmin -delete -dbname $dbname
@@ -18,7 +20,11 @@
     exec pxadmin -create -dbname $dbname
 
-    # the labels "wait" and "proc" are special names used in automate.pro
-    exec ppSimSequence basic.simtest.config basic.simtest.mkimages basic.simtest.inject -path raw -workdir work -dbname $dbname -label wait
-    exec source basic.simtest.mkimages
+    if ($3 == 2)
+      # the labels "wait" and "proc" are special names used in automate.pro
+      exec ppSimSequence basic.simtest.config basic.simtest.mkimages basic.simtest.inject -path raw -workdir work -dbname $dbname -label wait
+      exec source basic.simtest.mkimages
+    end
+
+    exec chiptool -dbname $dbname -block -label wait
     exec source basic.simtest.inject
   end