Changeset 33415 for branches/meh_branches/ppstack_test/psphot/src/psphotStackImageLoop.c

Timestamp:

Mar 5, 2012, 5:19:48 PM (14 years ago)

Author:

mhuber

Message:

merging latest r33407 trunk changes to meh_branches/ppstack_test

Location:

branches/meh_branches/ppstack_test

Files:

• . (modified) (1 prop)
• psphot (modified) (1 prop)
• psphot/src (modified) (2 props)
• psphot/src/psphotStackImageLoop.c (modified) (5 diffs, 1 prop)

branches/meh_branches/ppstack_test/psphot/src

@@ -22 +22 @@
 psphotMakePSF
 psphotStack
+psphotModelTest

@@ -22 +22 @@
 psphotMakePSF
 psphotStack
+psphotModelTest

branches/meh_branches/ppstack_test/psphot/src/psphotStackImageLoop.c

@@ -10 +10 @@
 bool UpdateHeadersForFPA (pmConfig *config, pmFPAview *view);
 bool UpdateHeadersForChip (pmConfig *config, pmFPAview *view);
+bool UpdateHeadersForReadout (pmConfig *config, pmFPAview *view);
 
 bool psphotStackImageLoop (pmConfig *config) {
@@ -52 +53 @@
                 psMemDump("load");
 
-                // PSF matching
+                // Generate the 1st PSF-matched image set (larger target PSFs are generated by smoothing this image)
                 if (!psphotStackMatchPSFs (config, view)) {
                     psError(psErrorCodeLast(), false, "failure in psphotStackMatchPSFs for chip %d, cell %d, readout %d\n", view->chip, view->cell, view->readout);
@@ -66 +67 @@
                     return false;
                 }
+
+                UpdateHeadersForReadout(config, view);
+
                 psMemDump("psphot");
             }
@@ -101 +105 @@
 }
 
+bool UpdateHeadersForReadout (pmConfig *config, pmFPAview *view) {
+
+    psMetadata *recipe = psMetadataLookupPtr (NULL, config->recipes, PSPHOT_RECIPE);
+    bool useRaw = psMetadataLookupBool (NULL, recipe, "PSPHOT.STACK.USE.RAW");
+
+    int num = psphotFileruleCount(config, "PSPHOT.INPUT");
+
+    // loop over the available readouts
+    for (int i = 0; i < num; i++) {
+
+        // find the currently selected readout
+        pmFPAfile *output = pmFPAfileSelectSingle(config->files, "PSPHOT.STACK.OUTPUT.IMAGE", i); // File of interest
+        psAssert (output, "missing file?");
+
+        pmFPAfile *inputRaw = pmFPAfileSelectSingle(config->files, "PSPHOT.STACK.INPUT.RAW", i); // File of interest
+        pmFPAfile *inputCnv = pmFPAfileSelectSingle(config->files, "PSPHOT.STACK.INPUT.CNV", i); // File of interest
+        pmFPAfile *input = useRaw ? inputRaw : inputCnv;
+        psAssert (input, "missing input file");
+
+        // just copy the input headers to the output headers, then update version info
+        pmReadout *inReadout = pmFPAviewThisReadout(view, input->fpa); ///< Chip in the input
+        pmReadout *outReadout = pmFPAviewThisReadout(view, output->fpa); ///< Chip in the output
+
+        psMetadata *header = psMetadataLookupPtr (NULL, inReadout->analysis, "PSPHOT.HEADER");
+        psMetadataAdd (outReadout->analysis, PS_LIST_TAIL, "PSPHOT.HEADER",  PS_DATA_METADATA, "header stats", header);
+    }
+    return true;
+}
+
 bool UpdateHeadersForChip (pmConfig *config, pmFPAview *view) {
 
@@ -131 +164 @@
             outHDU->header = psMetadataCopy(NULL, inHDU->header);
         }
+        psphotVersionHeaderFull(outHDU->header);
         outChip->toFPA = psMemIncrRefCounter(inChip->toFPA);
         outChip->fromFPA = psMemIncrRefCounter(inChip->fromFPA);

@@ -22 +22 @@
 psphotMakePSF
 psphotStack
+psphotModelTest