Changeset 42270

Timestamp:

Aug 26, 2022, 9:56:48 AM (4 years ago)

Author:

eugene

Message:

add an log message to note that the KH correction is being applied; convert endtime string to same time type as exposure time; add config option to apply proper motion correction

Location:

tags/ipp-ops-20220705-ippref/psastro/src

Files:

• psastroConvert.c (modified) (1 diff)
• psastroDefineFiles.c (modified) (1 diff)
• psastroLoadRefstars.c (modified) (1 diff)

tags/ipp-ops-20220705-ippref/psastro/src/psastroConvert.c

@@ -509 +509 @@
   float myPltScale = fabs(pltScale[chipID]);
 
+  psLogMsg ("psastro.correctKH", PS_LOG_INFO, "applying KH correction to %s (%d)\n", chipName, chipID);
+
   // apply the correction to the detections
   for (int i = 0; i < inStars->n; i++) {

tags/ipp-ops-20220705-ippref/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");

tags/ipp-ops-20220705-ippref/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);