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

Timestamp:

Apr 2, 2009, 2:51:37 PM (17 years ago)

Author:

Paul Price

Message:

Merging in branches/pap/ from r23685. Some conflicts, most notably in ippTools, but these resolved fairly simply. Only question mark is on regtool reversion, but I think I got it right. Everything builds fine.

Location:

trunk

Files:

• . (modified) (1 prop)
• ppImage (modified) (1 prop)
• ppImage/src/ppImage.h (modified) (3 diffs)

trunk/ppImage/src/ppImage.h

@@ -40 +40 @@
     bool doAstromMosaic;                // full-mosaic Astrometry
     bool doStats;                       // call ppStats on the image
-    bool checkCTE;                      // measure pixel-based variance
+    bool checkCTE;                      // measure pixel-based variance
 
     // output files requested
@@ -88 +88 @@
     float remnanceThresh;               // Threshold for remnance detection
 
-    char *normClass;                    // class to use for per-class normalization 
+    char *normClass;                    // class to use for per-class normalization
 } ppImageOptions;
 
@@ -146 +146 @@
 bool ppImageRebinChip (pmConfig *config, pmFPAview *view, ppImageOptions *options, char *outName);
 
-bool ppImagePhotom (pmConfig *config, pmFPAview *view);
-bool ppImageAstrom (pmConfig *config);
-bool ppImageAddstar (pmConfig *config);
+bool ppImagePhotom(psMetadata *stats, pmConfig *config, pmFPAview *view);
+bool ppImageAstrom(pmConfig *config, psMetadata *stats);
+bool ppImageAddstar(pmConfig *config);
 
 // Subtract background from the chip-mosaicked image