Changeset 27840 for branches/simtest_nebulous_branches/Ohana/src/opihi/dvo/gimages.c

Timestamp:

May 3, 2010, 8:50:52 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/simtest_nebulous_branches

Files:

• . (modified) (1 prop)
• Ohana (modified) (1 prop)
• Ohana/src/opihi/dvo/gimages.c (modified) (5 diffs)

branches/simtest_nebulous_branches/Ohana/src/opihi/dvo/gimages.c

@@ -5 +5 @@
 int gimages (int argc, char **argv) {
   
-  int i, j, N, Nimage, Nfound, *subset, Nsubset, status;
+  off_t i, j, Nimage, *subset, Nsubset;
+  int N, Nfound, status;
   double ra, dec, Ra, Dec, X, Y, Yo;
   double trange, t;
@@ -114 +115 @@
     { 
       Coords local;
-      double Ro, Do, Xo, Yo, Xs, Ys, Xe, Ye, Radius;
+      double Ro, Do, Xo, Yo, Xs, Ys, Radius;
       
       if (typehash == DistortImage) {
@@ -124 +125 @@
       }
 
+      // find coordinates of image center
       XY_to_RD (&Ro, &Do, Xo, Yo, &image[i].coords);
+      if (fabs(Ro - Ra) > 120.0) continue;
 
       local.crval1 = Ro;
@@ -138 +141 @@
         Xs = -0.5*image[i].NX;
         Ys = -0.5*image[i].NY;
-        Xe = +0.5*image[i].NX;
-        Ye = +0.5*image[i].NY;
       } else {
         Xs = 0.0;
         Ys = 0.0;
-        Xe = image[i].NX;
-        Ye = image[i].NY;
       }
       
+      // find coordinates of an image corner
       XY_to_RD (&Ro, &Do, Xs, Ys, &image[i].coords);
-      RD_to_XY (&Xo, &Xo, Ro, Do, &local);
+
+      // find radius of image in arcsec
+      RD_to_XY (&Xo, &Yo, Ro, Do, &local);
       Radius = hypot (Xo, Yo);
       // fprintf (stderr, "%s: %f %f    %f ", image[i].name, local.crval1, local.crval2, Radius);
 
-      XY_to_RD (&Ro, &Do, Xs, Ye, &image[i].coords);
-      RD_to_XY (&Xo, &Xo, Ro, Do, &local);
-      Radius = MAX (Radius, hypot (Xo, Yo));
-      // fprintf (stderr, "%f ", Radius);
-
-      XY_to_RD (&Ro, &Do, Xe, Ys, &image[i].coords);
-      RD_to_XY (&Xo, &Xo, Ro, Do, &local);
-      Radius = MAX (Radius, hypot (Xo, Yo));
-      // fprintf (stderr, "%f ", Radius);
-
-      XY_to_RD (&Ro, &Do, Xe, Ye, &image[i].coords);
-      RD_to_XY (&Xo, &Xo, Ro, Do, &local);
-      Radius = MAX (Radius, hypot (Xo, Yo));
-      // fprintf (stderr, "%f ", Radius);
-
+      // check for distances to coordinates in arcsec
       RD_to_XY (&Xo, &Yo, Ra, Dec, &local);
       // fprintf (stderr, " : %f\n", hypot(Xo,Yo));
+
+      // skip images with center too far from coordinaes
       if (hypot(Xo,Yo) > 1.5*Radius) continue;
       // fprintf (stderr, " ** try me **\n");
@@ -217 +207 @@
   got_spot:
     date = ohana_sec_to_date (image[i].tzero);
+
+    // double-check coorsd:
+# if 0
+    {
+        double Rout, Dout;
+        status = XY_to_RD (&Rout, &Dout, X, Y, &image[i].coords);
+        fprintf (stderr, "r,d = %f,%f\n", Rout, Dout);
+    }
+# endif
 
     if (PixelCoords) {