Changeset 41715

Timestamp:

Jul 13, 2021, 10:30:23 AM (5 years ago)

Author:

eugene

Message:

improve vector name consistency; remove rotate verbosity

Location:

trunk/Ohana/src/opihi

Files:

• cmd.data/rotate.c (modified) (2 diffs)
• include/shell.h (modified) (1 diff)
• lib.data/mrq2dmin.c (modified) (1 diff)
• lib.shell/VectorOps.c (modified) (2 diffs)
• lib.shell/expand_vectors.c (modified) (1 diff)

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

@@ -92 +92 @@
     X1 = NY - Yo;
     Y1 = Xo;
-    gprint (GP_ERR, "%f %f -> %f %f\n", Xo, Yo, X1, Y1);
+    // gprint (GP_ERR, "%f %f -> %f %f\n", Xo, Yo, X1, Y1);
     gfits_modify (&buf[0].header, "CRPIX1", "%lf", 1, X1);
     gfits_modify (&buf[0].header, "CRPIX2", "%lf", 1, Y1);
@@ -105 +105 @@
     PC21 = pc11;
     PC22 = pc12;
-    gprint (GP_ERR, "%f %f  ->  %f %f\n", pc11, pc12, PC11, PC12);
-    gprint (GP_ERR, "%f %f  ->  %f %f\n", pc21, pc22, PC21, PC22);
+    // gprint (GP_ERR, "%f %f  ->  %f %f\n", pc11, pc12, PC11, PC12);
+    // gprint (GP_ERR, "%f %f  ->  %f %f\n", pc21, pc22, PC21, PC22);
     gfits_modify (&buf[0].header, "PC001001", "%le", 1, PC11);
     gfits_modify (&buf[0].header, "PC001002", "%le", 1, PC12);

trunk/Ohana/src/opihi/include/shell.h

@@ -7 +7 @@
 # define ESCAPE(MSG,...) { gprint (GP_ERR, MSG, __VA_ARGS__); return FALSE; }
 
+# define ISVEC(a) (isalnum (a) || (a == '.') || (a == '_'))
 # define ISVAR(a) (isalnum (a) || (a == ':') || (a == '_'))
 # define ISREF(a) (isalnum (a) || (a == '_'))

trunk/Ohana/src/opihi/lib.data/mrq2dmin.c

@@ -164 +164 @@
 
   
-  lambda = 0.001;
+//  lambda = 0.001;
+  lambda = 1.0;
   
   ochisq = mrq2dcof (x, t, y, dy, Npts, par, Npar, alpha, beta, funcs);

trunk/Ohana/src/opihi/lib.shell/VectorOps.c

@@ -65 +65 @@
 }
 
+int IsVectorNameValid (char *name) {
+
+  char *p = name;
+
+  while (*p) {
+    int valid = OHANA_WHITESPACE(*p);
+    valid = valid || ISVEC(*p);
+    if (!valid) return FALSE;
+    p++;
+  }
+  return TRUE;
+}
+
 int IsVectorPtr (Vector *vec) {
  
@@ -89 +102 @@
   if (i == Nvectors) { 
     if (mode == OLDVECTOR) goto error;
+    // validate vector name syntax
+    if (!IsVectorNameValid(name)) { gprint (GP_ERR, "invalid vector name %s\n", name); return NULL; }
     pthread_mutex_lock (&mutex);
     Nvectors ++;

trunk/Ohana/src/opihi/lib.shell/expand_vectors.c

@@ -131 +131 @@
       p--;
     }
-    for (w = p - 1; (w >= line) && !OHANA_WHITESPACE(*w) && (isalnum(*w) || (*w == ':') || (*w == '_')); w--);
+
+    // Scan backwards for the start of the vector name.  ISVEC is defined in
+    // include/shell.h.  A vector name cannot include a colon, while a variable name
+    // cannot include a dot.
+
+    for (w = p - 1; (w >= line) && !OHANA_WHITESPACE(*w) && ISVEC(*w); w--);
     w ++;
     n = (int)(p - w);