Changeset 27840 for branches/simtest_nebulous_branches/ppStack/src/ppStackLoop.h

Timestamp:

May 3, 2010, 8:50:52 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/simtest_nebulous_branches

Files:

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

branches/simtest_nebulous_branches/ppStack/src

@@ -10 +10 @@
 stamp-h1
 ppStackVersionDefinitions.h
+ppStackErrorCodes.c
+ppStackErrorCodes.h

@@ -10 +10 @@
 stamp-h1
 ppStackVersionDefinitions.h
+ppStackErrorCodes.c
+ppStackErrorCodes.h

branches/simtest_nebulous_branches/ppStack/src/ppStackLoop.h

@@ -7 +7 @@
 #include "ppStackOptions.h"
 #include "ppStackThread.h"
+#include "ppStack.h"
 
 
 // Loop over the inputs, doing the combination
 bool ppStackLoop(
-    pmConfig *config                    // Configuration
+    pmConfig *config,                    // Configuration
+    ppStackOptions *options             // Options for stacking
     );
 
@@ -36 +38 @@
 // Prepare for combination
 bool ppStackCombinePrepare(
+    const char *outName,                // Name of output file
+    const char *expName,                // Name of exposure file
+    ppStackFileList files,              // Files of interest
     ppStackThreadData *stack,           // Stack
     ppStackOptions *options,            // Options
@@ -57 +62 @@
 bool ppStackCombineFinal(
     ppStackThreadData *stack,           // Stack
+    psArray *covariances,               // Covariances
     ppStackOptions *options,            // Options
-    pmConfig *config                    // Configuration
+    pmConfig *config,                   // Configuration
+    bool safe,                          // Allow safe combination?
+    bool norm,                          // Normalise images?
+    bool grow                           // Grow rejection masks?
     );
 

@@ -10 +10 @@
 stamp-h1
 ppStackVersionDefinitions.h
+ppStackErrorCodes.c
+ppStackErrorCodes.h