Index: branches/eam_branches/ipp-20121219/ippToPsps/test/mkgpc1data.dvo
===================================================================
--- branches/eam_branches/ipp-20121219/ippToPsps/test/mkgpc1data.dvo	(revision 35000)
+++ branches/eam_branches/ipp-20121219/ippToPsps/test/mkgpc1data.dvo	(revision 35003)
@@ -4,8 +4,4 @@
 
 if (not($?VERBOSE)) set VERBOSE = 0
-
-macro test.all
-  test.relphot PS1_V2 PS1_V2
-end  
 
 ## this script must be run in this directory, output data goes to 'testdata'
@@ -40,6 +36,6 @@
 macro mkfull
   init.db
-  mkcatdir.cam PS1_V2 PS1_V2
-  mkcatdir.stk PS1_V2 PS1_V2
+  mkcatdir.cam PS1_V3 PS1_V2
+  mkcatdir.stk PS1_V3 PS1_V2
   insert.stack.set
 end
@@ -95,14 +91,113 @@
     $offset = $word:3
 
-    ctimes -ref 2008/01/01,$i\:00:00 -var mjd
+    ctimes -abs 2008/01/01,$i\:00:00 -var mjd
+
+    # XXX for a simple test of ippToPsps, i need to generate smf files with some correspondence to gpc1 exposure smfs
+    # this means: 
+    # 1) a PHU with some basic header data
+    # 2) add extensions with EXTNAME of XYnn
+
+    # create an empty header and populate with the desired keywords
+    mcreate dummy 0 0
+    keyword dummy MJD-OBS  -wf $mjd
+    keyword dummy FILTERID -w  r.00000
+    keyword dummy EXPTIME  -wf 1.0
+
+    keyword dummy ZPT_ERR  -wf 0.01
+    keyword dummy EXPREQ   -wf 1.0
+    keyword dummy AIRMASS  -wf 1.0
+    keyword dummy RA       -wf $RA 
+    keyword dummy DEC	   -wf $DEC
+    keyword dummy CTYPE1   -w "RA---DIS"
+    keyword dummy CTYPE2   -w "DEC--DIS"
+    keyword dummy CRVAL1   -wf $RA
+    keyword dummy CRVAL2   -wf $DEC
+    keyword dummy CRPIX1   -wf 0.0
+    keyword dummy CRPIX2   -wf 0.0
+    keyword dummy CDELT1   -wf {1.0/3600}
+    keyword dummy CDELT2   -wf {1.0/3600}
+    keyword dummy PC001001 -wf 1.0
+    keyword dummy PC001002 -wf 0.0
+    keyword dummy PC002001 -wf 0.0
+    keyword dummy PC002002 -wf 1.0
+    keyword dummy NPLYTERM -wd 0
+    keyword dummy PCA1X3Y0 -wf 0.0
+    keyword dummy PCA1X2Y1 -wf 0.0
+    keyword dummy PCA1X1Y2 -wf 0.0
+    keyword dummy PCA1X0Y3 -wf 0.0
+    keyword dummy PCA1X2Y0 -wf 0.0
+    keyword dummy PCA1X1Y1 -wf 0.0
+    keyword dummy PCA1X0Y2 -wf 0.0
+    keyword dummy PCA2X3Y0 -wf 0.0
+    keyword dummy PCA2X2Y1 -wf 0.0
+    keyword dummy PCA2X1Y2 -wf 0.0
+    keyword dummy PCA2X0Y3 -wf 0.0
+    keyword dummy PCA2X2Y0 -wf 0.0
+    keyword dummy PCA2X1Y1 -wf 0.0
+    keyword dummy PCA2X0Y2 -wf 0.0
+    wd dummy $cmffile
+
+    exec ftable -list $cmffile
 
     mkinput $offset $rawfile
     exec mkcmf $rawfile $cmffile -date 2008/1/1 -time $i\:00:00 -radec $RA $DEC -type $1 -imageID $ID -sourceID 0
-    exec rm -f header.dat
-    output header.dat
-    echo MJD-OBS = $mjd
-    echo FILTERID= 'r.00000' 
-    output stdout
-    exec fits_insert $cmffile header.dat
+
+    exec ftable -list $cmffile
+
+    # keywords which are read from image extension
+    # MSKY_MN
+    # MSKY_SIG
+    # FSATUR
+    # FLIMIT
+    # CERROR
+    # ZPT_OBS
+    # NASTRO
+    # NASTRO
+    # CNAXIS1
+    # CNAXIS2
+    # FWHM_MAJ
+    # FWHM_MIN
+    # ANGLE
+    # IQ_FW1
+    # IQ_FW2
+    # IQ_FW1
+    # IQ_FW2
+    # APMIFIT
+    # DAPMIFIT
+    # DETECTOR
+    # IMAGEID
+    # DETREND.MASK
+    # DETREND.DARK
+    # DETREND.FLAT
+    # ZPT_OBS
+    # CTYPE1
+    # CTYPE2
+    # CRVAL1
+    # CRVAL2
+    # CRPIX1
+    # CRPIX2
+    # CDELT1
+    # CDELT2
+    # PC001001
+    # PC001002
+    # PC002001
+    # PC002002
+    # NPLYTERM
+    # PCA1X3Y0
+    # PCA1X2Y1
+    # PCA1X1Y2
+    # PCA1X0Y3
+    # PCA1X2Y0
+    # PCA1X1Y1
+    # PCA1X0Y2
+    # PCA2X3Y0
+    # PCA2X2Y1
+    # PCA2X1Y2
+    # PCA2X0Y3
+    # PCA2X2Y0
+    # PCA2X1Y1
+    # PCA2X0Y2
+
+    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