Changeset 10211

Timestamp:

Nov 27, 2006, 6:20:39 PM (19 years ago)

Author:

Paul Price

Message:

Cleaning up code.

Location:

trunk/ppImage/src

Files:

• ppImageDetrendBias.c (modified) (3 diffs)
• ppImageDetrendFringe.c (modified) (3 diffs)

trunk/ppImage/src/ppImageDetrendBias.c

@@ -8 +8 @@
 {
     psTrace("ppImage", 1, "Commencing bias processing....\n");
-//    psMetadataPrint(inputReadout->parent->concepts, 7);
 
     if (!pmSubtractBias(inputReadout, options->overscan, bias, dark)) {
-        return false;
+        psError(PS_ERR_UNKNOWN, false, "Unable to subtract bias.\n");
+        return false;
     }
 
     // Output overscan fit results, if required
     if (! options->doOverscan || ! options->overscan) {
-        return true;
+        return true;                    // No overscan fit to report
     }
 
@@ -33 +33 @@
                 psStringAppend(&coeffs, "%e ", poly->coeff[i]);
             }
-            psLogMsg("phase2", PS_LOG_INFO, "Overscan polynomial coefficients:\n%s\n", coeffs);
+            psLogMsg("ppImage", PS_LOG_INFO, "Overscan polynomial coefficients:\n%s\n", coeffs);
             psFree(coeffs);
             break;
@@ -49 +49 @@
                 psStringAppend(&coeffs, "\n");
             }
-            psLogMsg("phase2", PS_LOG_INFO, "Overscan spline coefficients:\n%s\n", coeffs);
+            psLogMsg("ppImage", PS_LOG_INFO, "Overscan spline coefficients:\n%s\n", coeffs);
             psFree(coeffs);
             break;

trunk/ppImage/src/ppImageDetrendFringe.c

@@ +1 @@
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <pslib.h>
 #include <psmodules.h>
 
+#include "ppImageOptions.h"
 #include "ppImageDetrendFringe.h"
 
-bool ppImageDetrendFringeMeasure(pmReadout *readout, // Readout to measure
-                                 pmCell *fringe, // Fringe cell (each readout is a different component)
-                                 const ppImageOptions *options // Options
-                                 )
+bool ppImageDetrendFringeMeasure(pmReadout *readout, pmCell *fringe, const ppImageOptions *options)
 {
     PS_ASSERT_PTR_NON_NULL(readout, false);
@@ -98 +100 @@
 // Solve the fringe system: we have science fringe measurements for each cell, and an array of reference
 // fringe measurements for each cell.  Need to concatenate these together first, and then solve.
-bool ppImageDetrendFringeSolve(pmChip *scienceChip, // Chip with science
-                               const pmChip *refChip, // Chip with reference fringes
-                               const ppImageOptions *options // Options
-    )
+bool ppImageDetrendFringeSolve(pmChip *scienceChip, const pmChip *refChip, const ppImageOptions *options)
 {
     PS_ASSERT_PTR_NON_NULL(scienceChip, NULL);
@@ -142 +141 @@
 
 
-psImage *ppImageDetrendFringeGenerate(pmCell *science, // Science cell
-                                      pmCell *fringes // Fringe cell, one readout per fringe component
-    )
+psImage *ppImageDetrendFringeGenerate(pmCell *science, pmCell *fringes)
 {
     PS_ASSERT_PTR_NON_NULL(science, false);