Index: /branches/eam_branches/ipp-20111122/Ohana/src/addstar/test/relphot.flatcorr.dvo
===================================================================
--- /branches/eam_branches/ipp-20111122/Ohana/src/addstar/test/relphot.flatcorr.dvo	(revision 33157)
+++ /branches/eam_branches/ipp-20111122/Ohana/src/addstar/test/relphot.flatcorr.dvo	(revision 33158)
@@ -50,17 +50,16 @@
 
   # mjd and zpt values for not-ubercal'ed images
+  # place this within a valid season (55000.0 - 55010.0 - 55020.0 - 55030.0)
   set zpt_nc = 25.0 - tmpseq*0.0050 + 0.0025
   set mjd_nc = zero(zpt_nc)
-  mjd_nc[0] = 55100.01
-  mjd_nc[1] = 55100.02
-  mjd_nc[2] = 55100.03
-
-  mjd_nc[3] = 55115.01
-  mjd_nc[4] = 55115.02
-  mjd_nc[5] = 55115.03
-
-  mjd_nc[6] = 55125.01
-  mjd_nc[7] = 55125.02
-  mjd_nc[8] = 55125.03
+  mjd_nc[0] = 55000.11
+  mjd_nc[1] = 55000.12
+  mjd_nc[2] = 55000.13
+  mjd_nc[3] = 55015.11
+  mjd_nc[4] = 55015.12
+  mjd_nc[5] = 55015.13
+  mjd_nc[6] = 55025.11
+  mjd_nc[7] = 55025.12
+  mjd_nc[8] = 55025.13
 end
 
@@ -89,22 +88,29 @@
 
 macro ckexposure
-  if ($0 != 4)
-    echo "ckexposure (catdir) (zpt) (mode)"
+  if ($0 != 5)
+    echo "ckexposure (catdir) (mjd) (zpt) (mode)"
     echo "  mode == raw or corr"
     break
   end
 
-  local ZPT_REAL ZPT_NOMINAL
+  local CATDIR MJD_IMAGE ZPT_REAL ZPT_NOMINAL
   
-  $ZPT_REAL = $2
+  $CATDIR      = $1
+  $MJD_IMAGE   = $2
+  $ZPT_REAL    = $3
   $ZPT_NOMINAL = 24.58
+  $MODE        = $4
   # XXX need a function to extract the nominal zpt for a given filter / photcode
 
+  $TIMEFORMAT = mjd
+  $TIMEREF = 0.0
+
   # assume we still have stars_ra, stars_dec, stars_mag in hand
-  catdir $1
+  dev -n 0
+  catdir $CATDIR
   region $RA_CENTER $DEC_CENTER 0.2
   images
   pmeasure -all -m 15 20
-  mextract -region ra dec mag xccd yccd
+  mextract -region ra dec mag xccd yccd where (abs(time - $MJD_IMAGE) < 0.0001)
  
   match2d -closest ra dec stars_ra stars_dec 0.001 -index1 index1 -index2 index2
@@ -116,4 +122,6 @@
   set dd = 3600*(dec - stars_dec_m)
   set dm = mag - stars_mag_m
+
+  dev -n 1
   lim mag dm; clear; box; plot mag dm
 
@@ -137,5 +145,5 @@
   #   dm = mag_DVO - mag_real ~ 0.0
 
-  if ("$3" == "raw") 
+  if ("$MODE" == "raw") 
     for ix 0 $NCELL_X
       for iy 0 $NCELL_Y
@@ -163,5 +171,5 @@
   # for i 0 mjd_uc[]
   for i 0 1
-    mkexposure $1.$i $RA_CENTER $DEC_CENTER zpt_uc[$i] mjd_uc[$i] g $2
+    mkexposure $1.uc.$i $RA_CENTER $DEC_CENTER zpt_uc[$i] mjd_uc[$i] g $2
   end
 
@@ -169,5 +177,5 @@
   # for i 0 mjd_nc[]
   for i 0 1
-    mkexposure $1.$i $RA_CENTER $DEC_CENTER zpt_nc[$i] mjd_nc[$i] g $2
+    mkexposure $1.nc.$i $RA_CENTER $DEC_CENTER zpt_nc[$i] mjd_nc[$i] g $2
   end
 end
@@ -391,2 +399,3 @@
 end
 
+# running setphot: setphot testzpt.fits -update -ubercal -D CATDIR catdir.test