Changeset 42627 for branches/eam_branches/ipp-20230313

Timestamp:

Feb 9, 2024, 3:56:03 PM (2 years ago)

Author:

eugene

Message:

merge changes from ipp-ops-202209096 : adding proper motion corrections

Location:

branches/eam_branches/ipp-20230313

Files:

• . (modified) (1 prop)
• ippconfig (modified) (1 prop)
• ippconfig/recipes/psastro.config (modified) (1 diff)
• psastro (modified) (1 prop)
• psastro/src/psastroDefineFiles.c (modified) (1 diff)
• psastro/src/psastroLoadRefstars.c (modified) (1 diff)

branches/eam_branches/ipp-20230313/ippconfig/recipes/psastro.config

@@ -256 +256 @@
 DVO.GETSTAR.MIN.MAG           F32      12.0
 DVO.GETSTAR.MIN.MAG.INST      F32     -15.0
+DVO.GETSTAR.PM.APPLY          BOOL    FALSE
 
 # if non-zero use as the zero point for computing magnitude limits for getstar

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

@@ -61 +61 @@
             return false;
         }
-        psTime *endtime = psTimeFromString (KHendDate, PS_TIME_TAI);
+        // psTime *endtime = psTimeFromString (KHendDate, PS_TIME_TAI);
+        // 'endtime' and 'time' must be in the same units 
+        psTime *endtime = psTimeFromString (KHendDate, time->type);
         if (!endtime) {
             psError (PM_ERR_CONFIG, false, "KH.CORRECT.APPLY requested, KH.CORRECT.ENDDATE has an invalid date/time");

branches/eam_branches/ipp-20230313/psastro/src/psastroLoadRefstars.c

@@ -139 +139 @@
     psStringAppend (&getstarCommand, " -region %f %f %f %f -o %s", RAmin, DECmin, RAmax, DECmax, tempFile);
     psTrace ("psastro", 3, "%s\n", getstarCommand);
+
+    // add the MJD for the exposure EPOCH
+    bool ProperMotionApply = psMetadataLookupF32 (&status, recipe, "DVO.GETSTAR.PM.APPLY");
+    if (ProperMotionApply) {
+      pmFPAfile *input = psMetadataLookupPtr (NULL, config->files, source); // we've already done this before
+      myAssert (input, "oops");
+
+      psTime *time = psMetadataLookupPtr(NULL, input->fpa->concepts, "FPA.TIME");
+      if (time->sec == 0 && time->nsec == 0) {
+        psError (PM_ERR_CONFIG, false, "Exposure EPOCH proper motion correction requested, but date/time of exposure not found");
+        return false;
+      }
+      psF64 EpochMJD = psTimeToMJD(time);
+      psStringAppend (&getstarCommand, " -epoch-mjd %lf", EpochMJD);
+    }
 
     psLogMsg("psastro", PS_LOG_INFO, "getstar command: %s", getstarCommand);