Changeset 23688 for trunk/ppSub/src/ppSub.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)
• ppSub (modified) (1 prop)
• ppSub/src/ppSub.h (modified) (7 diffs)

trunk/ppSub/src/ppSub.h

@@ -22 +22 @@
 #define PPSUB_RECIPE "PPSUB"            /// Name of the recipe to use
 
+// Output files, for activation/deactivation
+typedef enum {
+    PPSUB_FILES_IMAGE = 0x01,           // Image files
+    PPSUB_FILES_PHOT  = 0x02,           // Photometry files
+    PPSUB_FILES_ALL   = 0xFF,           // All files
+} ppSubFiles;
+
+/// Data for processing
+typedef struct {
+    psErrorCode quality;                /// Quality code; 0 for no problem
+    psMetadata *stats;                  /// Statistics
+} ppSubData;
+
+/// Constructor
+ppSubData *ppSubDataAlloc(void);
+
 /// Setup the arguments parsing
 bool ppSubArgumentsSetup(int argc, char *argv[], ///< Command-line arguments
@@ -41 +57 @@
 /// Perform PSF-matched image subtraction on the readout
 bool ppSubReadout(pmConfig *config,     ///< Configuration
-                  psMetadata *stats,    ///< Statistics, for output
+                  ppSubData *data,      ///< Processing data
                   const pmFPAview *view ///< View of readout to subtract
     );
@@ -53 +69 @@
 /// looking up the parameters in the recipe and supplying them to the function pmSubtractionMatch()
 bool ppSubMatchPSFs(pmConfig *config,    ///< Configuration
+                    ppSubData *data,    ///< Processing data
                     const pmFPAview *view ///< View of active readout
     );
@@ -63 +80 @@
 /// Photometry stage 1: measure the PSF from the minuend image
 bool ppSubMakePSF(pmConfig *config,       ///< Configuration
+                  ppSubData *data,    ///< Processing data
                   const pmFPAview *view ///< View of active readout
     );
@@ -74 +92 @@
 /// Photometry stage 2: find and measure sources on the subtracted image
 bool ppSubReadoutPhotometry(pmConfig *config,     ///< Configuration
-                            psMetadata *stats,    ///< Statistics, for output
+                            ppSubData *data,    ///< Processing data
                             const pmFPAview *view ///< View of active readout
     );
@@ -80 +98 @@
 /// Renormalize, update headers and generate JPEGs
 bool ppSubReadoutUpdate(pmConfig *config, ///< Configuration
-                        psMetadata *stats, ///< Statistics for output, or NULL
+                        ppSubData *data,    ///< Processing data
                         const pmFPAview *view ///< View of active readout
     );
@@ -96 +114 @@
 void ppSubVersionPrint(void);
 
+/// Mark the data quality as bad and prepare to suspend processing
+void ppSubDataQuality(pmConfig *config, ///< Configuration
+                      ppSubData *data,  ///< Processing data
+                      psErrorCode error,///< Error code
+                      ppSubFiles files  ///< Files to deactivate
+    );
 
 // Copy every instance of a single keyword from one metadata to another