Changeset 19928 for trunk/ppImage/src/ppImage.h

Timestamp:

Oct 6, 2008, 12:24:10 PM (18 years ago)

Author:

Paul Price

Message:

Don't put statistics on an FPA: too troublesome to get to, and it's ok to just carry around a psMetadata in ppImageLoop, passing it to functions that need it. Updated times for output statistics.

File:

• trunk/ppImage/src/ppImage.h (modified) (3 diffs)

trunk/ppImage/src/ppImage.h

@@ -17 +17 @@
 
 #define RECIPE_NAME "PPIMAGE"           // Name of the recipe to use
-#define TIMERNAME "ppImage"             // Name of timer
+#define TIMER_TOTAL   "PPIMAGE.TOTAL"   // Name of timer for total time
+#define TIMER_DETREND "PPIMAGE.DETREND" // Name of timer for detrend time
+#define TIMER_PHOT    "PPIMAGE.PHOT"    // Name of timer for photometry time
 
 // Options for ppImage processing
@@ -151 +153 @@
 bool ppImageDefineFile (pmConfig *config, pmFPA *input, char *filerule, char *argname, pmFPAfileType fileType, pmDetrendType detrendType);
 
-// calculate stats, including MD5
-bool ppImageStats (pmConfig *config, pmChip *chip, const pmFPAview *inputView, const ppImageOptions *options);
-
 // write stats to output file
-bool ppImageStatsOutput (pmConfig *config, const ppImageOptions *options);
+bool ppImageStatsOutput(pmConfig *config, // Configuration
+                        psMetadata *stats, // Statistics output
+                        const ppImageOptions *options // Options
+    );
 
 
@@ -197 +199 @@
 
 // calculate stats, including MD5
-bool ppImagePixelStats (pmConfig *config, const ppImageOptions *options, const pmFPAview *inputView);
+bool ppImagePixelStats(pmConfig *config,// Configuration
+                       psMetadata *stats, // Statistics output
+                       const ppImageOptions *options, // Options
+                       const pmFPAview *inputView // View to data
+    );
 
 // calculate stats from headers and concepts
-bool ppImageMetadataStats (pmConfig *config, const ppImageOptions *options);
-
-void ppImageFileCheck (pmConfig *config);
+bool ppImageMetadataStats(pmConfig *config, // Configuration
+                          psMetadata *stats, // Statistics output
+                          const ppImageOptions *options // Options
+    );
+
+void ppImageFileCheck(pmConfig *config);
 
 /// Dump memory summary to text file