Changeset 36420

Timestamp:

Jan 3, 2014, 1:58:26 PM (13 years ago)

Author:

bills

Message:

Add filerule for full force output.

Location:

branches/bills_branches/bills_201312

Files:

• ippconfig/recipes/filerules-split.mdc (modified) (1 diff)
• psphot/src/psphotFullForceSummary.c (modified) (2 diffs)
• psphot/src/psphotFullForceSummaryReadout.c (modified) (1 diff)

branches/bills_branches/bills_201312/ippconfig/recipes/filerules-split.mdc

@@ -262 +262 @@
 PSPHOT.STACK.RESID           OUTPUT {OUTPUT}.stk.{FILE.ID}.res.fits   IMAGE           COMP_SUB   FPA        TRUE      NONE
 PSPHOT.STACK.CONFIG          OUTPUT {OUTPUT}.psphotStack.mdc          TEXT            NONE       FPA        TRUE      NONE
+
+PSPHOT.FULLFORCE.OUTPUT      OUTPUT {OUTPUT}.cmf                      CMF             NONE       FPA        TRUE      NONE
                                                      
 SOURCE.PLOT.RAW.MOMENTS      OUTPUT {OUTPUT}.{CHIP.NAME}.mnt.png      KAPA            NONE       CHIP       TRUE      NONE

branches/bills_branches/bills_201312/psphot/src/psphotFullForceSummary.c

@@ -137 +137 @@
         return false;
     }
-    pmFPAfile *output = pmFPAfileDefineOutput(config, outputFPA, "PSPHOT.OUTPUT");
+    pmFPAfile *output = pmFPAfileDefineOutput(config, outputFPA, "PSPHOT.FULLFORCE.OUTPUT");
     psFree(outputFPA);                        // Drop reference
     if (!output) {
-        psError(psErrorCodeLast(), false, _("Unable to generate output file from PSPHOT.OUTPUT"));
+        psError(psErrorCodeLast(), false, _("Unable to generate output file from PSPHOT.FULLFORCE.OUTPUT"));
         return false;
     }
     if (output->type != PM_FPA_FILE_CMF) {
-        psError(PSPHOT_ERR_CONFIG, true, "PSPHOT.OUTPUT is not of type CMF");
+        psError(PSPHOT_ERR_CONFIG, true, "PSPHOT.FULLFORCE.OUTPUT is not of type CMF");
         return false;
     }
@@ -171 +171 @@
     }
 
-    pmFPAfile *output = psMetadataLookupPtr (&status, config->files, "PSPHOT.OUTPUT");
+    pmFPAfile *output = psMetadataLookupPtr (&status, config->files, "PSPHOT.FULLFORCE.OUTPUT");
     if (!output) {
         psError(PSPHOT_ERR_PROG, false, "Can't find output data!");

branches/bills_branches/bills_201312/psphot/src/psphotFullForceSummaryReadout.c

@@ -31 +31 @@
     int num = psphotFileruleCount(config, "PSPHOT.INPUT.CMF");
 
-    pmFPAfile *output = psMetadataLookupPtr (&status, config->files, "PSPHOT.OUTPUT");
+    pmFPAfile *output = psMetadataLookupPtr (&status, config->files, "PSPHOT.FULLFORCE.OUTPUT");
     pmCell *outputCell = pmFPAviewThisCell(view, output->fpa);
     pmReadout *outputReadout = pmFPAviewThisReadout(view, output->fpa);