Changeset 30507

Timestamp:

Feb 7, 2011, 4:36:45 PM (15 years ago)

Author:

eugene

Message:

replace image.Mxxxx with image.nFitPhotom where appropriate (was overloaded); maintain overload for TRI images

Location:

branches/eam_branches/ipp-20101205/Ohana/src/addstar/src

Files:

• calibrate.c (modified) (1 diff)
• fakeimage.c (modified) (2 diffs)
• sky_tessalation.c (modified) (1 diff)

branches/eam_branches/ipp-20101205/Ohana/src/addstar/src/calibrate.c

@@ -225 +225 @@
     image[0].Mcal = M1;
     image[0].dMcal = M2 / sqrt (N);
-    image[0].Mxxxx = N;
+    image[0].nFitPhotom = N;
   } else {
     fprintf (stderr, "too few stars\n");
     image[0].Mcal = 10.000;
     image[0].dMcal = 10.000;
-    image[0].Mxxxx = 0;
-  }
-}
+    image[0].nFitPhotom = 0;
+  }
+}

branches/eam_branches/ipp-20101205/Ohana/src/addstar/src/fakeimage.c

@@ -134 +134 @@
 
     image[i+1].nstar = 0;
-    image[i+1].Myyyy = 0;
 
     /* check if chip hits outer bounds of mosaic */
@@ -191 +190 @@
   image[0].flags = 0;
   image[0].nstar = 0;
-  image[0].Myyyy = 0;
 
   // XXX need to set the imageID here

branches/eam_branches/ipp-20101205/Ohana/src/addstar/src/sky_tessalation.c

@@ -338 +338 @@
   image[0].photcode = 1; // this needs to be set more sensibly
 
-  image[0].Mx   = xv[0];  image[0].My   = yv[0];
-  image[0].Mxxx = xv[1];  image[0].Mxyy = yv[1];
-  image[0].Mxxy = xv[2];  image[0].Myyy = yv[2];
+  // XXX these overload these value in a silly way
+  image[0].dXpixSys = xv[0];       image[0].dYpixSys   = yv[0];
+  image[0].dMagSys  = xv[1];       image[0].nFitAstrom = yv[1];
+  image[0].photom_map_id = xv[2];  image[0].astrom_map_id = yv[2];
 
   return (TRUE);