Index: trunk/ippToPsps/test/mkgpc1data.dr2.dvo
===================================================================
--- trunk/ippToPsps/test/mkgpc1data.dr2.dvo	(revision 40269)
+++ trunk/ippToPsps/test/mkgpc1data.dr2.dvo	(revision 40288)
@@ -15,6 +15,9 @@
 
 # some global value for ease of access:
-$RA = 10.0
-$DEC = 20.0
+$RA   =  9.93
+$DEC  = -0.03
+$dRA  =  1.0
+$dDEC =  1.0
+
 $SKYCELL = skycell.1133.081
 $TESS_ID = RINGS.V3
@@ -78,5 +81,5 @@
   mkcatdir.stk $CMFFORMAT          $CATFORMAT
   mkcatdir.wrp $CMFFORMAT\_Lensing $CATFORMAT
-  mkcatdir.dif $DIFFORMAT          $CATFORMAT
+  mkcatdir.dif $DIFFORMAT          PS1_V6
   insert.stack.set
 
@@ -92,15 +95,16 @@
 
   # 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
+  echo relphot -D CATDIR testdata/catdir.mrg -D CAMERA simtest -region {$RA - $dRA} {$RA + $dRA} {$DEC - $dDEC} {$DEC + $dDEC} -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 {$RA - $dRA} {$RA + $dRA} {$DEC - $dDEC} {$DEC + $dDEC} -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
 
-  # 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
+  # parallel version is now setting the format in my local build
+  echo relphot -parallel-regions -region-hosts RegionHost.dat -D CATDIR testdata/catdir.mrg -D CAMERA simtest -region {$RA - $dRA} {$RA + $dRA} {$DEC - $dDEC} {$DEC + $dDEC} -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 -parallel-regions -region-hosts RegionHost.dat -D CATDIR testdata/catdir.mrg -D CAMERA simtest -region {$RA - $dRA} {$RA + $dRA} {$DEC - $dDEC} {$DEC + $dDEC} -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 {$RA - $dRA} {$RA + $dRA} {$DEC - $dDEC} {$DEC + $dDEC} -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 {$RA - $dRA} {$RA + $dRA} {$DEC - $dDEC} {$DEC + $dDEC} -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
 
@@ -238,12 +242,12 @@
 
   if ($SMALLTEST)
-    echo relphot -D CATDIR $catdir -D CAMERA simtest -region 8 12 18 22 -images g,r,i,z,y -nloop 0 -D STAR_TOOFEW 0 -update
-    exec relphot -D CATDIR $catdir -D CAMERA simtest -region 8 12 18 22 -images g,r,i,z,y -nloop 0 -D STAR_TOOFEW 0 -update
-
-    echo relastro -v -D CATDIR $catdir -D CAMERA simtest -images -update-chips -update-all-cameras -region 8 12 18 22 -update -apply-offsets
-    exec relastro -v -D CATDIR $catdir -D CAMERA simtest -images -update-chips -update-all-cameras -region 8 12 18 22 -update -apply-offsets
+    echo relphot -D CATDIR $catdir -D CAMERA simtest -region {$RA - $dRA} {$RA + $dRA} {$DEC - $dDEC} {$DEC + $dDEC} -images g,r,i,z,y -nloop 0 -D STAR_TOOFEW 0 -update
+    exec relphot -D CATDIR $catdir -D CAMERA simtest -region {$RA - $dRA} {$RA + $dRA} {$DEC - $dDEC} {$DEC + $dDEC} -images g,r,i,z,y -nloop 0 -D STAR_TOOFEW 0 -update
+
+    echo relastro -v -D CATDIR $catdir -D CAMERA simtest -images -update-chips -update-all-cameras -region {$RA - $dRA} {$RA + $dRA} {$DEC - $dDEC} {$DEC + $dDEC} -update -apply-offsets
+    exec relastro -v -D CATDIR $catdir -D CAMERA simtest -images -update-chips -update-all-cameras -region {$RA - $dRA} {$RA + $dRA} {$DEC - $dDEC} {$DEC + $dDEC} -update -apply-offsets
   else
-    echo relphot -D CATDIR $catdir -D CAMERA simtest -region 8 12 18 22 -images g,r,i,z,y -update
-    exec relphot -D CATDIR $catdir -D CAMERA simtest -region 8 12 18 22 -images g,r,i,z,y -update
+    echo relphot -D CATDIR $catdir -D CAMERA simtest -region {$RA - $dRA} {$RA + $dRA} {$DEC - $dDEC} {$DEC + $dDEC} -images g,r,i,z,y -update
+    exec relphot -D CATDIR $catdir -D CAMERA simtest -region {$RA - $dRA} {$RA + $dRA} {$DEC - $dDEC} {$DEC + $dDEC} -images g,r,i,z,y -update
   end
 
