Changeset 3689

Timestamp:

Apr 8, 2005, 10:08:50 AM (21 years ago)

Author:

eugene

Message:

minor cleanups

Location:

trunk/Ohana/src/opihi

Files:

• dvo/calextract.c (modified) (2 diffs)
• dvo/ddmags.c (modified) (4 diffs)
• lib.shell/variable.c (modified) (3 diffs)
• scripts/test.pro (modified) (1 diff)

trunk/Ohana/src/opihi/dvo/calextract.c

@@ -94 +94 @@
     /* extract values, assign to vectors */
     for (i = 0; i < catalog.Naverage; i++) {
+      if (i && !(i % 10000)) { fprintf (stderr, ","); }
       m = catalog.average[i].offset;
 
@@ -125 +126 @@
       if (N == NSTAR) {
         NSTAR += 100;
-        for (i = 0; i < NVEC; i++) {
-          REALLOCATE (vec[i][0].elements, float, NSTAR);
+        for (j = 0; j < NVEC; j++) {
+          REALLOCATE (vec[j][0].elements, float, NSTAR);
         }
       }

trunk/Ohana/src/opihi/dvo/ddmags.c

@@ -22 +22 @@
   catalog.measure = NULL;
 
+  /* find CATDIR in config system */
+  VarConfig ("CATDIR", "%s", catdir);
+
   /* load photcode information */
   if (!InitPhotcodes ()) goto escape;
@@ -30 +33 @@
   if (!GetGraphData (&graphsky, NULL, &Ngraph)) return (FALSE);
  
-  /* find CATDIR in config system */
-  VarConfig ("CATDIR", "%s", catdir);
+  /* find catalog files which overlap this region */
+  Radius = MAX (fabs(graphsky.xmax), fabs(graphsky.ymax));
+  regions = find_regions (graphsky.coords.crval1, graphsky.coords.crval2, Radius, &Nregions);
 
   /* interpret command-line options */
@@ -46 +50 @@
   if (!GetPhotcodeInfo (argv[7], &code[3], &mode[3])) return (FALSE);
   if ((mode[2] == MAG_AVE) || (mode[2] == MAG_REF)) UseAverages = TRUE;
-
-  /* find catalog files which overlap this region */
-  Radius = MAX (fabs(graphsky.xmax), fabs(graphsky.ymax));
-  regions = find_regions (graphsky.coords.crval1, graphsky.coords.crval2, Radius, &Nregions);
 
   /* init vectors to save data */
@@ -114 +114 @@
 usage:
   fprintf (stderr, "USAGE: ddmags F - F : measure.param\n");
-  return (FALSE);
 
 escape:

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

@@ -121 +121 @@
     }
   }
-  return ((char *) NULL);
+  return (NULL);
 }
 
@@ -148 +148 @@
     }
   }
-  return ((char *) NULL);
+  return (NULL);
 }
 
@@ -168 +168 @@
   }
   free (local);
-  return ((char *) NULL);
+  return (NULL);
 }
 

trunk/Ohana/src/opihi/scripts/test.pro

@@ +1 @@
+
+macro testfit
+ create x 0 1000
+ set y = 3 + 5*x
+ set dy = 10*(rnd(x) - 0.5)
+ set yr = y + dy
+ fit x yr 1
+ echo $Cn, $Cnv
+ echo $dC
+
+ yr[100] = yr[100] + 50
+ yr[200] = yr[200] - 50
+ yr[300] = yr[300] + 100
+ yr[400] = yr[400] - 500
+ yr[500] = yr[500] + 30
+
+ fit x yr 1
+ echo $Cn, $Cnv
+ echo $dC
+
+ fit x yr 1 -clip 3 3
+ echo $Cn, $Cnv
+ echo $dC
+end
+# expected output:
+# y = 3.013781 x^0 5.000005 x^1
+#     0.063198     0.000110
+# 1, 1000
+# 2.91071543189
+# y = 2.495040 x^0 5.000303 x^1
+#     0.063198     0.000110
+# 1, 1000
+# 16.5928919554
+# y = 3.021974 x^0 4.999991 x^1
+#     0.063419     0.000110
+# 1, 995
+# 2.90820510001
 
 macro testloops