Changeset 27402 for trunk/ppStack/src/ppStackCamera.c

Timestamp:

Mar 23, 2010, 9:12:53 AM (16 years ago)

Author:

Paul Price

Message:

Pulling r27400 out of the trunk until it can be developed further (compression, make optional). Development will continue on branches/pap_stack/

File:

• trunk/ppStack/src/ppStackCamera.c (modified) (3 diffs)

trunk/ppStack/src/ppStackCamera.c

@@ -283 +283 @@
     }
 
-
-    // Exposure image
-    pmFPA *expFPA = pmFPAConstruct(config->camera, config->cameraName); // FPA to contain the output
-    if (!expFPA) {
-        psError(psErrorCodeLast(), false, "Unable to construct an FPA from camera configuration.");
-        return false;
-    }
-    pmFPAfile *exp = pmFPAfileDefineOutput(config, expFPA, "PPSTACK.OUTPUT.EXP");
-    psFree(expFPA);                        // Drop reference
-    if (!exp) {
-        psError(psErrorCodeLast(), false, _("Unable to generate output file from PPSTACK.OUTPUT.EXP"));
-        return false;
-    }
-    if (exp->type != PM_FPA_FILE_IMAGE) {
-        psError(PPSTACK_ERR_CONFIG, true, "PPSTACK.OUTPUT.EXP is not of type IMAGE");
-        return false;
-    }
-    exp->save = true;
-
-    if (!pmFPAAddSourceFromFormat(expFPA, "Stack", exp->format)) {
-        psError(psErrorCodeLast(), false, "Unable to generate output FPA.");
-        return false;
-    }
-
-    // Exposure numbers
-    pmFPAfile *expNum = pmFPAfileDefineOutput(config, exp->fpa, "PPSTACK.OUTPUT.EXPNUM");
-    if (!expNum) {
-        psError(psErrorCodeLast(), false, _("Unable to generate output file from PPSTACK.OUTPUT.MASK"));
-        return false;
-    }
-    if (expNum->type != PM_FPA_FILE_MASK) {
-        psError(PPSTACK_ERR_CONFIG, true, "PPSTACK.OUTPUT.EXPNUM is not of type MASK");
-        return false;
-    }
-    expNum->save = true;
-
-
-
     if (havePSFs) {
         pmFPA *psfFPA = pmFPAConstruct(config->camera, config->cameraName); // FPA to contain PSF
@@ -340 +302 @@
     }
 
+#if 1
     // Unconvolved stack
     pmFPA *unconvFPA = pmFPAConstruct(config->camera, config->cameraName); // FPA to contain unconvolved output
@@ -388 +351 @@
         unconvVariance->save = true;
     }
-
-
-    // Exposure image
-    pmFPA *unconvExpFPA = pmFPAConstruct(config->camera, config->cameraName); // FPA to contain the output
-    if (!unconvExpFPA) {
-        psError(psErrorCodeLast(), false, "Unable to construct an FPA from camera configuration.");
-        return false;
-    }
-    pmFPAfile *unconvExp = pmFPAfileDefineOutput(config, unconvExpFPA, "PPSTACK.UNCONV.EXP");
-    psFree(unconvExpFPA);               // Drop reference
-    if (!unconvExp) {
-        psError(psErrorCodeLast(), false, _("Unable to generate output file from PPSTACK.UNCONV.EXP"));
-        return false;
-    }
-    if (unconvExp->type != PM_FPA_FILE_IMAGE) {
-        psError(PPSTACK_ERR_CONFIG, true, "PPSTACK.UNCONV.EXP is not of type IMAGE");
-        return false;
-    }
-    unconvExp->save = true;
-
-    if (!pmFPAAddSourceFromFormat(unconvExpFPA, "Stack", unconvExp->format)) {
-        psError(psErrorCodeLast(), false, "Unable to generate output FPA.");
-        return false;
-    }
-
-    // Output mask
-    pmFPAfile *unconvExpNum = pmFPAfileDefineOutput(config, unconvExp->fpa, "PPSTACK.UNCONV.EXPNUM");
-    if (!unconvExpNum) {
-        psError(psErrorCodeLast(), false, _("Unable to generate output file from PPSTACK.UNCONV.MASK"));
-        return false;
-    }
-    if (unconvExpNum->type != PM_FPA_FILE_MASK) {
-        psError(PPSTACK_ERR_CONFIG, true, "PPSTACK.UNCONV.EXPNUM is not of type MASK");
-        return false;
-    }
-    unconvExpNum->save = true;
-
+#endif
 
     // Output JPEGs