Changeset 33399

Timestamp:

Mar 4, 2012, 6:28:02 AM (14 years ago)

Author:

eugene

Message:

use PS1_V3 fields ubercalDist

Location:

branches/eam_branches/ipp-20111122/Ohana/src/relphot/src

Files:

• ImageOps.c (modified) (3 diffs)
• MosaicOps.c (modified) (2 diffs)
• select_images.c (modified) (1 diff)

branches/eam_branches/ipp-20111122/Ohana/src/relphot/src/ImageOps.c

@@ -338 +338 @@
 
   if (image[i].flags & IMAGE_BAD) return (1000);  
-  distance = image[i].dummy3; // XXX dummy3 == ubercalDist
+  distance = image[i].ubercalDist; // was dummy3 in structure
   return (distance);
 }
@@ -413 +413 @@
     // we optionally do not recalibrate images with UBERCAL zero points 
     if (image[i].flags & ID_IMAGE_PHOTOM_UBERCAL) {
-      image[i].dummy3 = 0; // dummy3 = ubercalDist
+      image[i].ubercalDist = 0; // was dummy3
       if (KEEP_UBERCAL) continue;
     }
@@ -515 +515 @@
     // minUbercalDist calculated here is the min value for any star owned by this image
     // since this particular image is tied to that star, bump its distance by 1
-    image[i].dummy3 = minUbercalDist + 1;
+    image[i].ubercalDist = minUbercalDist + 1;
   }
   free (list);

branches/eam_branches/ipp-20111122/Ohana/src/relphot/src/MosaicOps.c

@@ -440 +440 @@
       for (j = 0; j < MosaicN_Image[i]; j++) {
         off_t im = MosaicToImage[i][j];
-        image[im].dummy3 = mosaic[i].ubercalDist;
-        fprintf (stderr, "%d %d %d\n", (int) i, (int) im, image[im].dummy3);
+        image[im].ubercalDist = mosaic[i].ubercalDist;
+        fprintf (stderr, "%d %d %d\n", (int) i, (int) im, image[im].ubercalDist);
       }
       if (KEEP_UBERCAL) continue;
@@ -546 +546 @@
     for (j = 0; j < MosaicN_Image[i]; j++) {
       off_t im = MosaicToImage[i][j];
-      image[im].dummy3 = mosaic[i].ubercalDist;
-      fprintf (stderr, "%d %d %d\n", (int) i, (int) im, image[im].dummy3);
+      image[im].ubercalDist = mosaic[i].ubercalDist;
+      fprintf (stderr, "%d %d %d\n", (int) i, (int) im, image[im].ubercalDist);
     }
   }

branches/eam_branches/ipp-20111122/Ohana/src/relphot/src/select_images.c

@@ -245 +245 @@
       }
       image[nimage].flags &= ~ID_IMAGE_PHOTOM_POOR;
-      image[nimage].dummy3 = 1000; // dummy3 == ubercalDist
+      image[nimage].ubercalDist = 1000; // dummy3 == ubercalDist
     }
     line_number[nimage] = i;