Changeset 28695

Timestamp:

Jul 22, 2010, 7:50:52 AM (16 years ago)

Author:

eugene

Message:

finish code for starmap in relastro

Location:

branches/eam_branches/ipp-20100621/Ohana/src/relastro/src

Files:

• ImageOps.c (modified) (2 diffs)
• StarMaps.c (modified) (3 diffs)
• UpdateChips.c (modified) (1 diff)
• UpdateMeasures.c (modified) (1 diff)
• load_catalogs.c (modified) (1 diff)
• relastro.c (modified) (2 diffs)

branches/eam_branches/ipp-20100621/Ohana/src/relastro/src/ImageOps.c

@@ -372 +372 @@
 
     // complain if the new location is far from the average location
+    // XXX warning or error here??
     if (fabs(dR) > 2.0) {
       fprintf (stderr, "!");
@@ -414 +415 @@
 
   saveOffsets (dPos, nPos, im);
+
+  // XXX this function should probably update the average positions as well.
 
   return;

branches/eam_branches/ipp-20100621/Ohana/src/relastro/src/StarMaps.c

@@ -1 +1 @@
 # include "relastro.h"
+
+// XXX mark the image grid based on the loaded detections
+// XXX modify tcatalog to exclude any photcode or other choices that
+// only affect image selection?
+
+// XXX this stuff is only going to work for SIMPLE and CHIP; need to
+// use parentID to get from imageID to the mosaic pseudo-image
+
+typedef struct {
+  double L;
+  double M;
+  double X;
+  double Y;
+  double dL;
+  double dM;
+} StarMapPoint;
 
 typedef struct {
@@ -5 +21 @@
   int  Ny;
   int *stars;
+  StarMapPoint *points;
+  int Npoints;
 } StarMap;
 
@@ -58 +76 @@
   return (TRUE);
 }
+
+int createStarMapPoints() {
+
+  Image *images;
+  off_t i, Nimages;
+
+  images = getimages(&Nimages);
+
+  for (i = 0; i < Nimages; i++) {
+    
+    ALLOCATE (starmap[i].points, StarMapPoint, NX_MAP*NY_MAP);
+    starmap[i].Npoints = 0;
+
+    for (ix = 0; ix < NX_MAP; ix++) {
+      for (iy = 0; iy < NY_MAP; iy++) {
+        if (starmap[i].stars[iybin*NX_BAP + ixbin] < 1) continue;
+        StarMapPoint *point = &starmap[i].points[starmap[i].Npoints];
+        starmap[i].Npoints++;
+
+        // set the pixel coordinates
+        point[0].X = ixbin * NX_MAP; // XXX fix 0.5 pixel offset
+        point[0].Y = iybin * NY_MAP; // XXX fix 0.5 pixel offset
+
+        // set the transformed coordinates
+        XY_to_LM (&point[0].L, &point[0].M, point[0].X, point[0].Y, &image[i].coords);
+
+        point[0].dL = 0.0;
+        point[0].dM = 0.0;
+      }
+    }
+  }
+
+  return (TRUE);
+}
+
+int checkStarMap(int N) {
+
+  Image *images;
+  off_t i, Nimages;
+  double L, M, dLmax, dMmax;
+
+  images = getimages(&Nimages);
+
+  dLmax = dMmax = 0.0;
+
+  for (i = 0; i < starmap[N].Npoints; i++) {
+
+    // set the transformed coordinates
+    XY_to_LM (&L, &M, starmap[N].point[i].X, starmap[N].point[i].Y, &image[N].coords);
+
+    starmap[N].point[i].dL = starmap[N].point[i].L - L;
+    starmap[N].point[i].dM = starmap[N].point[i].M - M;
+
+    dLmax = MAX(starmap[N].point[i].dL, dLmax);
+    dMmax = MAX(starmap[N].point[i].dM, dMmax);
+  }
+
+  if (dLmax > XXX) return (FALSE);
+  if (dMmax > XXX) return (FALSE);
+  return (TRUE);
+}
+

branches/eam_branches/ipp-20100621/Ohana/src/relastro/src/UpdateChips.c

@@ -35 +35 @@
       oldCoords = getCoords (i);
       memcpy (&image[i].coords, oldCoords, sizeof(Coords));
+      // XXX need to set some flag to note failure here
+      free (raw);
+      free (ref);
+      continue;
+    }
+
+    if (!checkStarMap (i)) {
+      fprintf (stderr, "fit diverges too much for image %s ("OFF_T_FMT") : Nstars: "OFF_T_FMT"\n", image[i].name,  i,  Nraw);
+      oldCoords = getCoords (i);
+      memcpy (&image[i].coords, oldCoords, sizeof(Coords));
+      // XXX need to set some flag to note failure here
     }
 

branches/eam_branches/ipp-20100621/Ohana/src/relastro/src/UpdateMeasures.c

@@ -13 +13 @@
     if (!strcmp(&image[i].coords.ctype[4], "-DIS")) continue;
 
+    // skip images that have failed solutions (divergent or otherwise)
+
     /* convert measure coordinates to raw entries */
     fixImageRaw (catalog, Ncatalog, i);

branches/eam_branches/ipp-20100621/Ohana/src/relastro/src/load_catalogs.c

@@ -37 +37 @@
     }
 
-    // XXX mark the image grid based on the loaded detections
-    // XXX modify tcatalog to exclude any photcode or other choices that only affect image selection?
     updateStarMaps (&tcatalog);
 

branches/eam_branches/ipp-20100621/Ohana/src/relastro/src/relastro.c

@@ -66 +66 @@
   }
 
+  // set test points based on the starmap
+  createStarMapPoints();
+
   /* major modes */
   switch (FIT_TARGET) {
@@ -104 +107 @@
 
   // iterate over catalogs to make detection coordinates consistant
-  FixProblemImages (skylist);
+  // FixProblemImages (skylist);
 
   // save the updated image parameters