Changeset 30101 for branches/eam_branches/ipp-20101205/psphot/src/psphotStackParseCamera.c

Timestamp:

Dec 17, 2010, 9:57:34 AM (16 years ago)

Author:

eugene

Message:

various modifications to psphotStack: add needed metadata to header; enable multiple PSF-matched images; work to speed up radial aperture photometry; radialAper is now an array (one element per PSF size); better feedback on extended fit skips; clarify processing: main analysis is on the input images (raw or convolved) while radial apertures is on the psf-matched images

File:

• branches/eam_branches/ipp-20101205/psphot/src/psphotStackParseCamera.c (modified) (5 diffs)

branches/eam_branches/ipp-20101205/psphot/src/psphotStackParseCamera.c

@@ -15 +15 @@
     }
 
+    int nRaw = 0;
+    int nCnv = 0;
     int nInputs = inputs->list->n;
     for (int i = 0; i < nInputs; i++) {
@@ -57 +59 @@
                 }
             }
+            nRaw ++;
         }
 
@@ -88 +91 @@
                 }
             }
+            nCnv ++;
         }
 
@@ -93 +97 @@
             psError(PSPHOT_ERR_CONFIG, true, "Component %s (%d) lacks both RAW:IMAGE and CNV:IMAGE of type STR", item->name, i);
             return false;
+        }
+
+        // XXX what if they do not match in length
+        if (nCnv && nRaw) {
+            if (nCnv != nRaw) {
+                psError (PSPHOT_ERR_CONFIG, true, "if both RAW and CNV images are supplied, the number must match");
+                return false;
+            }
         }
 
@@ -150 +162 @@
     }
     psMetadataRemoveKey(config->arguments, "FILENAMES");
+    psMetadataAddS32 (config->arguments, PS_LIST_TAIL, "PSPHOT.STACK.INPUT.RAW.NUM", PS_META_REPLACE, "number of inputs", nRaw);
+    psMetadataAddS32 (config->arguments, PS_LIST_TAIL, "PSPHOT.STACK.INPUT.CNV.NUM", PS_META_REPLACE, "number of inputs", nCnv);
+    psMetadataAddS32 (config->arguments, PS_LIST_TAIL, "PSPHOT.STACK.OUTPUT.IMAGE.NUM", PS_META_REPLACE, "number of inputs", nInputs);
     psMetadataAddS32 (config->arguments, PS_LIST_TAIL, "PSPHOT.INPUT.NUM", PS_META_REPLACE, "number of inputs", nInputs);