Index: trunk/ippToPsps/test/mkgpc1data.dvo
===================================================================
--- trunk/ippToPsps/test/mkgpc1data.dvo	(revision 38850)
+++ trunk/ippToPsps/test/mkgpc1data.dvo	(revision 38888)
@@ -12,34 +12,23 @@
 # I'm setting the base filename without the .smf and add it in mkcatdir.*
 
+# some global value for ease of access:
+$SKYCELL = "skycell.1133.081"
+$TESS_ID = "RINGS.V3"
+
 # imagedata describes the full fake exposure set.  the fields are
 list imagedata
-# exp_id stk_id filebase         M_off date       time
-   1 	 1      $OUTDIR/test.01  0.000 2010/01/01 01:00:00
-   2 	 1      $OUTDIR/test.02 -0.025 2010/01/01 02:00:00
-   3 	 1      $OUTDIR/test.03  0.025 2010/01/01 03:00:00
-   4 	 1      $OUTDIR/test.04  0.010 2010/01/01 04:00:00
-   5 	 2      $OUTDIR/test.05  0.000 2010/01/01 05:00:00
-   6 	 2      $OUTDIR/test.06 -0.025 2010/01/01 06:00:00
-   7 	 2      $OUTDIR/test.07  0.025 2010/01/01 07:00:00
-   8 	 2      $OUTDIR/test.08  0.010 2010/01/01 08:00:00
-   9 	 3      $OUTDIR/test.09  0.000 2010/01/01 09:00:00
-  10 	 3      $OUTDIR/test.10 -0.025 2010/01/01 10:00:00
-  11 	 3      $OUTDIR/test.11  0.025 2010/01/01 11:00:00
-  12 	 3      $OUTDIR/test.12  0.010 2010/01/01 12:00:00
-end
-
-list warpdata
- 1 1 $OUTDIR/test.01  0.000 2010/01/01 01:00:00
- 2 1 $OUTDIR/test.02 -0.025 2010/01/01 02:00:00
- 3 1 $OUTDIR/test.03  0.025 2010/01/01 03:00:00
- 4 1 $OUTDIR/test.04  0.010 2010/01/01 04:00:00
- 5 2 $OUTDIR/test.05  0.000 2010/01/01 05:00:00
- 6 2 $OUTDIR/test.06 -0.025 2010/01/01 06:00:00
- 7 2 $OUTDIR/test.07  0.025 2010/01/01 07:00:00
- 8 2 $OUTDIR/test.08  0.010 2010/01/01 08:00:00
- 9 3 $OUTDIR/test.09  0.000 2010/01/01 09:00:00
-10 3 $OUTDIR/test.10 -0.025 2010/01/01 10:00:00
-11 3 $OUTDIR/test.11  0.025 2010/01/01 11:00:00
-12 3 $OUTDIR/test.12  0.010 2010/01/01 12:00:00
+# exp_id stk_id filebase         M_off date       time      warpfile
+   1 	 1      $OUTDIR/test.01  0.000 2010/01/01 01:00:00  $OUTDIR/warp.01 
+   2 	 1      $OUTDIR/test.02 -0.025 2010/01/01 02:00:00  $OUTDIR/warp.02 
+   3 	 1      $OUTDIR/test.03  0.025 2010/01/01 03:00:00  $OUTDIR/warp.03 
+   4 	 1      $OUTDIR/test.04  0.010 2010/01/01 04:00:00  $OUTDIR/warp.04 
+   5 	 2      $OUTDIR/test.05  0.000 2010/01/01 05:00:00  $OUTDIR/warp.05 
+   6 	 2      $OUTDIR/test.06 -0.025 2010/01/01 06:00:00  $OUTDIR/warp.06 
+   7 	 2      $OUTDIR/test.07  0.025 2010/01/01 07:00:00  $OUTDIR/warp.07 
+   8 	 2      $OUTDIR/test.08  0.010 2010/01/01 08:00:00  $OUTDIR/warp.08 
+   9 	 3      $OUTDIR/test.09  0.000 2010/01/01 09:00:00  $OUTDIR/warp.09 
+  10 	 3      $OUTDIR/test.10 -0.025 2010/01/01 10:00:00  $OUTDIR/warp.10 
+  11 	 3      $OUTDIR/test.11  0.025 2010/01/01 11:00:00  $OUTDIR/warp.11 
+  12 	 3      $OUTDIR/test.12  0.010 2010/01/01 12:00:00  $OUTDIR/warp.12 
 end
 
@@ -55,4 +44,5 @@
   mkcatdir.cam PS1_V5 PS1_V5
   mkcatdir.stk PS1_V5 PS1_V5
+  mkcatdir.wrp PS1_V5_Lensing PS1_V5
   insert.stack.set
 end
@@ -68,7 +58,5 @@
   $DEC = 20.0
 
-  break -auto off
   exec mkgpc1.sh delete $dbhost $dbname $dbuser $dbpass
-  break -auto on
   exec mkgpc1.sh create $dbhost $dbname $dbuser $dbpass
 
