Changeset 30118 for branches/czw_branch/20101203/ppSub/src/ppSubMakePSF.c

Timestamp:

Dec 20, 2010, 2:30:45 PM (16 years ago)

Author:

watersc1

Message:

Attempting to bring branch in sync with trunk

Location:

branches/czw_branch/20101203

Files:

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

branches/czw_branch/20101203/ppSub/src/ppSubMakePSF.c

@@ -35 +35 @@
 
     psTimerStart("PPSUB_PHOT");
-
-    psMetadata *recipe = psMetadataLookupMetadata(NULL, config->recipes, PPSUB_RECIPE); // Recipe for ppSub
-    psAssert(recipe, "We checked this earlier, so it should be here.");
-
-    if (!psMetadataLookupBool(NULL, recipe, "PHOTOMETRY")) {
-        return true;
-    }
 
     bool reverse = psMetadataLookupBool(NULL, config->arguments, "REVERSE"); // Reverse sense of subtraction?
@@ -93 +86 @@
     // use flags to toss totally bogus entries?
     psArray *goodSources = ppSubSelectPSFSources (sources);
-    if (!psphotReadoutFindPSF(config, view, goodSources)) {
+    if (!psphotReadoutFindPSF(config, view, "PSPHOT.INPUT", goodSources)) {
         // This is likely a data quality issue
         // XXX Split into multiple cases using error codes?