Changeset 17228 for trunk/psModules/src/camera

Timestamp:

Mar 28, 2008, 5:10:17 PM (18 years ago)

Author:

Paul Price

Message:

Merging pap_branch_080328 so we can use the modernised version of ppMerge.

Location:

trunk/psModules/src/camera

Files:

• pmReadoutStack.c (modified) (1 diff)
• pmReadoutStack.h (modified) (2 diffs)

trunk/psModules/src/camera/pmReadoutStack.c

@@ -3 +3 @@
 #endif
 
+#include <stdio.h>
+#include <string.h>
 #include <pslib.h>
 
 #include "pmReadoutStack.h"
 
+psImage *pmReadoutAnalysisImage(pmReadout *readout, // Readout containing image
+                                const char *name, // Name of image in analysis metadata
+                                int numCols, int numRows, // Expected size of image
+                                psElemType type, // Expected type of image
+                                double init // Initial value
+    )
+{
+    PS_ASSERT_PTR_NON_NULL(readout, false);
+    PS_ASSERT_STRING_NON_EMPTY(name, false);
+
+    bool mdok;                          // Status of MD lookup
+    psImage *image = psMetadataLookupPtr(&mdok, readout->analysis, name);
+    if (!image) {
+        image = psImageAlloc(numCols, numRows, type);
+        psMetadataAddImage(readout->analysis, PS_LIST_TAIL, name, 0, "Analysis image from " __FILE__, image);
+        psImageInit(image, init);
+        return image;
+    }
+    if (image->numCols != numCols || image->numRows != numRows) {
+        psError(PS_ERR_BAD_PARAMETER_SIZE, true, "Analysis image %s has incorrect size (%dx%d vs %dx%d)",
+                name, image->numCols, image->numRows, numCols, numRows);
+        return NULL;
+    }
+    if (image->type.type != type) {
+        psError(PS_ERR_BAD_PARAMETER_TYPE, true, "Analysis image %s has incorrect type (%x vs %x)",
+                name, image->type.type, type);
+        return NULL;
+    }
+    return psMemIncrRefCounter(image);
+}
 
 bool pmReadoutUpdateSize(pmReadout *readout, int minCols, int minRows,

trunk/psModules/src/camera/pmReadoutStack.h

@@ -4 +4 @@
 #include "pmHDU.h"
 #include "pmFPA.h"
+
+#define PM_READOUT_STACK_ANALYSIS_COUNT "STACK.COUNT" // Name for count image in analysis metadata
+#define PM_READOUT_STACK_ANALYSIS_SIGMA "STACK.SIGMA" // Name for sigma image in analysis metadata
 
 /// Update an output readout (for a stack) with the correct col0,row0 and the image size
@@ -21 +24 @@
     );
 
+/// Return an image from analysis metadata, produced while stacking
+psImage *pmReadoutAnalysisImage(pmReadout *readout, // Readout containing image
+                                const char *name, // Name of image in analysis metadata
+                                int numCols, int numRows, // Expected size of image
+                                psElemType type, // Expected type of image
+                                double init // Initial value
+    );
 
 #endif