Changeset 36580 for trunk/ppBackground/src/ppBackgroundStack.h

Timestamp:

Mar 7, 2014, 6:08:39 PM (12 years ago)

Author:

watersc1

Message:

ppBackgroundStack compiles. I know it's not useful yet, because I haven't implemented the 'apply' and 'save the outputs' parts.

File:

• trunk/ppBackground/src/ppBackgroundStack.h (modified) (3 diffs)

trunk/ppBackground/src/ppBackgroundStack.h

@@ -7 +7 @@
 #include "ppBackgroundErrorCodes.h"
 
-#define PPBACKGROUND_RECIPE "PPBACKGROUND"      // Recipe name
+#define PPBACKGROUND_RECIPE "PPBACKGROUND_STACK"      // Recipe name
 
 // Data for processing
@@ -30 +30 @@
 
 /// Initialise data for processing
-ppBackgroundData *ppBackgroundDataInit(int *argc, char *argv[] // Command-line arguments
+ppBackgroundStackData *ppBackgroundStackDataInit(int *argc, char *argv[] // Command-line arguments
     );
 
@@ -39 +39 @@
 
 /// Parse camera configurations
-bool ppBackgroundStackCamera(ppBackgroundData *data // Data for processing
+bool ppBackgroundStackCamera(ppBackgroundStackData *data // Data for processing
     );
 
 /// Loop over input data, processing
-bool ppBackgroundStackLoop(ppBackgroundData *data // Data for processing
+bool ppBackgroundStackLoop(ppBackgroundStackData *data // Data for processing
     );
 
-/// Determine the binning from the recipe if available.
-psImageBinning *ppBackgroundStackBinningByRecipe(const psImage *image, // Image for which to generate a bg model
-                                                 const pmConfig *config, // Configuration
-                                                 psString recipe_name,
-                                                 psString Xbin_name,
-                                                 psString Ybin_name
-                                                 );
+bool ppBackgroundStackModelFitOTASolution(ppBackgroundStackData *data);
+bool ppBackgroundStackDataModelFit(ppBackgroundStackData *data);
+bool ppBackgroundStackCalibApply(ppBackgroundStackData *data);
+bool ppBackgroundStackModelFit(ppBackgroundStackData *data);
 
-
-/// Restore the background to an image
-bool ppBackgroundStackRestore(
-    pmChip *chip,                       // Chip to correct
-    const pmChip *background,           // Chip with background model
-    const pmChip *pattern,              // Chip with pattern
-    const pmFPAview *view,              // View to data
-    pmConfig *config,                   // Configuration
-    psImageMaskType maskBad             // value to use for bad pixels
-    );
 
 /// Determine exit code