Changeset 30624 for trunk/psphot/src/psphotStackParseCamera.c

Timestamp:

Feb 13, 2011, 12:33:05 PM (15 years ago)

Author:

eugene

Message:

adding some of the metadata needed by PSPS to output headers; skip models with few valid pixels (eg, only the edge is showing); only do the linear fit on pixels within the fit radius; modify psf-match auto-scaling process; enable multiple target psfs for matched-psf aperture photometry; speed up analysis of the radial apertures

Location:

trunk/psphot

Files:

• . (modified) (1 prop)
• src/psphotStackParseCamera.c (modified) (6 diffs)

trunk/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 ++;
         }
 
@@ -95 +99 @@
         }
 
+        // 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;
+            }
+        }
+
         psString sources = psMetadataLookupStr(&status, input, "SOURCES"); // Name of mask
-        // pmFPAfile *srcInputFile = rawInputFile ? rawInputFile : cnvInputFile;
         if (sources && strlen(sources) > 0) {
             if (!defineFile(config, NULL, "PSPHOT.STACK.SOURCES", sources, PM_FPA_FILE_CMF)) {
@@ -107 +118 @@
         // XXX output of these files should be optional
         {
+            // pmFPAfile *srcInputFile = rawInputFile ? rawInputFile : cnvInputFile;
             pmFPAfile *outputImage = pmFPAfileDefineOutput(config, NULL, "PSPHOT.STACK.OUTPUT.IMAGE");
             if (!outputImage) {
@@ -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);