Changeset 26891 for trunk/Ohana/src/opihi/cmd.astro

Timestamp:

Feb 10, 2010, 7:24:46 PM (16 years ago)

Author:

eugene

Message:

updates from eam_branches/20091201

Location:

trunk/Ohana/src/opihi/cmd.astro

Files:

• mkgauss.c (modified) (2 diffs)
• profile.c (modified) (1 diff)
• star.c (modified) (1 diff)

trunk/Ohana/src/opihi/cmd.astro/mkgauss.c

@@ -11 +11 @@
   Buffer *buf;
 
-  Xo = Yo = 0;
+  // this should be Nx/2, Ny/2 if not set
+  Xo = Yo = NAN;
   if ((N = get_argument (argc, argv, "-c"))) {
     remove_argument (N, &argc, argv);
@@ -30 +31 @@
   Ny = buf[0].header.Naxis[1];
   
+  if (isnan(Xo)) Xo = Nx / 2;
+  if (isnan(Yo)) Yo = Ny / 2;
+
   /* gaussian parameters */
   Sig_x = atof (argv[2]);

trunk/Ohana/src/opihi/cmd.astro/profile.c

@@ -31 +31 @@
   ResetVector (yvec, OPIHI_FLT, (int)SQ(2*N+1));
 
-  bzero (yvec[0].elements.Flt, (int)SQ(2*N+1)*sizeof(opihi_flt)+1);
+  bzero (yvec[0].elements.Flt, (int)SQ(2*N+1)*sizeof(opihi_flt));
   V = (float *)(buf[0].matrix.buffer); 
   Npt = 0;
   Nx = buf[0].matrix.Naxis[0];
-  for (i = sx - N; i < sx + N; i++) {
-    for (j = sy - N; j < sy + N; j++, Npt++) {
+  for (i = sx - N; i <= sx + N; i++) {
+    for (j = sy - N; j <= sy + N; j++, Npt++) {
       yvec[0].elements.Flt[Npt] = V[i + j*Nx];
-      xvec[0].elements.Flt[Npt] = hypot (i - sx, j - sy);
+      xvec[0].elements.Flt[Npt] = hypot (i + 0.5 - sx, j + 0.5 - sy);
     }
   }

trunk/Ohana/src/opihi/cmd.astro/star.c

@@ -24 +24 @@
   if ((argc != 4) && (argc != 5)) {
     gprint (GP_ERR, "USAGE: star (buffer) x y [dx] [-border N] [-sat cnts]\n");
+    gprint (GP_ERR, " dx is the aperture diameter, but is adjusted up to the next odd number\n");
     return (FALSE);
   }