Index: trunk/ippToPsps/test/mkgpc1data.dr2.dvo
===================================================================
--- trunk/ippToPsps/test/mkgpc1data.dr2.dvo	(revision 40250)
+++ trunk/ippToPsps/test/mkgpc1data.dr2.dvo	(revision 40251)
@@ -21,5 +21,5 @@
 $BAD_PSFQF_FRAC = 0.0
 $ADDNOISE = "-no-noise"
-# $ADDNOISE = ""
+$ADDNOISE = ""
 
 $CATFORMAT = PS1_V6
@@ -86,6 +86,9 @@
   exec rm -rf testdata/catdir.mrg
 
-  # if CATFORMAT is specified, dvomerge will default to the .ptolemyrc version
-  exec dvomerge -matched-tables testdata/catdir.cam into testdata/catdir.mrg -D CATFORMAT $CATFORMAT
+  # if CATFORMAT is not specified, dvomerge will default to the .ptolemyrc version
+  # CATFORMAT, SKY_DEPTH here must match the addstar calls
+  # (or else I should copy the first catdir instead of using dvomerge)
+  # (or else dvomerge should be smart enough to inherit these from the input if the output does not exist)
+  exec dvomerge -matched-tables testdata/catdir.cam into testdata/catdir.mrg -D CATFORMAT $CATFORMAT -D SKY_DEPTH 4
   exec dvomerge -matched-tables testdata/catdir.stk into testdata/catdir.mrg
   exec dvomerge -matched-tables testdata/catdir.wrp into testdata/catdir.mrg