Changeset 37545 for branches/eam_branches/ipp-20140904/Ohana/src/relastro/src/ImageOps.c

Timestamp:

Nov 2, 2014, 3:35:12 PM (12 years ago)

Author:

eugene

Message:

added ICRF QSOs and Spherical Harmonics-based FrameCorrection code

File:

• branches/eam_branches/ipp-20140904/Ohana/src/relastro/src/ImageOps.c (modified) (2 diffs)

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

@@ -809 +809 @@
 
     // XXX subtract off dR,dD GAL here
-    if (USE_GAL_MODEL) {
+    if (USE_GALAXY_MODEL) {
       ref[i].R += measure[0].RoffGAL;
       ref[i].D += measure[0].DoffGAL;
@@ -848 +848 @@
   *Nstars = N_onImage[im];
   return (ref);
+}
+
+// return StarData values for detections in the specified image, converting coordinates from the
+// chip positions: X,Y -> L,M -> P,Q -> R,D.  This function is used by the image fitting steps, for
+// which the detections have already been filtered when they were loaded (bcatalog)
+int setImageRaw (Catalog *catalog, int Ncatalog, off_t im, StarData *raw, off_t Nraw, CoordMode mode) {
+
+  off_t i, m, c;
+
+  Coords *moscoords;
+
+  moscoords = NULL;
+  if (mode == MODE_MOSAIC) {
+    moscoords = image[im].coords.mosaic;
+    myAssert (moscoords, "coords.mosaic not defined for image %s (%d)", image[im].name, (int) im);
+  }
+
+  myAssert (Nraw == N_onImage[im], "impossible!");
+
+  for (i = 0; i < N_onImage[im]; i++) {
+    m = ImageToMeasure[im][i];
+    c = ImageToCatalog[im][i];
+
+    // XXX should I use the raw coords or just measure.X,Y -> R,D?
+
+    switch (mode) {
+      case MODE_SIMPLE:
+        /* note that for a Simple image, L,M = P,Q */
+        XY_to_LM (&raw[i].L, &raw[i].M, raw[i].X, raw[i].Y, &image[im].coords);
+        raw[i].P = raw[i].L;
+        raw[i].Q = raw[i].M;
+        LM_to_RD (&raw[i].R, &raw[i].D, raw[i].P, raw[i].Q, &image[im].coords);
+        break;
+      case MODE_MOSAIC:
+        XY_to_LM (&raw[i].L, &raw[i].M, raw[i].X, raw[i].Y, &image[im].coords);
+        XY_to_LM (&raw[i].P, &raw[i].Q, raw[i].L, raw[i].M, moscoords);
+        LM_to_RD (&raw[i].R, &raw[i].D, raw[i].P, raw[i].Q, moscoords);
+        break;
+      default:
+        fprintf (stderr, "error: invalid mode in getImageRaw");
+        abort ();
+    }
+
+    MeasureTiny *measure = &catalog[c].measureT[m];
+    measure->R = raw[i].R;
+    measure->D = raw[i].D;
+    if (catalog[c].measure) {
+      catalog[c].measure[m].R = raw[i].R;
+      catalog[c].measure[m].D = raw[i].D;
+    }      
+  }
+  return TRUE;
 }