Changeset 30631 for branches/czw_branch/20101203/Ohana/src/opihi/dvo/images.c

Timestamp:

Feb 14, 2011, 1:05:28 PM (15 years ago)

Author:

watersc1

Message:

Merge of trunk back into branch.

Location:

branches/czw_branch/20101203

Files:

• . (modified) (1 prop)
• Ohana/src/opihi/dvo/images.c (modified) (1 diff)

branches/czw_branch/20101203/Ohana/src/opihi/dvo/images.c

@@ -223 +223 @@
       goto got_type;
     }
-    // For 'TrianglePts' (TRI-), we are using the Mx,My, etc terms to save the coordinates
-    // this means triangular images cannot carry photometric zero-point variations
+    // For 'TrianglePts' (TRI-), we are absurdly overloaded values otherwise not used
     if (typehash == TrianglePts) {
       Npts = 3;
-      x[0] = image[i].Mx;   y[0] = image[i].My;
-      x[1] = image[i].Mxxx; y[1] = image[i].Mxyy;
-      x[2] = image[i].Mxxy; y[2] = image[i].Myyy;
+      x[0] = image[0].dXpixSys;      y[0] = image[0].dYpixSys;
+      x[1] = image[0].dMagSys;       y[1] = image[0].nFitAstrom;
+      x[2] = image[0].photom_map_id; y[2] = image[0].astrom_map_id;
       goto got_type;
     }