Changeset 37822 for branches/eam_branches/ipp-pv3-20140717-merge/Ohana/src/opihi/dvo/images.c

Timestamp:

Jan 12, 2015, 12:29:24 PM (12 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-pv3-20140717-merge/Ohana

Files:

• . (modified) (1 prop)
• src/opihi/dvo/images.c (modified) (5 diffs)

branches/eam_branches/ipp-pv3-20140717-merge/Ohana/src/opihi/dvo/images.c

@@ -131 +131 @@
   /* it is not an error for the database not to have any images */
   if ((image = LoadImagesDVO (&Nimage)) == NULL) return (TRUE);
-  BuildChipMatch (image, Nimage);
+  // BuildChipMatch (image, Nimage);
 
   if (SOLO_MOSAIC && photcode) {
@@ -152 +152 @@
   SetVector (&Yvec, OPIHI_FLT, NPTS);
 
+  Image *mosaic = NULL;
+
   ALLOCATE (plist, int, NPTS);
   n = N = 0;
@@ -157 +159 @@
     if (ByName && strncmp (image[i].name, name, strlen(name))) continue;
     if (TimeSelect && ((image[i].tzero < tzero) || (image[i].tzero+image[i].trate*image[i].NY > tzero + trange))) continue;
-    if (!(Nmosaic = FindMosaicForImage (image, Nimage, i))) continue;
-    Nmosaic --; // XXX kind of a hack: FindMosaicForImage returns 0 or the mosaic seq number + 1
+
+    mosaic = image[i].parent;
+    Nmosaic = (SOLO_MOSAIC && mosaic) ? mosaic - image : -1;
+
     if (photcode) {
       if ( photcodeEquiv && (photcode[0].code != GetPhotcodeEquivCodebyCode(image[i].photcode))) continue;
@@ -170 +174 @@
     typehash = wordhash (&image[i].coords.ctype[4]);
 
-    if (photcode && SOLO_MOSAIC) {
+    if (photcode && SOLO_MOSAIC && (Nmosaic >= 0)) {
       // mosaic (DIS) images are not currently given a photcode : plot these via the WRP entries
       /* DIS images represent a field, not a chip */
       if (typehash != ChipImage) continue;
       if (foundMosaic[Nmosaic]) continue;
-      x[0] = -0.5*image[Nmosaic].NX; y[0] = -0.5*image[Nmosaic].NY;
-      x[1] = +0.5*image[Nmosaic].NX; y[1] = -0.5*image[Nmosaic].NY;
-      x[2] = +0.5*image[Nmosaic].NX; y[2] = +0.5*image[Nmosaic].NY;
-      x[3] = -0.5*image[Nmosaic].NX; y[3] = +0.5*image[Nmosaic].NY;
+      x[0] = -0.5*mosaic->NX; y[0] = -0.5*mosaic->NY;
+      x[1] = +0.5*mosaic->NX; y[1] = -0.5*mosaic->NY;
+      x[2] = +0.5*mosaic->NX; y[2] = +0.5*mosaic->NY;
+      x[3] = -0.5*mosaic->NX; y[3] = +0.5*mosaic->NY;
       for (j = 0; j < Npts; j++) {
-        status = XY_to_RD (&r[j], &d[j], x[j], y[j], &image[Nmosaic].coords);
+        status = XY_to_RD (&r[j], &d[j], x[j], y[j], &mosaic->coords);
         if (!status) break;
         r[j] = ohana_normalize_angle (r[j]);
@@ -198 +202 @@
 
     /* DIS images represent a field, not a chip */
-    if ((typehash == DistortImage) && !WITH_MOSAIC) continue;
-    if ((typehash != DistortImage) &&  SOLO_MOSAIC) continue;
+    if ((typehash == DistortImage) && !WITH_MOSAIC) continue; // do not plot the mosaic images
+    if ((typehash != DistortImage) &&  SOLO_MOSAIC) continue; // plot only the mosaic images
+
     if (typehash == DistortImage) {
       x[0] = -0.5*image[i].NX; y[0] = -0.5*image[i].NY;