Changeset 16170 for trunk/ippTools/src/flatcorrConfig.c

Timestamp:

Jan 20, 2008, 3:48:37 PM (18 years ago)

Author:

eugene

Message:

merging changes from JHs end_stage branch (new end_stage field and related features; substantial cleanup via macros)

File:

• trunk/ippTools/src/flatcorrConfig.c (modified) (3 diffs)

trunk/ippTools/src/flatcorrConfig.c

@@ -43 +43 @@
     }
 
-    psTime *time = psTimeGetNow(PS_TIME_TAI);
-    psString now = psTimeToISO(time);
-    psFree(time);
+    psTime *now = psTimeGetNow(PS_TIME_TAI);
 
     // -newrun
@@ -58 +56 @@
     psMetadataAddStr(newrunArgs, PS_LIST_TAIL, "-telescope",  0,
             "search for telescope", NULL);
-    psMetadataAddStr(newrunArgs, PS_LIST_TAIL, "-dateobs_begin", 0,   
+    psMetadataAddTime(newrunArgs, PS_LIST_TAIL, "-dateobs_begin", 0,   
             "search for exposures by time (>=)", NULL);
-    psMetadataAddStr(newrunArgs, PS_LIST_TAIL, "-dateobs_end", 0,
+    psMetadataAddTime(newrunArgs, PS_LIST_TAIL, "-dateobs_end", 0,
             "search for exposures by time (<)", NULL);
     psMetadataAddStr(newrunArgs, PS_LIST_TAIL, "-exp_tag",  0,
@@ -165 +163 @@
     psMetadata *modes = psMetadataAlloc();
 
-    PXTOOL_ADD_MODE("-newrun",  "start a new flat correction run",
+    PXOPT_ADD_MODE("-newrun",  "start a new flat correction run",
         FLATCORR_MODE_NEWRUN,       newrunArgs);
-    PXTOOL_ADD_MODE("-pending", "show flat correction runs needing to be processed",
+    PXOPT_ADD_MODE("-pending", "show flat correction runs needing to be processed",
         FLATCORR_MODE_PENDING,      pendingArgs);
-    PXTOOL_ADD_MODE("-flatcorrimfile", "list all the exposures in flat correction runs",
+    PXOPT_ADD_MODE("-flatcorrimfile", "list all the exposures in flat correction runs",
         FLATCORR_MODE_FLATCORRIMFILE, flatcorrimfileArgs);
-    PXTOOL_ADD_MODE("-done",  "change a flat calibration run's state",
+    PXOPT_ADD_MODE("-done",  "change a flat calibration run's state",
         FLATCORR_MODE_DONE,         doneArgs);