Changeset 7522

Timestamp:

Jun 11, 2006, 11:08:59 AM (20 years ago)

Author:

eugene

Message:

re-org / re-name to make more parallel with psphot

Location:

trunk/ppImage/src

Files:

• Makefile.am (modified) (1 diff)
• ppImage.c (modified) (1 diff)
• ppImage.h (modified) (3 diffs)
• ppImageArguments.c (added)
• ppImageCleanup.c (added)
• ppImageConfig.c (deleted)
• ppImageDetrendReadout.c (modified) (1 diff)
• ppImageLoop.c (modified) (2 diffs)
• ppImageParseCamera.c (added)
• ppImagePhot.c (deleted)
• ppImagePhotom.c (added)

trunk/ppImage/src/Makefile.am

@@ -10 +10 @@
 ppImage_SOURCES = \
         ppImage.c \
-        ppImageConfig.c \
+        ppImageArguments.c \
+        ppImageParseCamera.c \
+        ppImageLoop.c \
+        ppImageCleanup.c \
         ppImageOptions.c \
-        ppImageParseDetrend.c \
-        ppImageLoop.c \
         ppImageDetrendReadout.c \
         ppImageDetrendBias.c \
         ppImageDetrendNonLinear.c \
         ppImageRebinReadout.c \
-        ppImagePhot.c \
+        ppImagePhotom.c \
         ppMem.c
 

trunk/ppImage/src/ppImage.c

@@ -9 +9 @@
     // Determine camera, format from header if not already defined
     // Construct camera in preparation for reading
-    pmConfig *config = ppImageConfig(&argc, argv);
+    pmConfig *config = ppImageArguments(&argc, argv);
+    if (config == NULL) {
+        psErrorStackPrint(stderr, "");
+        exit(1);
+    }
 
-    // Set various tasks (define optional operations)
-    ppImageOptions *options = ppImageOptionsParse(config);
-
+    // define recipe options
     // define the active I/O files
-    ppImageParseDetrend(options, config);
+    ppImageOptions *options = ppImageParseCamera(config);
+    if (options == NULL) {
+        psErrorStackPrint(stderr, "");
+        exit(1);
+    }
 
     // Image Arithmetic Loop
-    ppImageLoop(options, config);
+    ppImageLoop(config, options);
+
+    psLogMsg ("psphot", 3, "complete psphot run: %f sec\n", psTimerMark ("complete"));
 
     // Cleaning up
-    psFree(options);
-    psFree(config);
-    psTimerStop();
-    psTraceReset();
-    pmConceptsDone();
-    pmConfigDone();
-    // ppMemCheck();
-    fprintf (stderr, "found %d leaks at %s\n", psMemCheckLeaks (0, NULL, NULL, false), "ppImage");
+    ppImageCleanup(config, options);
     return EXIT_SUCCESS;
 }

trunk/ppImage/src/ppImage.h

@@ -7 +7 @@
 #include "psphot.h"
 #include "ppImageOptions.h"
-#include "ppMem.h"
 
 #define RECIPE_NAME "PHASE2"            // Name of the recipe to use
@@ -13 +12 @@
 
 // Get the configuration
-pmConfig *ppImageConfig(int *argc, char **argv);
+pmConfig *ppImageArguments(int *argc, char **argv);
 
 // Determine what type of camera, and initialise
-bool ppImageParseDetrend(ppImageOptions *options, pmConfig *config);
+ppImageOptions *ppImageParseCamera(pmConfig *config);
 
 // Loop over the input
-bool ppImageLoop(ppImageOptions *options, pmConfig *config);
+bool ppImageLoop(pmConfig *config, ppImageOptions *options);
+
+// free memory, check for leaks
+void ppImageCleanup (pmConfig *config, ppImageOptions *options);
 
 // perform the detrend analysis on the current readout
-bool ppImageDetrendReadout (ppImageOptions *options, pmConfig *config, pmFPAview *view);
+bool ppImageDetrendReadout (pmConfig *config, ppImageOptions *options, pmFPAview *view);
 
 bool ppImageDetrendBias(pmReadout *inputReadout, pmReadout *bias, pmReadout *dark, ppImageOptions *options);
@@ -35 +37 @@
 bool ppImagePhotom (pmConfig *config, pmFPAview *view);
 
-#endif // Pau.
+#endif

trunk/ppImage/src/ppImageDetrendReadout.c

@@ -1 +1 @@
 #include "ppImage.h"
 
-bool ppImageDetrendReadout (ppImageOptions *options, pmConfig *config, pmFPAview *view)
+bool ppImageDetrendReadout (pmConfig *config, ppImageOptions *options, pmFPAview *view)
 {
     // construct a view for the detrend images (which have only one readout)

trunk/ppImage/src/ppImageLoop.c

@@ -1 +1 @@
 # include "ppImage.h"
 
-bool ppImageLoop (ppImageOptions *options, pmConfig *config) {
+bool ppImageLoop (pmConfig *config, ppImageOptions *options) {
 
     bool status;
@@ -35 +35 @@
 
                 // perform the detrend analysis
-                ppImageDetrendReadout (options, config, view);
+                ppImageDetrendReadout (config, options, view);
 
                 if (options->doBin1) ppImageRebinReadout (config, view, "PPIMAGE.BIN1");