Index: /trunk/ippScripts/scripts/detrend_reject_exp.pl
===================================================================
--- /trunk/ippScripts/scripts/detrend_reject_exp.pl	(revision 18371)
+++ /trunk/ippScripts/scripts/detrend_reject_exp.pl	(revision 18372)
@@ -305,5 +305,4 @@
 $command .= " -accept" if $master;
 $command .= " -dbname $dbname" if defined $dbname;
-
 ### XXX WE NEED to make this a recipe-driven option
 $command .= " -again" unless $stop; 
Index: /trunk/ippconfig/gpc1/psastro.config
===================================================================
--- /trunk/ippconfig/gpc1/psastro.config	(revision 18371)
+++ /trunk/ippconfig/gpc1/psastro.config	(revision 18372)
@@ -28,8 +28,8 @@
 
 #
+PSASTRO.GRID.MIN.SCALE F32  1.00
+PSASTRO.GRID.MAX.SCALE F32  1.00
 # PSASTRO.GRID.MIN.SCALE F32  0.98
 # PSASTRO.GRID.MAX.SCALE F32  1.021
-PSASTRO.GRID.MIN.SCALE F32  1.00
-PSASTRO.GRID.MAX.SCALE F32  1.00
 PSASTRO.GRID.DEL.SCALE F32  0.01
 
Index: /trunk/ippconfig/recipes/filerules-split.mdc
===================================================================
--- /trunk/ippconfig/recipes/filerules-split.mdc	(revision 18371)
+++ /trunk/ippconfig/recipes/filerules-split.mdc	(revision 18372)
@@ -6,7 +6,7 @@
 PSPHOT.OUTPUT      STR PSPHOT.OUT.CMF.SPL
 PSASTRO.INPUT      STR PSASTRO.INPUT.CMF
-PSASTRO.OUTPUT     STR PSASTRO.OUT.CMF.MEF
-PSASTRO.OUTPUT.SPL STR PSASTRO.OUT.CMF.SPL
-PSASTRO.OUTPUT.MEF STR PSASTRO.OUT.CMF.MEF
+# PSASTRO.OUTPUT     STR PSASTRO.OUT.CMF.MEF
+# PSASTRO.OUTPUT.SPL STR PSASTRO.OUT.CMF.SPL
+# PSASTRO.OUTPUT.MEF STR PSASTRO.OUT.CMF.MEF
 
 ### input file definitions
@@ -144,9 +144,10 @@
 SOURCE.PLOT.APRESID     OUTPUT {OUTPUT}.{CHIP.NAME}.dap.png      KAPA      NONE       CHIP       TRUE      NONE
 		        									        
-PSASTRO.OUTPUT.CMP      OUTPUT {OUTPUT}.{CHIP.NAME}.smp          CMP       NONE       CHIP       TRUE      NONE
-PSASTRO.OUT.CMF.SPL     OUTPUT {OUTPUT}.{CHIP.NAME}.smf          CMF       NONE       CHIP       TRUE      NONE
-PSASTRO.OUT.CMF.MEF     OUTPUT {OUTPUT}.smf                      CMF       NONE       FPA        TRUE      MEF
+# PSASTRO.OUTPUT.CMP      OUTPUT {OUTPUT}.{CHIP.NAME}.smp          CMP       NONE       CHIP       TRUE      NONE
+# PSASTRO.OUT.CMF.SPL     OUTPUT {OUTPUT}.{CHIP.NAME}.smf          CMF       NONE       CHIP       TRUE      NONE
+# PSASTRO.OUT.CMF.MEF     OUTPUT {OUTPUT}.smf                      CMF       NONE       FPA        TRUE      MEF
 PSASTRO.OUT.MODEL       OUTPUT {OUTPUT}.asm               ASTROM.MODEL     NONE       FPA        TRUE      NONE
 PSASTRO.OUT.REFSTARS    OUTPUT {OUTPUT}.aref.fits         ASTROM.REFSTARS  NONE       FPA        TRUE      NONE
+PSASTRO.OUTPUT          OUTPUT {OUTPUT}.smf                      CMF       NONE       FPA        TRUE      MEF
 PSASTRO.STATS           OUTPUT {OUTPUT}.stats                    STATS     NONE       FPA        TRUE      NONE
 		        									        
Index: /trunk/ippconfig/recipes/ppImage.config
===================================================================
--- /trunk/ippconfig/recipes/ppImage.config	(revision 18371)
+++ /trunk/ippconfig/recipes/ppImage.config	(revision 18372)
@@ -12,4 +12,5 @@
 MASK             BOOL    FALSE           # Mask bad pixels
 MASK.VALUE       STR     SAT,BAD,DETECTOR # Mask pixels with these attributes
+
 MASK.BUILD       BOOL    FALSE           # Build internal mask image
 REPLACE.MASKED   BOOL    FALSE           # Fill in masked pixels
Index: /trunk/psconfig/tagsets/ipp-2.5.dist
===================================================================
--- /trunk/psconfig/tagsets/ipp-2.5.dist	(revision 18371)
+++ /trunk/psconfig/tagsets/ipp-2.5.dist	(revision 18372)
@@ -33,4 +33,6 @@
   YYYYY  nebclient              ipp-2-5          -0
   YYYNY  Nebulous               ipp-2-5          -0
+  YYYNY  Nebulous-Server        ipp-2-5          -0
+  YYYNY  DataStore        	ipp-2-5          -0
   YYYYY  PS-IPP-Metadata-Config ipp-2-5          -0
   YYYYY  PS-IPP-Config          ipp-2-5          -0