Changeset 18372 for trunk/ippconfig/recipes/filerules-split.mdc

Timestamp:

Jun 29, 2008, 3:11:25 PM (18 years ago)

Author:

eugene

Message:

cleanup conflicts

File:

• trunk/ippconfig/recipes/filerules-split.mdc (modified) (2 diffs)

trunk/ippconfig/recipes/filerules-split.mdc

@@ -6 +6 @@
 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 +144 @@
 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