@@ -77,5 +65,5 @@
   # system-wide info
   dbinsert ippToPspsFake (my_id) values (2)
-  dbinsert skycell (radeg, decdeg, skycell_id) values ($RA, $DEC, "skycell.0000.000")
+  dbinsert skycell (radeg, decdeg, skycell_id) values ($RA, $DEC, $SKYCELL)
 end
 
@@ -163,6 +151,6 @@
 
     mkinput $offset $rawfile
-    echo mkcmf -photcode SIMTEST.r.Chip -no-noise -append $rawfile $cmffile -date $myDATE -time $myTIME -radec $RA $DEC -type $1 -imageID $ID -sourceID 0
-    exec mkcmf -photcode SIMTEST.r.Chip -no-noise -append $rawfile $cmffile -date $myDATE -time $myTIME -radec $RA $DEC -type $1 -imageID $ID -sourceID 0
+    echo mkcmf -photcode SIMTEST.r.Chip -no-noise -append $rawfile $cmffile -date $myDATE -time $myTIME -mjd $mjd -radec $RA $DEC -type $1 -imageID $ID -sourceID 0
+    exec mkcmf -photcode SIMTEST.r.Chip -no-noise -append $rawfile $cmffile -date $myDATE -time $myTIME -mjd $mjd -radec $RA $DEC -type $1 -imageID $ID -sourceID 0
 
     if ($i == 3)
@@ -238,11 +226,9 @@
 
     mkinput $offset $rawfile
-    echo mkcmf -stack -photcode SIMTEST.r.SkyChip $rawfile $cmffile -extroot SkyChip -date 2008/1/1 -time $i\:00:00 -radec $RA $DEC -type $1 -imageID $ID -sourceID 1
-    exec mkcmf -stack -photcode SIMTEST.r.SkyChip $rawfile $cmffile -extroot SkyChip -date 2008/1/1 -time $i\:00:00 -radec $RA $DEC -type $1 -imageID $ID -sourceID 1
+    echo mkcmf -stack -photcode SIMTEST.r.SkyChip $rawfile $cmffile -extroot SkyChip -date 2008/1/1 -time $i\:00:00 -mjd 54466.0 -radec $RA $DEC -type $1 -imageID $ID -sourceID 1 -tess_id $TESS_ID -skycell $SKYCELL
+    exec mkcmf -stack -photcode SIMTEST.r.SkyChip $rawfile $cmffile -extroot SkyChip -date 2008/1/1 -time $i\:00:00 -mjd 54466.0 -radec $RA $DEC -type $1 -imageID $ID -sourceID 1 -tess_id $TESS_ID -skycell $SKYCELL
 
     # add some required header keywords:
     exec echo "HIERARCH FPA.ZP =          25. / Magnitude zero point" > tmp.hdr
-    exec echo "TESS_ID = 'RINGS.V3'" >> tmp.hdr
-    exec echo "SKYCELL = 'skycell.1133.081'" >> tmp.hdr
     exec fits_insert $cmffile tmp.hdr
 
@@ -273,4 +259,69 @@
 end
 
+# create a populated catdir with a set of cmf files, save the filenames in list for use by insert.exp
+macro mkcatdir.wrp
+  if ($0 != 3)
+    echo "mkcatdir.wrp (cmftype) (dvotype)"
+    break
+  end
+
+  # tapPLAN 4
+
+  mkdir $OUTDIR
+
+  local i catdir RA DEC ID rawfile cmffile offset
+  $catdir = $OUTDIR/catdir.wrp
+  exec rm -rf $catdir
+
+  $RA = 10.0
+  $DEC = 20.0
+
+  $TIMEFORMAT = mjd
+  $TIMEREF = 2001/01/01,00:00:00
+
+  for i 0 $imagedata:n
+    list word -split $imagedata:$i
+    $ID = $word:0
+    $rawfile = $word:2\.txt; # use the cam-stage rawfile
+    $cmffile = $word:6\.smf
+    $offset = $word:3
+
+    sprintf myDATE "%s" $word:4
+    sprintf myTIME "%s" $word:5
+    echo ctimes -abs $myDATE,$myTIME -var mjd
+    ctimes -abs $myDATE,$myTIME -var mjd
+
+    ## this is not generating photcodes recognized as stack by relphot
+
+    mkinput $offset $rawfile
+    echo mkcmf -forcedwarp -photcode SIMTEST.r.ForcedWarp $rawfile $cmffile -extroot SkyChip -date $myDATE -time $myTIME -mjd $mjd -radec $RA $DEC -type $1 -imageID $ID -sourceID 1 -tess_id $TESS_ID -skycell $SKYCELL
+    exec mkcmf -forcedwarp -photcode SIMTEST.r.ForcedWarp $rawfile $cmffile -extroot SkyChip -date $myDATE -time $myTIME -mjd $mjd -radec $RA $DEC -type $1 -imageID $ID -sourceID 1 -tess_id $TESS_ID -skycell $SKYCELL
+
+    echo addstar -D SKY_DEPTH 4 -D CATDIR $catdir -D CAMERA simtest $cmffile -D CATFORMAT $2 -quick-airmass
+    exec addstar -D SKY_DEPTH 4 -D CATDIR $catdir -D CAMERA simtest $cmffile -D CATFORMAT $2 -quick-airmass
+  end
+
+  echo relphot -D CATDIR $catdir -region 8 12 18 22 -images g,r,i,z,y -update
+  exec relphot -D CATDIR $catdir -region 8 12 18 22 -images g,r,i,z,y -update
+
+  if ($PARALLEL)
+    $hostname = `hostname`
+    exec rm -f $catdir/HostTable.dat
+    output $catdir/HostTable.dat
+    echo "# ID Hostname Catdir"
+    echo " 1 $hostname $catdir.p1"
+    echo " 2 $hostname $catdir.p2"
+    echo " 3 $hostname $catdir.p3"
+    output stdout
+    exec dvodist -out $catdir
+  end
+
+  # for i 0 $offset:n
+  #   tapOK {abs(Mcal[$i] - Mcal[0] - $offset:$i) < 0.001} "Mcal $i"
+  # end
+
+  # tapDONE
+end
+
 macro insert.exp
   if ($0 != 3)
