Changeset 36825 for branches/eam_branches/ipp-20140423/psastro/src/psastroDataLoad.c

Timestamp:

Jun 6, 2014, 8:30:29 PM (12 years ago)

Author:

eugene

Message:

fixes for Koppenhoefer correction

File:

• branches/eam_branches/ipp-20140423/psastro/src/psastroDataLoad.c (modified) (2 diffs)

branches/eam_branches/ipp-20140423/psastro/src/psastroDataLoad.c

@@ -42 +42 @@
     }
 
-    // apply Koppenhoeffer correction to this exposure?
-    bool applyKH = psMetadataLookupBool (NULL, recipe, "KH.CORRECT.APPLY.EXP");
-    if (applyKH) {
-        // make sure the KH correction file is loaded.  de-activate all files except PSASTRO.KH.CORRECT
-        pmFPAfileActivate (config->files, false, NULL);
-        pmFPAfileActivate (config->files, true, "PSASTRO.KH.CORRECT");
-
-        pmFPAview *viewKH = pmFPAviewAlloc (0);
-
-        // files associated with the science image
-        if (!pmFPAfileIOChecks (config, viewKH, PM_FPA_BEFORE)) {
-            psError (PS_ERR_IO, false, "Can't load the Koppenhoeffer Correction file");
-            return false;
-        }
-        psFree (viewKH);
-    }
-
     // select the input data sources
     pmFPAfile *input = psMetadataLookupPtr (NULL, config->files, "PSASTRO.INPUT");
@@ -69 +52 @@
     pmFPAfileActivate (config->files, false, NULL);
     pmFPAfileActivate (config->files, true, "PSASTRO.INPUT");
+
+    // if we request KH Correction, activate that file as well
+    bool applyKH = psMetadataLookupBool (NULL, recipe, "KH.CORRECT.APPLY.EXP");
+    if (applyKH) {
+        pmFPAfileActivate (config->files, true, "PSASTRO.KH.CORRECT");
+    }
 
     pmFPAview *view = pmFPAviewAlloc (0);