Changeset 34887

Timestamp:

Jan 7, 2013, 3:23:47 PM (14 years ago)

Author:

eugene

Message:

save result file names in shell-accessible variables; add ubercal dist to full outputs

Location:

branches/eam_branches/ipp-20121219/Ohana/src/opihi/dvo

Files:

• dvo_host_utils.c (modified) (1 diff)
• gstar.c (modified) (3 diffs)

branches/eam_branches/ipp-20121219/Ohana/src/opihi/dvo/dvo_host_utils.c

@@ -330 +330 @@
   set_int_variable (name, table->Nhosts);
 
+  char results[DVO_MAX_PATH];
+
   // load fields from file
   for (i = 0; i < table->Nhosts; i++) {
 
+    // need to save the results filename with the uniquer
+    snprintf (results, DVO_MAX_PATH, "%s/dvo.results.%s.fits", table->hosts[i].pathname, uniquer);
+
     snprintf (name, 256, "RESULT_FILE:%d", i);
-    set_str_variable (name, table->hosts[i].results);
+    set_str_variable (name, results);
 
     // DATA : 0 (unread), 1 (read)

branches/eam_branches/ipp-20121219/Ohana/src/opihi/dvo/gstar.c

@@ -7 +7 @@
   GSTAR_FILTER_NAMES,
   GSTAR_SECF_FLAGS,
+  GSTAR_UCDIST,
   GSTAR_AVE_AP_MAG,
   GSTAR_AVE_MAG_20,
@@ -273 +274 @@
           /* M_80 */
           for (j = 0; j < Nsecfilt; j++) printPhotcodeSequence (&catalog.average[k], &catalog.secfilt[Nsecfilt*k], j, GSTAR_AVE_MAG_80);;
+          gprint (GP_LOG, "\n");
+
+          /* UCDIST */
+          for (j = 0; j < Nsecfilt; j++) printPhotcodeSequence (&catalog.average[k], &catalog.secfilt[Nsecfilt*k], j, GSTAR_UCDIST);;
           gprint (GP_LOG, "\n");
 
@@ -495 +500 @@
       break;
 
+    case GSTAR_UCDIST: /* ubercal distance */
+      if (seq == -1) {
+        gprint (GP_LOG, "%5d ", 0);
+      } else {
+        gprint (GP_LOG, "%5d ", secfilt[seq].ubercalDist);
+      }
+      break;
+
     case GSTAR_AVE_AP_MAG: /* average ap mags */
       if (seq == -1) {