Changeset 32346 for trunk/Ohana/src/opihi

Timestamp:

Sep 6, 2011, 11:15:56 AM (15 years ago)

Author:

eugene

Message:

added concept of merging multiple objects into a single object in DVO / relastro; avoid memory-hogging duplication of the images array in relastro / relphot; enable parallax fitting; fix nan/inf bug in color points; add -no-return option to opihi/echo

Location:

trunk/Ohana/src/opihi

Files:

• cmd.basic/echo.c (modified) (2 diffs)
• cmd.data/plot.c (modified) (2 diffs)

trunk/Ohana/src/opihi/cmd.basic/echo.c

@@ -3 +3 @@
 int echo (int argc, char **argv) {
   
-  int i;
+  int i, N, RETURN_CHAR;
+
+  RETURN_CHAR = TRUE;
+  if ((N = get_argument (argc, argv, "-no-return"))) {
+    remove_argument (N, &argc, argv);
+    RETURN_CHAR = FALSE;
+  }
 
   for (i = 1; i < argc - 1; i++) {
@@ -9 +15 @@
   }
   if (argc >= 2) {
+    if (RETURN_CHAR) {
       gprint (GP_LOG, "%s\n", argv[argc - 1]);
+    } else {
+      gprint (GP_LOG, "%s", argv[argc - 1]);
+    }
   }
   return (TRUE);

trunk/Ohana/src/opihi/cmd.data/plot.c

@@ -53 +53 @@
     return (FALSE);
   }
+  if (dypvec && (dypvec->Nelements != xvec->Nelements)) goto mismatch;
+  if (dymvec && (dymvec->Nelements != xvec->Nelements)) goto mismatch;
+  if (dxpvec && (dxpvec->Nelements != xvec->Nelements)) goto mismatch;
+  if (dxmvec && (dxmvec->Nelements != xvec->Nelements)) goto mismatch;
+
   Npts = xvec[0].Nelements;
   if (Npts == 0) return (TRUE);
@@ -69 +74 @@
   }
   return (TRUE);
+
+mismatch:
+  gprint (GP_ERR, "error and data vector lengths are mismatched\n");
+  return (FALSE);
 }