@@ -307,9 +311,9 @@
 
   if ($SMALLTEST)
-    echo relphot -D CATDIR $catdir -D CAMERA simtest -region 8 12 18 22 -averages -update
-    exec relphot -D CATDIR $catdir -D CAMERA simtest -region 8 12 18 22 -averages -update
+    echo relphot -D CATDIR $catdir -D CAMERA simtest -region {$RA - $dRA} {$RA + $dRA} {$DEC - $dDEC} {$DEC + $dDEC} -averages -update
+    exec relphot -D CATDIR $catdir -D CAMERA simtest -region {$RA - $dRA} {$RA + $dRA} {$DEC - $dDEC} {$DEC + $dDEC} -averages -update
   else
-    echo relphot -D CATDIR $catdir -D CAMERA simtest -region 8 12 18 22 -images g,r,i,z,y -update
-    exec relphot -D CATDIR $catdir -D CAMERA simtest -region 8 12 18 22 -images g,r,i,z,y -update
+    echo relphot -D CATDIR $catdir -D CAMERA simtest -region {$RA - $dRA} {$RA + $dRA} {$DEC - $dDEC} {$DEC + $dDEC} -images g,r,i,z,y -update
+    exec relphot -D CATDIR $catdir -D CAMERA simtest -region {$RA - $dRA} {$RA + $dRA} {$DEC - $dDEC} {$DEC + $dDEC} -images g,r,i,z,y -update
   end
 
@@ -397,13 +401,13 @@
 
   if ($SMALLTEST)
-    echo relphot -D CATDIR $catdir -D CAMERA simtest -region 8 12 18 22 -averages -update
-    exec relphot -D CATDIR $catdir -D CAMERA simtest -region 8 12 18 22 -averages -update
+    echo relphot -D CATDIR $catdir -D CAMERA simtest -region {$RA - $dRA} {$RA + $dRA} {$DEC - $dDEC} {$DEC + $dDEC} -averages -update
+    exec relphot -D CATDIR $catdir -D CAMERA simtest -region {$RA - $dRA} {$RA + $dRA} {$DEC - $dDEC} {$DEC + $dDEC} -averages -update
   else
-    echo relphot -D CATDIR $catdir -D CAMERA simtest -region 8 12 18 22 -images g,r,i,z,y -update
-    exec relphot -D CATDIR $catdir -D CAMERA simtest -region 8 12 18 22 -images g,r,i,z,y -update
-  end
-
-  echo dvolens -D CATDIR $catdir -D CAMERA simtest -region 8 12 18 22 -update-objects -update
-  exec dvolens -D CATDIR $catdir -D CAMERA simtest -region 8 12 18 22 -update-objects -update
+    echo relphot -D CATDIR $catdir -D CAMERA simtest -region {$RA - $dRA} {$RA + $dRA} {$DEC - $dDEC} {$DEC + $dDEC} -images g,r,i,z,y -update
+    exec relphot -D CATDIR $catdir -D CAMERA simtest -region {$RA - $dRA} {$RA + $dRA} {$DEC - $dDEC} {$DEC + $dDEC} -images g,r,i,z,y -update
+  end
+
+  echo dvolens -D CATDIR $catdir -D CAMERA simtest -region {$RA - $dRA} {$RA + $dRA} {$DEC - $dDEC} {$DEC + $dDEC} -update-objects -update
+  exec dvolens -D CATDIR $catdir -D CAMERA simtest -region {$RA - $dRA} {$RA + $dRA} {$DEC - $dDEC} {$DEC + $dDEC} -update-objects -update
 
   if ($PARALLEL)
@@ -599,9 +603,9 @@
   end
   if ($SMALLTEST)
-    echo relphot -D CATDIR $catdir -D CAMERA simtest -region 8 12 18 22 -images g,r,i,z,y -nloop 0 -D STAR_TOOFEW 0 -update -boundary-tree tess.3pi.fits -is-diff-db -statmode WT_MEAN 
-    exec relphot -D CATDIR $catdir -D CAMERA simtest -region 8 12 18 22 -images g,r,i,z,y -nloop 0 -D STAR_TOOFEW 0 -update -boundary-tree tess.3pi.fits -is-diff-db -statmode WT_MEAN
+    echo relphot -D CATDIR $catdir -D CAMERA simtest -region {$RA - $dRA} {$RA + $dRA} {$DEC - $dDEC} {$DEC + $dDEC} -images g,r,i,z,y -nloop 0 -D STAR_TOOFEW 0 -update -boundary-tree tess.3pi.fits -is-diff-db -statmode WT_MEAN 
+    exec relphot -D CATDIR $catdir -D CAMERA simtest -region {$RA - $dRA} {$RA + $dRA} {$DEC - $dDEC} {$DEC + $dDEC} -images g,r,i,z,y -nloop 0 -D STAR_TOOFEW 0 -update -boundary-tree tess.3pi.fits -is-diff-db -statmode WT_MEAN
   else
