Changeset 34844 for trunk/Ohana/src/uniphot/src/update_catalog_setposangle.c

Timestamp:

Dec 18, 2012, 10:04:35 AM (14 years ago)

Author:

eugene

Message:

merging changes from eam_branches/ipp-20121130

Location:

trunk/Ohana

Files:

• . (modified) (1 prop)
• src/uniphot/src/update_catalog_setposangle.c (modified) (2 diffs)

trunk/Ohana/src/uniphot/src/update_catalog_setposangle.c

@@ -25 +25 @@
       Mosaic *mosaic = getMosaicForImage(seq);
       Coords *coords = &image[seq].coords;
+      Coords *mosaicCoords = mosaic ? &mosaic->coords : NULL;
 
       double Xccd = catalog[0].measure[m].Xccd;
       double Yccd = catalog[0].measure[m].Yccd;
       
-      setposangle_local_astrometry (&posAngle, &pltScale, Xccd, Yccd, &mosaic->coords, coords);
+      setposangle_local_astrometry (&posAngle, &pltScale, Xccd, Yccd, mosaicCoords, coords);
 
       catalog[0].measure[m].posangle = ToShortDegrees(posAngle);
@@ -52 +53 @@
   // calculate the astrometry for the coordinate of interest
   XY_to_LM (&Lx, &Mx, x,       y,       coords);
-  XY_to_LM (&Po, &Qo, Lx,      Mx,      mosaic);
+  if (mosaic) {
+    XY_to_LM (&Po, &Qo, Lx,      Mx,      mosaic);
+  } else {
+    Po = Lx;
+    Qo = Mx;
+  }
 
   XY_to_LM (&Lx, &Mx, x + 1.0, y,       coords);
-  XY_to_LM (&Px, &Qx, Lx,      Mx,      mosaic);
+  if (mosaic) {
+    XY_to_LM (&Px, &Qx, Lx,      Mx,      mosaic);
+  } else {
+    Px = Lx;
+    Qx = Mx;
+  }
 
   XY_to_LM (&Lx, &Mx, x,       y + 1.0, coords);
-  XY_to_LM (&Py, &Qy, Lx,      Mx,      mosaic);
+  if (mosaic) {
+    XY_to_LM (&Py, &Qy, Lx,      Mx,      mosaic);
+  } else {
+    Py = Lx;
+    Qy = Mx;
+  }
 
   // XXX units for the resulting Tangent Plane coordinates??