Changeset 15590 for trunk/Ohana/src/relastro/src/ImageOps.c

Timestamp:

Nov 11, 2007, 4:12:43 PM (19 years ago)

Author:

eugene

Message:

progress on running relastro:images

File:

• trunk/Ohana/src/relastro/src/ImageOps.c (modified) (5 diffs)

trunk/Ohana/src/relastro/src/ImageOps.c

@@ -176 +176 @@
 // return StarData values for detections in the specified image, converting coordinates from the
 // chip positions: X,Y -> L,M -> P,Q -> R,D
-StarData *getImageRaw (Catalog *catalog, int Ncatalog, int im, int *Nstars, int isMosaic) {
+StarData *getImageRaw (Catalog *catalog, int Ncatalog, int im, int *Nstars, CoordMode mode) {
 
   int i, m, c;
-
-  Image *mosaic;
+  
+  Mosaic *mosaic;
   Coords *moscoords;
   StarData *raw;
@@ -188 +188 @@
   mosaic = NULL;
   moscoords = NULL;
-  if (isMosaic) {
-    mosaic = getMosaicForImage (im);
-    if (mosaic == NULL) {
-      fprintf (stderr, "mosaic not found for image %s\n", image[i].name);
-      exit (1);
-    }
-    moscoords = &mosaic[0].coords;
+  switch (mode) {
+    case MODE_SIMPLE:
+      break;
+    case MODE_CHIP:
+      mosaic = getMosaicForImage (im);
+      if (mosaic == NULL) {
+        fprintf (stderr, "mosaic not found for image %s\n", image[i].name);
+        exit (1);
+      }
+      moscoords = &mosaic[0].coords;
+      break;
+    case MODE_MOSAIC:
+      // XXX find all images which are chips for this mosaic image
+      // XXX count the stars in the superset of lists?
+      fprintf (stderr, "problem with the mosaic mode (need to grab the correct set of stars)");
+      abort ();
+      break;
   }
 
@@ -208 +218 @@
     raw[i].dMag = catalog[c].measure[m].dM;
 
-    /* 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);
-    if (isMosaic) {
-      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);
-    } else {
-      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);
+    raw[i].mask = FALSE;
+
+    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_CHIP:
+        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;
+      case MODE_MOSAIC:
+        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;
     }
-  }
-  
+  }  
+
   *Nstars = Nlist[im];
   return (raw);
@@ -230 +252 @@
   int i, m, c, n;
 
-  Image *mosaic;
+  Mosaic *mosaic;
   Coords *moscoords;
   StarData *ref;
@@ -251 +273 @@
     ref[i].R = catalog[c].average[n].R;
     ref[i].D = catalog[c].average[n].D;
+    ref[i].mask = FALSE;
 
     /* note that for a Simple image, L,M = P,Q */
-    RD_to_LM (&ref[i].P, &ref[i].Q, ref[i].R, ref[i].D, &image[im].coords);
     if (isMosaic) {
+      RD_to_LM (&ref[i].P, &ref[i].Q, ref[i].R, ref[i].D, moscoords);
       LM_to_XY (&ref[i].M, &ref[i].L, ref[i].P, ref[i].Q, moscoords);
-      LM_to_XY (&ref[i].X, &ref[i].Y, ref[i].L, ref[i].M, moscoords);
+      LM_to_XY (&ref[i].X, &ref[i].Y, ref[i].L, ref[i].M, &image[im].coords);
     } else {
+      RD_to_LM (&ref[i].P, &ref[i].Q, ref[i].R, ref[i].D, &image[im].coords);
       ref[i].L = ref[i].P;
       ref[i].M = ref[i].Q;