-    echo relphot -D CATDIR $catdir -D CAMERA simtest -region 8 12 18 22 -images g,r,i,z,y -update
-    exec relphot -D CATDIR $catdir -D CAMERA simtest -region 8 12 18 22 -images g,r,i,z,y -update
+    echo relphot -D CATDIR $catdir -D CAMERA simtest -region {$RA - $dRA} {$RA + $dRA} {$DEC - $dDEC} {$DEC + $dDEC} -images g,r,i,z,y -update
+    exec relphot -D CATDIR $catdir -D CAMERA simtest -region {$RA - $dRA} {$RA + $dRA} {$DEC - $dDEC} {$DEC + $dDEC} -images g,r,i,z,y -update
   end
 
@@ -715,6 +719,6 @@
   for i 10 1024 100
     for j 10 1024 100
-      $ra  = 10.0 + $i*0.25/3600
-      $dec = 20.0 + $j*0.25/3600
+      $ra  = $RA + $i*0.25/3600
+      $dec = $DEC + $j*0.25/3600
       fprintf " %10.6f %10.6f %7.3f %6.1f %6.1f  %7.3f" $ra $dec {10.0 + $1 + 2.5*($i + $j)/1000.0} $i $j {-15.0 + $1 + 2.5*($i + $j)/1000.0}
     end
@@ -737,9 +741,9 @@
 
   # NOTE: relphot refuses to set the warp averages if there is no boundary tree: otherwise it cannot choose the correct subset of measurements
-  # relphot -D CATDIR testdata/catdir.mrg -D CAMERA simtest -region 8 12 18 22 -update -vv -averages -boundary-tree tess.3pi.fits 
-  # 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 
+  # relphot -D CATDIR testdata/catdir.mrg -D CAMERA simtest -region {$RA - $dRA} {$RA + $dRA} {$DEC - $dDEC} {$DEC + $dDEC} -update -vv -averages -boundary-tree tess.3pi.fits 
+  # relphot -D CATDIR testdata/catdir.mrg -D CAMERA simtest -region {$RA - $dRA} {$RA + $dRA} {$DEC - $dDEC} {$DEC + $dDEC} -update -vv -images g,r -reset -reset-zpts -D STAR_TOOFEW 0 -boundary-tree tess.3pi.fits 
 
   catdir $1
-  skyregion 8 12 18 22
+  skyregion {$RA - $dRA} {$RA + $dRA} {$DEC - $dDEC} {$DEC + $dDEC}
   avextract ra dec g:psf:chp g:kron:chp g:psf:stk g:kron:stk g:psf:wrp g:kron:wrp
 
@@ -778,9 +782,9 @@
 
   # NOTE: relphot refuses to set the warp averages if there is no boundary tree: otherwise it cannot choose the correct subset of measurements
-  # relphot -D CATDIR testdata/catdir.mrg -D CAMERA simtest -region 8 12 18 22 -update -vv -averages -boundary-tree tess.3pi.fits 
-  # 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 
+  # relphot -D CATDIR testdata/catdir.mrg -D CAMERA simtest -region {$RA - $dRA} {$RA + $dRA} {$DEC - $dDEC} {$DEC + $dDEC} -update -vv -averages -boundary-tree tess.3pi.fits 
+  # relphot -D CATDIR testdata/catdir.mrg -D CAMERA simtest -region {$RA - $dRA} {$RA + $dRA} {$DEC - $dDEC} {$DEC + $dDEC} -update -vv -images g,r -reset -reset-zpts -D STAR_TOOFEW 0 -boundary-tree tess.3pi.fits 
 
   catdir $1
-  skyregion 8 12 18 22
+  skyregion {$RA - $dRA} {$RA + $dRA} {$DEC - $dDEC} {$DEC + $dDEC}
 
   mextract ra dec mag:rel:psf mag:rel:kron mag:ave:psf mag:ave:kron photcode
@@ -806,4 +810,8 @@
       $PARALLEL = 1
     end
+    if ("$argv:0" == "-dump-region")
+      echo {$RA - $dRA} {$RA + $dRA} {$DEC - $dDEC} {$DEC + $dDEC}
+      exit 0
+    end
   end
   mkfull