Changeset 10294

Timestamp:

Nov 29, 2006, 1:25:46 PM (19 years ago)

Author:

Paul Price

Message:

Adding functions to add version information.

Location:

trunk

Files:

• ppImage/src/Makefile.am (modified) (3 diffs)
• ppImage/src/ppImageLoop.c (modified) (3 diffs)
• ppImage/src/ppImageVersion.c (added)
• ppImage/src/ppImageVersion.h (added)
• ppMerge/src/Makefile.am (modified) (2 diffs)
• ppMerge/src/ppMergeCombine.c (modified) (3 diffs)
• ppMerge/src/ppMergeVersion.c (added)
• ppMerge/src/ppMergeVersion.h (added)

trunk/ppImage/src/Makefile.am

@@ -5 +5 @@
         ppImageOptions.h \
         ppImageDetrendFringe.h \
+        ppImageVersion.h \
         ppMem.h
 
@@ -24 +25 @@
         ppImagePhotom.c \
         ppImageAstrom.c \
-        ppImageAddstar.c
+        ppImageAddstar.c \
+        ppImageVersion.c
 
 ppFocus_CPPFLAGS = $(PSLIB_CFLAGS) $(PSMODULE_CFLAGS) $(PSPHOT_CFLAGS) $(PSASTRO_CFLAGS) $(PPSTATS_CFLAGS) $(ppImage_CFLAGS)
@@ -45 +47 @@
         ppImagePhotom.c \
         ppImageAstrom.c \
-        ppImageAddstar.c
+        ppImageAddstar.c \
+        ppImageVersion.c
 
 ppTest_CPPFLAGS = $(PSLIB_CFLAGS) $(PSMODULE_CFLAGS) $(ppImage_CFLAGS)

trunk/ppImage/src/ppImageLoop.c

@@ -6 +6 @@
 #include "ppImage.h"
 #include "ppImageDetrendFringe.h"
+#include "ppImageVersion.h"
 
 
@@ -36 +37 @@
     }
 
-    pmFPAview *view = pmFPAviewAlloc(0);
+    pmFPAview *view = pmFPAviewAlloc(0);// View for level of interest
+    pmHDU *lastHDU = NULL;              // Last HDU that was updated
 
     // files associated with the science image
@@ -61 +63 @@
                 return false;
             }
+
+            // Put version information into the header
+            pmHDU *hdu = pmHDUFromCell(cell);
+            if (!hdu) {
+                psError(PS_ERR_UNEXPECTED_NULL, false, "Unable to find HDU for cell (%d,%d)!\n",
+                        view->chip, view->cell);
+                return false;
+            }
+            if (hdu != lastHDU) {
+                ppImageVersionMetadata(hdu->header);
+                lastHDU = hdu;
+            }
+
 
             // process each of the readouts

trunk/ppMerge/src/Makefile.am

@@ -12 +12 @@
         ppMergeMask.c           \
         ppMergeOptions.c        \
-        ppMergeScaleZero.c
+        ppMergeScaleZero.c      \
+        ppMergeVersion.c
 
 
@@ -23 +24 @@
         ppMergeMask.h           \
         ppMergeOptions.h        \
-        ppMergeScaleZero.h
+        ppMergeScaleZero.h      \
+        ppMergeVersion.h
 
 CLEANFILES = *~

trunk/ppMerge/src/ppMergeCombine.c

@@ -14 +14 @@
 #include "ppMergeData.h"
 #include "ppMergeCombine.h"
+#include "ppMergeVersion.h"
 
 #if 0
@@ -107 +108 @@
     pmChip *chip;                       // Chip of interest
     psRandom *rng = NULL;               // Random number generator; required for building a mask
+    pmHDU *lastHDU = NULL;              // Last HDU to be updated
     if (options->mask) {
         rng = psRandomAlloc(PS_RANDOM_TAUS, 0);
@@ -130 +132 @@
             int numRead;  // Number of inputs read
             int numScan = 0;
+
+            // Put version metadata into header
+            pmHDU *hdu = pmHDUFromCell(cell);
+            if (!hdu) {
+                psError(PS_ERR_UNEXPECTED_NULL, true, "Unable to find HDU for chip %d cell %d.\n",
+                        view->chip, view->cell);
+                return false;
+            }
+            if (hdu != lastHDU) {
+                ppMergeVersionMetadata(hdu->header);
+                lastHDU = hdu;
+            }
+
 
             do {