Index: trunk/ippToPsps/test/mkgpc1data.dr2.dvo
===================================================================
--- trunk/ippToPsps/test/mkgpc1data.dr2.dvo	(revision 40264)
+++ trunk/ippToPsps/test/mkgpc1data.dr2.dvo	(revision 40269)
@@ -26,5 +26,4 @@
 $CMFFORMAT = PS1_V5
 $DIFFORMAT = PS1_DV5
-
 
 # a note on double quotes and TESS_ID: 
@@ -92,11 +91,16 @@
   exec dvomerge -matched-tables testdata/catdir.wrp into testdata/catdir.mrg
 
+  # basic relphot calibration, imitating the original PV3.3 calibration
+  echo relphot -D CATDIR testdata/catdir.mrg -D CAMERA simtest -region 8 12 18 22 -update -vv -images g,r -reset -reset-zpts -D STAR_TOOFEW 0 -boundary-tree tess.3pi.fits -cloud-limit 0.1 -use-mcal-psf-for-stack-aper
+  exec relphot -D CATDIR testdata/catdir.mrg -D CAMERA simtest -region 8 12 18 22 -update -vv -images g,r -reset -reset-zpts -D STAR_TOOFEW 0 -boundary-tree tess.3pi.fits -cloud-limit 0.1 -use-mcal-psf-for-stack-aper
+
+  # test parallel-regions version, updating only stacks and warps, and applying the McalPSF vs McalAPER
   exec cp RegionHost.dat testdata/catdir.mrg
 
-# test parallel-regions version:
-# exec relphot -parallel-regions -region-hosts RegionHost.dat -D CATDIR testdata/catdir.mrg -D CAMERA simtest -region 8 12 18 22 -update -vv g,r -reset -reset-zpts -D STAR_TOOFEW 0 -boundary-tree tess.3pi.fits -cloud-limit 0.1 -imfreeze -mosfreeze -only-stacks-and-warps -update-catformat PS1_V6
-
-  echo relphot -D CATDIR testdata/catdir.mrg -D CAMERA simtest -region 8 12 18 22 -update -vv -images g,r -reset -reset-zpts -D STAR_TOOFEW 0 -boundary-tree tess.3pi.fits -cloud-limit 0.1
-  # exec relphot -D CATDIR testdata/catdir.mrg -D CAMERA simtest -region 8 12 18 22 -update -vv -images g,r -reset -reset-zpts -D STAR_TOOFEW 0 -boundary-tree tess.3pi.fits -cloud-limit 0.1
+  # XXX parallel version is not setting the format in my local build
+  # echo relphot -parallel-regions -region-hosts RegionHost.dat -D CATDIR testdata/catdir.mrg -D CAMERA simtest -region 8 12 18 22 -update -vv g,r -D STAR_TOOFEW 0 -boundary-tree tess.3pi.fits -cloud-limit 0.1 -imfreeze -mosfreeze -only-stacks-and-warps -update-catformat PS1_V6 -nloop 0
+
+  echo relphot -images -D CATDIR testdata/catdir.mrg -D CAMERA simtest -region 8 12 18 22 -update -vv g,r -D STAR_TOOFEW 0 -boundary-tree tess.3pi.fits -cloud-limit 0.1 -imfreeze -mosfreeze -only-stacks-and-warps -update-catformat PS1_V6 -nloop 0
+  exec relphot -images -D CATDIR testdata/catdir.mrg -D CAMERA simtest -region 8 12 18 22 -update -vv g,r -D STAR_TOOFEW 0 -boundary-tree tess.3pi.fits -cloud-limit 0.1 -imfreeze -mosfreeze -only-stacks-and-warps -update-catformat PS1_V6 -nloop 0
 end
 
@@ -352,5 +356,5 @@
     $stkID = $word:1
     sprintf rawfile "%s.%02d.txt" $word:2 $ID; # use the cam-stage rawfile
-    sprintf cmffile "%s.%02d.smf" $word:6 $ID
+    sprintf cmffile "%s.%02d.cmf" $word:6 $ID
     $offset = $word:3
     sprintf myDATE "%s" $word:4
@@ -508,5 +512,8 @@
     sprintf myTIME "%s" $tmp:5
 
-    $expfile = $tmp:2
+#   sprintf rawfile "%s.%02d.txt" $tmp:2 $ID
+    sprintf expfile "%s.%02d" $tmp:2 $expID
+    sprintf wrpfile "%s.%02d" $tmp:6 $expID
+
     $myFilter  = $tmp:7
     insert.exp $expID $expfile $myFilter
@@ -516,5 +523,4 @@
     end
 
-    $wrpfile = $tmp:6
     insert.wrp $expID $stkID $wrpfile
 
@@ -628,5 +634,5 @@
     $stkID = $word:0
     $skyID = $word:1
-    sprintf cmffile "%s.%02d.cmf" $word:2 $stkID
+    sprintf cmffile "%s.%02d" $word:2 $stkID
     $filter = $word:4