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

Timestamp:

Jun 5, 2014, 4:06:26 PM (12 years ago)

Author:

eugene

Message:

add Koppenhoefer correction to psastro

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");
@@ -73 +90 @@
                 if (!readout->data_exists) { continue; }
 
-                if (!psastroConvertReadout (readout, recipe)) ESCAPE;
+                if (!psastroConvertReadout (config, view, readout, recipe)) ESCAPE;
 
                 if (!pmFPAfileIOChecks (config, view, PM_FPA_AFTER)) ESCAPE;