Changeset 15579

Timestamp:

Nov 9, 2007, 5:38:07 PM (19 years ago)

Author:

eugene

Message:

working on relastro (chips)

Location:

trunk/Ohana/src/relastro/src

Files:

• ConfigInit.c (modified) (1 diff)
• ImageOps.c (modified) (1 diff)
• MosaicOps.c (modified) (6 diffs)

trunk/Ohana/src/relastro/src/ConfigInit.c

@@ -61 +61 @@
     exit (1);
   }
-  SetZeroPoint (ZERO_POINT);
+  SetZeroPoint (25.0);
 
   free (config);

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

@@ -190 +190 @@
   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;
   }

trunk/Ohana/src/relastro/src/MosaicOps.c

@@ -9 +9 @@
 static int   **imlist; /* mosaic -> image[] */
 static int   **bin;    /* catalog, measure -> mosaic */
+
+static int    Nimages;
+static int   **moslist; /* image -> mosaic */
 
 static int   **clist;  /* mosaic -> catalog[] */
@@ -23 +26 @@
   char *pname;
 
-  if (!MOSAICNAME[0]) return;
+  // if (!MOSAICNAME[0]) return;
 
   Nmosaic = 0;
@@ -33 +36 @@
   ALLOCATE (NIMLIST, int, NMOSAIC);
 
+  Nimages = Nimage;
+  ALLOCATE (moslist, int, Nimages);
+
   /* generate list of unique mosaics */
   for (i = 0; i < Nimage; i++) {
 
-    /* select valid mosaic images by photcode */
+    moslist[i] = -1; // default value for no mosaic found
+
+    /* select valid mosaic images by photcode
     pname = GetPhotcodeNamebyCode (image[i].photcode);
     status = strncmp (pname, MOSAICNAME, strlen (MOSAICNAME));
-    if (status) continue;
+    if (status) continue; */
 
     /* set image time range */
@@ -60 +68 @@
       }
 
+      /* add mosaic to image -> mosaic list */
+      moslist[i] = j;
     }
     if (found) continue;
@@ -72 +82 @@
     mosaic[Nmosaic].secz  = image[i].secz;
 
-    /* add image to mosaic image list */
+    /* add image to mosaic -> image list */
     NIMLIST[Nmosaic] = 10;
     Nimlist[Nmosaic] = 1;
     ALLOCATE (imlist[Nmosaic], int, NIMLIST[Nmosaic]);
     imlist[Nmosaic][0] = i;
+
+    /* add mosaic to image -> mosaic list */
+    moslist[i] = Nmosaic;
 
     Nmosaic ++;
@@ -278 +291 @@
 Image *getMosaicForImage (int Nim) {
 
-    Image *mosaic;
-
-    mosaic = NULL;
-    return mosaic;
+  int i;
+  Image *mosaic;
+
+  // search for the mosaic that 
+  i = moslist[Nim];
+  if (i < 0) return NULL;
+
+  mosaic = &mosaic[i];
+  return mosaic;
 }