Changeset 14275 for trunk/ppStack/src/ppStackReadout.c

Timestamp:

Jul 17, 2007, 1:53:35 PM (19 years ago)

Author:

Paul Price

Message:

Using weight maps in ppStack.

File:

• trunk/ppStack/src/ppStackReadout.c (modified) (5 diffs)

trunk/ppStack/src/ppStackReadout.c

@@ -45 +45 @@
 
         float seeing = psMetadataLookupF32(NULL, inputFile->fpa->analysis, "PPSTACK.SEEING"); // Seeing FWHM
-        float weight = psMetadataLookupF32(NULL, inputFile->fpa->analysis, "PPSTACK.WEIGHT"); // Rel. weight
+        float weighting = psMetadataLookupF32(NULL, inputFile->fpa->analysis,
+                                              "PPSTACK.WEIGHTING"); // Relative weighting
         float scale = psMetadataLookupF32(NULL, inputFile->fpa->analysis, "PPSTACK.SCALE"); // Rel. scale
 
@@ -77 +78 @@
         totExposure += exposure;        // Total exposure time
         (void)psBinaryOp(ro->image, ro->image, "/", psScalarAlloc(exposure, PS_TYPE_F32));
-        pmStackData *data = pmStackDataAlloc(ro, seeing, weight); // Data to stack
+        if (ro->weight) {
+            (void)psBinaryOp(ro->weight, ro->weight, "/", psScalarAlloc(exposure, PS_TYPE_F32));
+        }
+        pmStackData *data = pmStackDataAlloc(ro, seeing, weighting); // Data to stack
         psArrayAdd(stack, ARRAY_BUFFER, data);
         psFree(data);                   // Drop reference
@@ -100 +104 @@
     }
 
-#if 1
+#ifdef INSPECTION_FILES
     {
         psFits *fits = psFitsOpen("combined.fits", "w");
@@ -131 +135 @@
     }
 
-#if 1
+#ifdef REJECTION_FILES
     for (int i = 0; i < num; i++) {
         pmStackData *data = stack->data[i]; // Data for this image
@@ -157 +161 @@
     // Restore image to counts using the total exposure time
     (void)psBinaryOp(outRO->image, outRO->image, "*", psScalarAlloc(totExposure, PS_TYPE_F32));
+    if (outRO->weight) {
+        (void)psBinaryOp(outRO->weight, outRO->weight, "*", psScalarAlloc(totExposure, PS_TYPE_F32));
+    }
     psMetadataAddF32(outRO->parent->concepts, PS_LIST_TAIL, "CELL.EXPOSURE", PS_META_REPLACE,
                      "Summed exposure time (sec)", totExposure);