Index: trunk/ippToPsps/test/mkgpc1data.dvo
===================================================================
--- trunk/ippToPsps/test/mkgpc1data.dvo	(revision 35753)
+++ trunk/ippToPsps/test/mkgpc1data.dvo	(revision 37246)
@@ -15,16 +15,16 @@
 # exp_id stack_id raw_file exp_file offset
 list imagedata
- 1 1 $OUTDIR/test.01  0.000 
- 2 1 $OUTDIR/test.02 -0.025
- 3 1 $OUTDIR/test.03  0.025
- 4 1 $OUTDIR/test.04  0.010
- 5 2 $OUTDIR/test.05  0.000 
- 6 2 $OUTDIR/test.06 -0.025
- 7 2 $OUTDIR/test.07  0.025
- 8 2 $OUTDIR/test.08  0.010
- 9 3 $OUTDIR/test.09  0.000 
-10 3 $OUTDIR/test.10 -0.025
-11 3 $OUTDIR/test.11  0.025
-12 3 $OUTDIR/test.12  0.010
+ 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
 
@@ -39,6 +39,8 @@
   # mkcatdir.cam PS1_V3 PS1_V4
   # mkcatdir.stk PS1_V3 PS1_V4
-  mkcatdir.cam PS1_V4 PS1_V4
-  mkcatdir.stk PS1_V4 PS1_V4
+  # mkcatdir.cam PS1_V4 PS1_V4
+  # mkcatdir.stk PS1_V4 PS1_V4
+  mkcatdir.cam PS1_V5 PS1_V5
+  mkcatdir.stk PS1_V5 PS1_V5
   insert.stack.set
 end
@@ -94,5 +96,8 @@
     $offset = $word:3
 
-    ctimes -abs 2008/01/01,$i\:00:00 -var mjd
+    sprintf myDATE "%s" $word:4
+    sprintf myTIME "%s" $word:5
+    echo ctimes -abs $myDATE,$myTIME -var mjd
+    ctimes -abs $myDATE,$myTIME -var mjd
 
     # XXX for a simple test of ippToPsps, i need to generate smf files with some correspondence to gpc1 exposure smfs
@@ -142,5 +147,5 @@
 
     mkinput $offset $rawfile
-    exec mkcmf -no-noise -append $rawfile $cmffile -date 2008/1/1 -time $i\:00:00 -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
 
     # keywords which are read from image extension
@@ -203,20 +208,23 @@
     end
 
-    if ($i == 5)
+    if (0 && ($i == 5))
       echo "NOTE: adding image $i 2x to DVO, but without detections : this simulates a failure in LAP dvo"
 
-      echo addstar -D CATDIR $catdir -D CAMERA simtest $cmffile -D CATFORMAT $2 -quick-airmass -image -dup-images
-      exec addstar -D CATDIR $catdir -D CAMERA simtest $cmffile -D CATFORMAT $2 -quick-airmass -image -dup-images
+      echo addstar -D SKY_DEPTH 4 -D CATDIR $catdir -D CAMERA simtest $cmffile -D CATFORMAT $2 -quick-airmass -image -dup-images
+      exec addstar -D SKY_DEPTH 4 -D CATDIR $catdir -D CAMERA simtest $cmffile -D CATFORMAT $2 -quick-airmass -image -dup-images
     end
 
-    if ($i == 7)
+    if (0 && ($i == 7))
       echo "NOTE: adding detections from image $i 2x to DVO, but with wrong photcode and duplicate image ID : this simulates a failure in LAP dvo"
-      echo addstar -D CATDIR $catdir -D CAMERA simtest $cmffile -D CATFORMAT $2 -quick-airmass -dup-images -image-id-override 7 -photcode 2MASS_J
-      exec addstar -D CATDIR $catdir -D CAMERA simtest $cmffile -D CATFORMAT $2 -quick-airmass -dup-images -image-id-override 7 -photcode 2MASS_J
+      echo addstar -D SKY_DEPTH 4 -D CATDIR $catdir -D CAMERA simtest $cmffile -D CATFORMAT $2 -quick-airmass -dup-images -image-id-override 7 -photcode 2MASS_J
+      exec addstar -D SKY_DEPTH 4 -D CATDIR $catdir -D CAMERA simtest $cmffile -D CATFORMAT $2 -quick-airmass -dup-images -image-id-override 7 -photcode 2MASS_J
     end
 
