Changeset 31160 for trunk/Ohana/src/uniphot/src/uniphot.c

Timestamp:

Apr 4, 2011, 1:19:27 PM (15 years ago)

Author:

eugene

Message:

updates from eam branch

File:

• trunk/Ohana/src/uniphot/src/uniphot.c (modified) (5 diffs)

trunk/Ohana/src/uniphot/src/uniphot.c

@@ -1 +1 @@
 # include "uniphot.h"
+
+static char *timeref  = "2000/01/01,00:00:00";
+static char *timeunit = "days";
 
 int main (int argc, char **argv) {
@@ -8 +11 @@
   FITS_DB db;
 
+  // set up time format stuff
+  time_t TimeReference = GetTimeReference (timeref);
+  int TimeUnits = GetTimeUnits (timeunit);
+
   /* get configuration info, args, lockfile */
   initialize_uniphot (argc, argv);
@@ -15 +22 @@
   if (!status) Shutdown ("ERROR: failure to lock image catalog %s", db.filename);
   if (db.dbstate == LCK_EMPTY) Shutdown ("ERROR: No images in catalog %s (1)", db.filename);
-  if (!UPDATE) dvo_image_unlock (&db); 
 
   /* load images */
   load_images_uniphot (&db);
+  if (!UPDATE) dvo_image_unlock (&db); 
   
   /* filter image list by selection */
@@ -38 +45 @@
   fprintf (stdout, "# NLOOP: %d\n", NLOOP);
   fprintf (stdout, "# time groups : %d\n", Ntgroup);
+  fprintf (stdout, "# TIMEREF : %s\n", timeref);
+  fprintf (stdout, "# TIMEFORMAT : %s\n", timeunit);
   for (i = 0; i < Ntgroup; i++) {
-    fprintf (stdout, "%s %5d %5d %7.4f  %7.4f %7.4f\n", tgroup[i].label, 
-             tgroup[i].Nimage, tgroup[i].Ngood, 0.001*tgroup[i].M, 0.001*tgroup[i].dM, 0.001*tgroup[i].dMsub);
+
+    double tstart = NAN;
+    double tstop = NAN;
+
+    time_t time;
+    if (ohana_str_to_time (tgroup[i].tstart, &time)) { 
+      tstart = TimeValue (time, TimeReference, TimeUnits);
+    }
+    if (ohana_str_to_time (tgroup[i].tstop, &time)) { 
+      tstop = TimeValue (time, TimeReference, TimeUnits);
+    }
+
+    fprintf (stdout, "%s : %12.6f %12.6f : %5d %5d %7.4f  %7.4f %7.4f\n", 
+             tgroup[i].label, tstart, tstop,
+             tgroup[i].Nimage, tgroup[i].Ngood, 
+             tgroup[i].M, tgroup[i].dM, tgroup[i].dMsub);
   }
   fprintf (stdout, "\n");
@@ -47 +70 @@
   for (i = 0; i < Nsgroup; i++) {
     fprintf (stdout, "%s %5d %5d %7.4f  %7.4f %7.4f\n", sgroup[i].label, 
-             sgroup[i].Nimage, sgroup[i].Ngood, 0.001*sgroup[i].M, 0.001*sgroup[i].dM, 0.001*sgroup[i].dMsub);
+             sgroup[i].Nimage, sgroup[i].Ngood, sgroup[i].M, sgroup[i].dM, sgroup[i].dMsub);
   }
   if (!UPDATE) exit (0);