Changeset 21092

Timestamp:

Jan 8, 2009, 2:01:33 PM (17 years ago)

Author:

Paul Price

Message:

Attempt to fix exposure time in output: ppStackSourcesTransparency now returns the total exposure time (since it calculates it, and corrects all the photometry to correspond to that exposure time), and ppStackLoop applies it to the output.

Location:

trunk/ppStack/src

Files:

• ppStack.h (modified) (1 diff)
• ppStackLoop.c (modified) (7 diffs)
• ppStackSources.c (modified) (8 diffs)

trunk/ppStack/src/ppStack.h

@@ -154 +154 @@
 /// Calculate transparency differences between images
 ///
-/// Corrects the source PSF photometry to a common system
-bool ppStackSourcesTransparency(const psArray *sourceLists, // Sources for each input
-                                const pmFPAview *view, // View to readout
-                                const pmConfig *config // Configuration
+/// Corrects the source PSF photometry to a common system.  Return the sum of the exposure times.
+float ppStackSourcesTransparency(const psArray *sourceLists, // Sources for each input
+                                 const pmFPAview *view, // View to readout
+                                 const pmConfig *config // Configuration
     );
 

trunk/ppStack/src/ppStackLoop.c

@@ -254 +254 @@
     psArray *sourceLists = psArrayAlloc(num); // Individual lists of sources for matching
     pmPSF *targetPSF = NULL;            // Target PSF
+    float sumExposure = NAN;            // Sum of exposure times
     if (psMetadataLookupBool(NULL, config->arguments, "HAVE.PSF")) {
         pmFPAfileActivate(config->files, false, NULL);
@@ -348 +349 @@
 
         // Zero point calibration
-        if (!ppStackSourcesTransparency(sourceLists, view, config)) {
+        sumExposure = ppStackSourcesTransparency(sourceLists, view, config);
+        if (!isfinite(sumExposure) || sumExposure <= 0) {
             psError(PS_ERR_UNKNOWN, false, "Unable to calculate transparency differences");
             psFree(sourceLists);
@@ -407 +409 @@
     psVector *weightings = psVectorAlloc(num, PS_TYPE_F32); // Combination weightings for images (1/noise^2)
     psVectorInit(weightings, NAN);
+    psList *fpaList = psListAlloc(NULL); // List of input FPAs, for concept averaging
+    psList *cellList = psListAlloc(NULL); // List of input cells, for concept averaging
     for (int i = 0; i < num; i++) {
         psTrace("ppStack", 2, "Convolving input %d of %d to target PSF....\n", i, num);
@@ -475 +479 @@
         writeImage(weightNames->data[i], hdu->header, readout->weight, config);
 
-        cells->data[i] = psMemIncrRefCounter(readout->parent);
+        pmCell *inCell = readout->parent; // Input cell
+
+        psListAdd(cellList, PS_LIST_TAIL, inCell);
+        psListAdd(fpaList, PS_LIST_TAIL, inCell->parent->parent);
+
+        cells->data[i] = psMemIncrRefCounter(inCell);
         if (!filesIterateUp(config)) {
             return false;
@@ -496 +505 @@
         return false;
     }
+
+
+    // Update concepts for output
+    {
+        pmFPAview view;                 // View for output
+        view.chip = view.cell = view.readout = 0;
+        pmCell *outCell = pmFPAfileThisCell(config->files, &view, "PPSTACK.OUTPUT"); // Output cell
+        pmFPA *outFPA = outCell->parent->parent; // Output FPA
+        pmConceptsAverageFPAs(outFPA, fpaList);
+        pmConceptsAverageCells(outCell, cellList, NULL, NULL, true);
+        psFree(fpaList);
+        psFree(cellList);
+
+        // Update the value of a concept
+#define UPDATE_CONCEPT(SOURCE, NAME, VALUE) { \
+            psMetadataItem *item = psMetadataLookup(SOURCE->concepts, NAME); \
+            psAssert(item, "Concept should be present"); \
+            psAssert(item->type == PS_TYPE_F32, "Concept should be F32"); \
+            item->data.F32 = VALUE; \
+        }
+
+        UPDATE_CONCEPT(outFPA,  "FPA.EXPOSURE",  sumExposure);
+        UPDATE_CONCEPT(outCell, "CELL.EXPOSURE", sumExposure);
+        UPDATE_CONCEPT(outCell, "CELL.DARKTIME", NAN);
+    }
+
 
     // Reject images out-of-hand on the basis of their match chi^2
@@ -626 +661 @@
             return false;
         }
-
-        psList *fpaList = psListAlloc(NULL); // List of input FPAs, for concept averaging
-        psList *cellList = psListAlloc(NULL); // List of input cells, for concept averaging
-        for (int i = 0; i < num; i++) {
-            pmCell *inCell = cells->data[i]; // Input cell
-            if (!inCell) {
-                exptimes->data.F32[i] = 0.0;
-                continue;
-            }
-            exptimes->data.F32[i] = psMetadataLookupF32(NULL, inCell->concepts, "CELL.EXPOSURE");
-            psListAdd(cellList, PS_LIST_TAIL, inCell);
-            psListAdd(fpaList, PS_LIST_TAIL, inCell->parent->parent);
-        }
-
-        // Copy concepts
-        pmChip *outChip = outCell->parent;  // Output chip
-        pmFPA *outFPA = outChip->parent;    // Output FPA
-        pmConceptsAverageFPAs(outFPA, fpaList);
-        pmConceptsAverageCells(outCell, cellList, NULL, NULL, true);
-        psFree(fpaList);
-        psFree(cellList);
 
         psFree(cells);
@@ -977 +991 @@
     // Close up
     bool wcsDone = false;           // Have we done the WCS?
-    float totExposure = 0.0;            // Total exposure time
     for (int i = 0; i < num; i++) {
         if (inputMask->data.U8[i]) {
             continue;
         }
-        totExposure += exptimes->data.F32[i];
 
         ppStackThread *thread = stack->threads->data[0]; // Representative stack

trunk/ppStack/src/ppStackSources.c

@@ -10 +10 @@
 
 
-bool ppStackSourcesTransparency(const psArray *sourceLists, const pmFPAview *view, const pmConfig *config)
+float ppStackSourcesTransparency(const psArray *sourceLists, const pmFPAview *view, const pmConfig *config)
 {
-    PS_ASSERT_ARRAY_NON_NULL(sourceLists, false);
-    PS_ASSERT_PTR_NON_NULL(view, false);
-    PS_ASSERT_PTR_NON_NULL(config, false);
+    PS_ASSERT_ARRAY_NON_NULL(sourceLists, NAN);
+    PS_ASSERT_PTR_NON_NULL(view, NAN);
+    PS_ASSERT_PTR_NON_NULL(config, NAN);
 
 #ifdef TESTING
@@ -46 +46 @@
     if (!airmassZP) {
         psError(PS_ERR_UNKNOWN, false, "Unable to find ZP.AIRMASS in recipe.");
-        return false;
+        return NAN;
     }
 
@@ -69 +69 @@
                     exptime, airmass, expFilter);
             psFree(zp);
-            return false;
+            return NAN;
         }
 
@@ -79 +79 @@
                         "Unable to find airmass term (ZP.AIRMASS) for filter %s", filter);
                 psFree(zp);
-                return false;
+                return NAN;
             }
         } else if (strcmp(filter, expFilter) != 0) {
             psError(PS_ERR_BAD_PARAMETER_VALUE, false, "Filters don't match: %s vs %s", filter, expFilter);
             psFree(zp);
-            return false;
+            return NAN;
         }
 
@@ -95 +95 @@
         psError(PS_ERR_UNKNOWN, false, "Unable to match sources");
         psFree(zp);
-        return false;
+        return NAN;
     }
     psVector *trans = pmSourceMatchRelphot(matches, zp, iter, tol, starLimit, transIter, transRej,
@@ -128 +128 @@
     if (!trans) {
         psError(PS_ERR_UNKNOWN, false, "Unable to measure transparencies");
-        return false;
+        return NAN;
     }
 
@@ -158 +158 @@
             psError(PS_ERR_UNKNOWN, false, "Unable to match sources");
             psFree(zp);
-            return false;
+            return NAN;
         }
         psVector *trans = pmSourceMatchRelphot(matches, zp, iter, tol, starLimit, transIter, transRej,
@@ -165 +165 @@
     }
 #endif
-    return true;
+
+    return sumExpTime;
 }