-    echo addstar -D CATDIR $catdir -D CAMERA simtest $cmffile -D CATFORMAT $2 -quick-airmass
-    exec addstar -D CATDIR $catdir -D CAMERA simtest $cmffile -D CATFORMAT $2 -quick-airmass
-  end
+    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)
@@ -264,13 +272,21 @@
     $offset = $word:2
 
+    ## this is not generating photcodes recognized as stack by relphot
+
     mkinput $offset $rawfile
-    exec mkcmf $rawfile $cmffile -extname SkyChip -date 2008/1/1 -time $i\:00:00 -radec $RA $DEC -type $1 -imageID $ID -sourceID 1
+    exec mkcmf -photcode SIMTEST.r.SkyChip $rawfile $cmffile -extname SkyChip -date 2008/1/1 -time $i\:00:00 -radec $RA $DEC -type $1 -imageID $ID -sourceID 1
 
     # 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
 
-    exec addstar -D CATDIR $catdir -D CAMERA simtest $cmffile -D CATFORMAT $2 -quick-airmass
-  end
+    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)
@@ -308,7 +324,10 @@
 
   # 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*3.1415/180.0}, {$DEC*3.1415/180.0})
+  echo $myDATE
+  echo $myTIME 
+
+  dbinsert rawExp (exp_id, exp_name, exp_time, bg, bg_stdev, ra, decl, dateobs) values ($myID, "test.$myID", 10.0, 100.0, 2.0, {$RA*3.1415/180.0}, {$DEC*3.1415/180.0}, '$myDATE $myTIME')
   dbinsert chipRun (exp_id, chip_id) values ($myID, $myID)
-  dbinsert camRun (chip_id, cam_id, dist_group, software_ver) values ($myID, $myID, "testgroup", "testsoft")
+  dbinsert camRun (chip_id, cam_id, dist_group, software_ver) values ($myID, $myID, "testgroup", "38000M")
   dbinsert camProcessedExp (cam_id, path_base, fault) values ($myID, "$filename", 0)
   dbinsert fakeRun (fake_id, cam_id) values ($myID, $myID)
@@ -332,5 +351,11 @@
   $stkfile = $2
 
-  dbinsert stackRun (stack_id, skycell_id, filter, software_ver) values ($stkID, "skycell.0000.000", "g.00000", "testsoft")
+  dbinsert stackRun (stack_id, skycell_id, filter, software_ver) values ($stkID, "skycell.0000.000", "g.00000", "37500")
+
+  $TIMEFORMAT = mjd
+  $TIMEREF = 2001/01/01,00:00:00
+
+  $mjdsum = 0.0
+  $Nstk = 0
 
   for i 0 $imagedata:n
@@ -341,9 +366,18 @@
     $expID = $tmp:0
     $expfile = $tmp:2
+    sprintf myDATE "%s" $tmp:4
+    sprintf myTIME "%s" $tmp:5
     insert.exp $expID $expfile
     dbinsert stackInputSkyfile (stack_id, warp_id) values ($stkID, $expID)
-  end
-  dbinsert stackSumSkyfile (stack_id) values ($stkID)
-  dbinsert skycalRun (skycal_id, stack_id) values ($stkID, $stkID)
+
+    echo ctimes -abs $myDATE,$myTIME -var mjd
+         ctimes -abs $myDATE,$myTIME -var mjd
+    $mjdsum += $mjd
+    $Nstk ++
+  end
+  $mjd = $mjdsum / $Nstk
+
+  dbinsert stackSumSkyfile (stack_id, mjd_obs) values ($stkID, $mjd)
+  dbinsert skycalRun (sky_id, skycal_id, stack_id) values ($stkID, $stkID, $stkID)
   dbinsert skycalResult (skycal_id, path_base) values ($stkID, "$stkfile")