@@ -296,9 +347,32 @@
   dbinsert camProcessedExp (cam_id, path_base, fault) values ($myID, "$filename", 0)
   dbinsert fakeRun (fake_id, cam_id) values ($myID, $myID)
-  dbinsert warpRun (warp_id, fake_id) values ($myID, $myID)
-  dbinsert warpSkyCellMap (warp_id, skycell_id, class_id) values ($myID, "skycell.0000.000", "XY00")
+  dbinsert warpRun (warp_id, fake_id, tess_id) values ($myID, $myID, $TESS_ID)
+  dbinsert warpSkyCellMap (warp_id, skycell_id, class_id) values ($myID, $SKYCELL, "XY00")
+  dbinsert warpImfile (warp_id, skycell_id, warp_skyfile_id) values ($myID, $SKYCELL, $myID)
 
   dbinsert addRun (add_id, stage, state, stage_id, minidvodb_name) values ($myID, "cam", "full", $myID, "catdir.cam")
   dbinsert addProcessedExp (add_id, fault) values ($myID, 0)
+end
+
+macro insert.wrp
+  if ($0 != 4)
+    echo "USAGE: insert.wrp (warpID) (stackID) (filename)"
+    break
+  end
+
+  local wrpID stkID filename
+  $wrpID = $1
+  $stkID = $2
+  $filename = $3
+
+  # a single exposure
+  echo $myDATE
+  echo $myTIME 
+
+  dbinsert addRun (add_id, stage, state, stage_id, stage_extra1, minidvodb_name) values ($wrpID, "fullforce", "full", $stkID, $wrpID, "catdir.wrp")
+
+  # we have a single fullForceRun for each stack, so we can match fullForceRun ids to stackRun ids
+  dbinsert fullForceInput (ff_id, warp_id) values ($stkID, $wrpID)
+  dbinsert fullForceResult (ff_id, warp_id, software_ver, path_base) values ($stkID, $wrpID, "38000M", "$filename")
 end
 
@@ -310,10 +384,13 @@
   end
 
-  local i stkID expID expfile stkfile
+  local i stkID expID expfile wrpfile stkfile
   
   $stkID = $1
   $stkfile = $2
 
-  dbinsert stackRun (stack_id, skycell_id, filter, software_ver) values ($stkID, "skycell.0000.000", "g.00000", "37500")
+  dbinsert stackRun (stack_id, skycell_id, filter, software_ver) values ($stkID, $SKYCELL, "g.00000", "37500")
+
+  # we have a single fullForceRun for each stack, so we can match fullForceRun ids to stackRun ids
+  dbinsert fullForceRun (ff_id, skycal_id) values ($stkID, $stkID)
 
   $TIMEFORMAT = mjd
@@ -329,8 +406,13 @@
 
     $expID = $tmp:0
-    $expfile = $tmp:2
     sprintf myDATE "%s" $tmp:4
     sprintf myTIME "%s" $tmp:5
+
+    $expfile = $tmp:2
     insert.exp $expID $expfile
+
+    $wrpfile = $tmp:6
+    insert.wrp $expID $stkID $wrpfile
+
     dbinsert stackInputSkyfile (stack_id, warp_id) values ($stkID, $expID)
 
@@ -376,4 +458,11 @@
   dbinsert mergedvodbRun (minidvodb_id, merge_id, state, mergedvodb) values (2, 2, "full", "catdir.stk")
   dbinsert mergedvodbProcessed (merge_id, fault) values (2, 0)
+
+  # catdirs for the forced warps
+  dbinsert minidvodbRun (minidvodb_name, minidvodb_id, state) values ("catdir.wrp", 3, "merged")
+  dbinsert minidvodbProcessed (minidvodb_id, fault) values (3, 0)
+  
+  dbinsert mergedvodbRun (minidvodb_id, merge_id, state, mergedvodb) values (3, 3, "full", "catdir.wrp")
+  dbinsert mergedvodbProcessed (merge_id, fault) values (3, 0)
 end