Changeset 34247 for branches/eam_branches/ipp-20120627/psphot/src/psphotStackMatchPSFsNext.c

Timestamp:

Jul 31, 2012, 11:50:18 AM (14 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20120627/psphot

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/psphotStackMatchPSFsNext.c (modified) (2 diffs)

branches/eam_branches/ipp-20120627/psphot/src/psphotStackMatchPSFsNext.c

@@ -7 +7 @@
     int nRadialEntries = 0;
 
-    // find the currently selected readout
-    pmFPAfile *file = pmFPAfileSelectSingle(config->files, filerule, 0); // File of interest
-    psAssert (file, "missing file?");
+    // find the numer of fwhmValues in the first non-skipped input
+    int num = psphotFileruleCount(config, filerule);
+    for (int i=0; i<num; i++) {
+        pmFPAfile *file = pmFPAfileSelectSingle(config->files, filerule, i); // File of interest
+        psAssert (file, "missing file?");
     
-    pmReadout *readout = pmFPAviewThisReadout(view, file->fpa);
-    psAssert (readout, "missing readout?");
-    
-    bool status = false;
-    psVector *fwhmValues = psMetadataLookupVector(&status, readout->analysis, "STACK.PSF.FWHM.VALUES");
-    if (!fwhmValues) {
-        return 1;
+        pmReadout *readout = pmFPAviewThisReadout(view, file->fpa);
+        psAssert (readout, "missing readout?");
+        bool status = false;
+        if (!psMetadataLookupBool (&status, readout->analysis, "PSPHOT.SKIP.INPUT")) {
+            psVector *fwhmValues = psMetadataLookupVector(&status, readout->analysis, "STACK.PSF.FWHM.VALUES");
+            if (fwhmValues) {
+                nRadialEntries = fwhmValues->n;
+            } else {
+                nRadialEntries = 1;
+            }
+            break;
+        }
     }
-    
-    nRadialEntries = fwhmValues->n;
     return nRadialEntries;
 }
@@ -60 +65 @@
     pmReadout *readout = pmFPAviewThisReadout(view, file->fpa);
     psAssert (readout, "missing readout?");
+
+    if (psMetadataLookupBool (&status, readout->analysis, "PSPHOT.SKIP.INPUT")) {
+        psLogMsg("psphot", PS_LOG_INFO, "skipping smooth %d to next psf", index);
+        return true;
+    }
 
     psLogMsg("psphot", PS_LOG_INFO, "smooth %d to next psf", index);