Changeset 36837 for trunk/psastro/src/psastroDataLoad.c

Timestamp:

Jun 8, 2014, 9:27:56 AM (12 years ago)

Author:

eugene

Message:

merge changes from eam_branches/ipp-20140423: add Koppehoefer correction; make sure psastro failures are noted clearl in the output header; do not load the model if we choose skipastro

File:

• trunk/psastro/src/psastroDataLoad.c (modified) (2 diffs)

trunk/psastro/src/psastroDataLoad.c

@@ -53 +53 @@
     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);
 
@@ -73 +79 @@
                 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;