Changeset 35342 for branches/eam_branches/ipp-20130307/Ohana/src/opihi

Timestamp:

Apr 2, 2013, 1:55:12 PM (13 years ago)

Author:

eugene

Message:

clarify Xmosaic, Ymosaic; add Xfield, Yfield; do not launch remote dvo client for machines not needed

Location:

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

Files:

• dvo_host_utils.c (modified) (1 diff)
• mextract.c (modified) (1 diff)
• photometry.c (modified) (3 diffs)

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

@@ -199 +199 @@
 
     if (table->hosts[i].status) continue; 
+    if (!table->hosts[i].pid) continue;
 
     if (ReadVectors) {

branches/eam_branches/ipp-20130307/Ohana/src/opihi/dvo/mextract.c

@@ -16 +16 @@
     if (field->ID == MEAS_CENTER_OFFSET)  return TRUE; // 0.5*NX, 0.5*NY
     if (field->ID == MEAS_EXPNAME_AS_INT) return TRUE; // expname (or as int)
-    if (field->ID == MEAS_AIRMASS)        return TRUE; // airmass
+    if (field->ID == MEAS_MEAN_AIRMASS)   return TRUE; // airmass
     return FALSE;
 }

branches/eam_branches/ipp-20130307/Ohana/src/opihi/dvo/photometry.c

@@ -1127 +1127 @@
   double value;
   Image *image;
-  Coords *mosaic;
+  // Coords *mosaic;
 
   value = 0;
@@ -1193 +1193 @@
 # endif
       break;
+# if 0
     case MEAS_XMOSAIC: /* OK */
       ra  = average[0].R - measure[0].dR / 3600.0;
       dec = average[0].D - measure[0].dD / 3600.0;
-      mosaic = MatchMosaic (measure[0].t, measure[0].photcode);
+      mosaic = MatchMosaic (measure[0].t, measure[0].photcode); // XXX not used anymore
       if (mosaic == NULL) break;
       RD_to_XY (&x, &y, ra, dec, mosaic);
@@ -1204 +1205 @@
       ra  = average[0].R - measure[0].dR / 3600.0;
       dec = average[0].D - measure[0].dD / 3600.0;
-      mosaic = MatchMosaic (measure[0].t, measure[0].photcode);
+      mosaic = MatchMosaic (measure[0].t, measure[0].photcode); // XXX not used anymore
       if (mosaic == NULL) break;
       RD_to_XY (&x, &y, ra, dec, mosaic);
       value = y;
       break;
+# endif
   }
   return (value);