Changeset 36825

Timestamp:

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

Author:

eugene

Message:

fixes for Koppenhoefer correction

Location:

branches/eam_branches/ipp-20140423/psastro/src

Files:

• psastroArguments.c (modified) (1 diff)
• psastroConvert.c (modified) (1 diff)
• psastroDataLoad.c (modified) (2 diffs)
• psastroDefineFiles.c (modified) (1 diff)

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

@@ -111 +111 @@
         }
         psMetadataAddBool (config->arguments, PS_LIST_TAIL, "PSASTRO.SKIP.ASTRO", PS_META_REPLACE, "", true);
+
+        // SKIP.ASTRO and USE.MODEL are fundamentally incompatible
+        psMetadataAddBool (config->arguments, PS_LIST_TAIL, "PSASTRO.USE.MODEL", PS_META_REPLACE, "", false);
     }
 

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

@@ -451 +451 @@
     float Xfix = Xraw + dX / myPltScale;
 
+    // note that we carry around pix, cell, chip but the real analysis only operates on chip
+    // if in the future we add transformations between chip->cell->pix, then we will need to
+    // make these consistent as well.
     obj->pix->x = Xfix;
+    obj->cell->x = Xfix;
+    obj->chip->x = Xfix;
   }
 

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);

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

@@ -72 +72 @@
             psLogMsg ("psastro", PS_LOG_INFO, "Koppenhoefer correction requested, exposure in valid date range, correction may be applied");
         }   
+        psFree (endtime);
     }
     if (KHapply) {