Index: /branches/eam_branches/ipp-20121219/ippToPsps/test/mkgpc1data.dvo
===================================================================
--- /branches/eam_branches/ipp-20121219/ippToPsps/test/mkgpc1data.dvo	(revision 34944)
+++ /branches/eam_branches/ipp-20121219/ippToPsps/test/mkgpc1data.dvo	(revision 34945)
@@ -31,4 +31,11 @@
 end
  
+macro mkfull
+  init.db
+  mkcatdir.cam PS1_V2 PS1_V2
+  mkcatdir.stk PS1_V2 PS1_V2
+  insert.stack.set
+end
+
 macro init.db
 
@@ -75,5 +82,5 @@
 
     mkinput $offset $rawfile
-    exec mkcmf $rawfile $cmffile -date 2008/1/1 -time $i\:00:00 -radec $RA $DEC -type $1
+    exec mkcmf $rawfile $cmffile -date 2008/1/1 -time $i\:00:00 -radec $RA $DEC -type $1 -imageID $ID -sourceID 0
     exec addstar -D CATDIR $catdir -D CAMERA simtest $cmffile -D CATFORMAT $2 -quick-airmass
   end
@@ -110,5 +117,5 @@
 
     mkinput $offset $rawfile
-    exec mkcmf $rawfile $cmffile -date 2008/1/1 -time $i\:00:00 -radec $RA $DEC -type $1
+    exec mkcmf $rawfile $cmffile -date 2008/1/1 -time $i\:00:00 -radec $RA $DEC -type $1 -imageID $ID -sourceID 1
     exec addstar -D CATDIR $catdir -D CAMERA simtest $cmffile -D CATFORMAT $2 -quick-airmass
   end
@@ -132,5 +139,5 @@
 
   # a single exposure
-  dbinsert rawExp (exp_id, exp_name, exp_time, bg, bg_stdev, ra, decl) values ($myID, "test.$myID", 10.0, 100.0, 2.0, $RA, $DEC)
+  dbinsert rawExp (exp_id, exp_name, exp_time, bg, bg_stdev, ra, decl) values ($myID, "test.$myID", 10.0, 100.0, 2.0, {$RA*3.1415/180.0}, {$DEC*3.1415/180.0})
   dbinsert chipRun (exp_id, chip_id) values ($myID, $myID)
   dbinsert camRun (chip_id, cam_id, dist_group, software_ver) values ($myID, $myID, "testgroup", "testsoft")
@@ -192,5 +199,5 @@
   dbinsert minidvodbProcessed (minidvodb_id, fault) values (1, 0)
   
-  dbinsert mergedvodbRun (minidvodb_id, merge_id, state, mergedvodb) values (1, 1, "merged", "catdir.cam")
+  dbinsert mergedvodbRun (minidvodb_id, merge_id, state, mergedvodb) values (1, 1, "full", "catdir.cam")
   dbinsert mergedvodbProcessed (merge_id, fault) values (1, 0)
 
@@ -212,5 +219,5 @@
 
   local output 
-  $output = $1
+  $output = $2
 
   exec rm -f $output