Changeset 10215

Timestamp:

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

Author:

Paul Price

Message:

Cleaning up code. Deleted old unused files.

Location:

trunk/ppImage/src

Files:

• ppImage.c (modified) (3 diffs)
• ppImageDetrendFlat.c (deleted)
• ppImageDetrendFringe.h (modified) (3 diffs)
• ppImageDetrendMask.c (deleted)
• ppImageDetrendPedestal.c (deleted)
• ppImageParseCamera.c (modified) (1 diff)
• ppImageParseDetrend.c (deleted)

trunk/ppImage/src/ppImage.c

@@ -17 +17 @@
     pmConfig *config = ppImageArguments(argc, argv);
     if (config == NULL) {
-        psErrorStackPrint(stderr, " ");
+        psErrorStackPrint(stderr, "Unable to parse command-line arguments.");
         exit(1);
     }
@@ -25 +25 @@
     ppImageOptions *options = ppImageParseCamera(config);
     if (options == NULL) {
-        psErrorStackPrint(stderr, " ");
+        psErrorStackPrint(stderr, "Unable to parse camera.");
         exit(1);
     }
@@ -31 +31 @@
     // Image Arithmetic Loop
     if (!ppImageLoop(config, options)) {
-        psErrorStackPrint(stderr, " ");
+        psErrorStackPrint(stderr, "Unable to loop over input");
         exit(1);
     }
 
-    psLogMsg ("ppImage", 3, "complete ppImage run: %f sec\n", psTimerMark (TIMERNAME));
+    psLogMsg ("ppImage", 3, "Complete ppImage run: %f sec\n", psTimerMark(TIMERNAME));
 
     // Cleaning up
     ppImageCleanup(config, options);
+
     return EXIT_SUCCESS;
 }

trunk/ppImage/src/ppImageDetrendFringe.h

@@ -6 +6 @@
 #include "ppImageOptions.h"
 
+// Measure fringes
 bool ppImageDetrendFringeMeasure(pmReadout *readout, // Readout to measure
                                  pmCell *fringe, // Fringe cell (each readout is a different component)
@@ -11 +12 @@
     );
 
+// Solve the fringe system
 bool ppImageDetrendFringeSolve(pmChip *scienceChip, // Chip with science
                                const pmChip *refChip, // Chip with reference fringes
@@ -16 +18 @@
     );
 
-
+// Generate fringe frame
 psImage *ppImageDetrendFringeGenerate(pmCell *science, // Science cell
                                       pmCell *fringes // Fringe cell, one readout per fringe component

trunk/ppImage/src/ppImageParseCamera.c

@@ -16 +16 @@
         return NULL;
     }
+
+#if 0
+    // the input image defines the camera, and all recipes and options the follow
+    pmFPAfile *inputMask = pmFPAfileDefineFromArgs (&status, config, "PPIMAGE.INPUT.MASK", "INPUT.MASK");
+    if (!status || !inputMask) {
+        psError(PS_ERR_IO, false, "Failed to build FPA from PPIMAGE.INPUT.MASK");
+        return NULL;
+    }
+
+    // the input image defines the camera, and all recipes and options the follow
+    pmFPAfile *inputWeight = pmFPAfileDefineFromArgs (&status, config, "PPIMAGE.INPUT.WEIGHT", "INPUT.WEIGHT");
+    if (!status || !inputWeight) {
+        psError(PS_ERR_IO, false, "Failed to build FPA from PPIMAGE.INPUT.WEIGHT");
+        return NULL;
+    }
+#endif
 
     // add recipe options supplied on command line