Changeset 37686

Timestamp:

Nov 28, 2014, 12:37:27 PM (12 years ago)

Author:

eugene

Message:

save the old offset map, skip objects with two few filtered detections

Location:

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

Files:

• include/relastro.h (modified) (1 diff)
• src/StarMaps.c (modified) (1 diff)
• src/UpdateChips.c (modified) (3 diffs)
• src/bcatalog.c (modified) (1 diff)

branches/eam_branches/ipp-20140904/Ohana/src/relastro/include/relastro.h

@@ -503 +503 @@
 int checkStarMap(int N);
 int createStarMap (Catalog *catalog, int Ncatalog);
+int printStarMap(int N, char *filename);
 
 int GetScatterRawRef(float *dLsig, float *dMsig, float *dRsig, int *nKeep, StarData *raw, StarData *ref, int Nstars, float SigmaLimit);

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

@@ -176 +176 @@
 }
 
+int printStarMap(int N, char *filename) {
+
+  off_t i, Nimages;
+  Image *images = getimages(&Nimages, NULL);
+  double L, M;
+
+  FILE *f = fopen (filename, "w");
+
+  for (i = 0; i < starmap[N].Npoints; i++) {
+    // set the transformed coordinates
+    XY_to_LM (&L, &M, starmap[N].points[i].X, starmap[N].points[i].Y, &images[N].coords);
+
+    fprintf (f, "%d %7.2f %f : %7.2f %7.2f : %7.2f %7.2f : %7.2f %7.2f\n", (int) i, starmap[N].points[i].X, starmap[N].points[i].Y, starmap[N].points[i].L, starmap[N].points[i].M, L, M, starmap[N].points[i].L - L, starmap[N].points[i].M - M);
+  }
+  fclose (f);
+  return (TRUE);
+}
+

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

@@ -107 +107 @@
       if (VERBOSE) fprintf (stderr, "reject fit for image %s ("OFF_T_FMT") : Nstars: "OFF_T_FMT" of %d\n", image[i].name,  i,  Nraw, image[i].nstar);
 
-      // restore status quo ante (replace truMap with tmpMap)
-      RestoreCoords (&image[i].coords, &oldCoords, &image[i]);
-      image[i].dXpixSys = dXpixSys;
-      image[i].dYpixSys = dYpixSys; 
-      image[i].nFitAstrom = nFitAstr;
-
-      saveCenter (image, &Ro[i], &Do[i], i);
-      mode[i] = 1;
-      NoldFit ++;
-      free (raw);
-      free (ref);
-      continue;
+      if (1) {
+        // restore status quo ante (replace truMap with tmpMap)
+        RestoreCoords (&image[i].coords, &oldCoords, &image[i]);
+        image[i].dXpixSys = dXpixSys;
+        image[i].dYpixSys = dYpixSys; 
+        image[i].nFitAstrom = nFitAstr;
+
+        saveCenter (image, &Ro[i], &Do[i], i);
+        mode[i] = 1;
+        NoldFit ++;
+        free (raw);
+        free (ref);
+        continue;
+      }
     }
 
@@ -124 +126 @@
       if (VERBOSE) fprintf (stderr, "fit diverges too much for image %s ("OFF_T_FMT") : Nstars: "OFF_T_FMT"\n", image[i].name,  i,  Nraw);
 
-      // restore status quo ante (replace truMap with tmpMap)
-      RestoreCoords (&image[i].coords, &oldCoords, &image[i]);
-      image[i].dXpixSys = dXpixSys;
-      image[i].dYpixSys = dYpixSys; 
-      image[i].nFitAstrom = nFitAstr;
-
-      saveCenter (image, &Ro[i], &Do[i], i);
-      mode[i] = 2;
-      image[i].flags |= ID_IMAGE_ASTROM_POOR;
-      NoldFit ++;
-      free (raw);
-      free (ref);
-      continue;
+      if (1) {
+        // restore status quo ante (replace truMap with tmpMap)
+        RestoreCoords (&image[i].coords, &oldCoords, &image[i]);
+        image[i].dXpixSys = dXpixSys;
+        image[i].dYpixSys = dYpixSys; 
+        image[i].nFitAstrom = nFitAstr;
+
+        saveCenter (image, &Ro[i], &Do[i], i);
+        mode[i] = 2;
+        image[i].flags |= ID_IMAGE_ASTROM_POOR;
+        NoldFit ++;
+        free (raw);
+        free (ref);
+        continue;
+      }
     } 
 
@@ -538 +542 @@
 
   // copy the coords structure data first, then fix the offsetMap pointers
+  // this modifies tgt.coords, but we need to keep the original pointer
   CopyCoords (tgt, src);
+  tgt->offsetMap = truMap;
 
   // we want to keep the old solution, which is (maybe) a pointer to a stand-alone

branches/eam_branches/ipp-20140904/Ohana/src/relastro/src/bcatalog.c

@@ -199 +199 @@
       }
     }
+    // we have filtered this object.  do not keep it if we now have too few meas
+    if (Nm <= SRC_MEAS_TOOFEW) {
+      Nmeasure -= Nm;
+      continue;
+    }
     subcatalog[0].average[Naverage].Nmeasure = Nm;
     Naverage ++;