Changeset 37822 for branches/eam_branches/ipp-pv3-20140717-merge/Ohana/src/relphot/src/assign_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/relphot/src/assign_images.c (modified) (3 diffs)

branches/eam_branches/ipp-pv3-20140717-merge/Ohana/src/relphot/src/assign_images.c

@@ -80 +80 @@
     if (!strcmp(&image[j].coords.ctype[4], "-DIS")) continue;
 
-    // match the image to its corresponding ASTROMETRIC mosaic (not the same as the Mosaic above)
-    if (!FindMosaicForImage (image, Nimage, j)) {
-      if (VERBOSE2) fprintf (stderr, "cannot find mosaic for "OFF_T_FMT"\n", i);
-      continue;
-    }
-    
     // Exclude images with crazy astrometry
     // XXX NOTE : this is gpc1-specific
@@ -123 +117 @@
 
     if (MOSAIC_ZEROPT) {
-      // use the coords of the associated mosaic to select
+      // use the coords of the associated mosaic to select (only for chips; stacks use their own center)
       Mosaic *mosaic = getMosaicForImage (j); 
-      Rc = mosaic->coords.crval1;
-      Dc = mosaic->coords.crval2;
-      // NOTE : have defined mosaic Rc,Dc to choose the side of 0,360 on which most of the
-      // chips are located.  but, for host assignment, we rationalize to 0.0 - 360.0
-      Rc = ohana_normalize_angle_to_midpoint (Rc, 180.0);
+      if (mosaic) {
+        Rc = mosaic->coords.crval1;
+        Dc = mosaic->coords.crval2;
+        // NOTE : have defined mosaic Rc,Dc to choose the side of 0,360 on which most of the
+        // chips are located.  but, for host assignment, we rationalize to 0.0 - 360.0
+        Rc = ohana_normalize_angle_to_midpoint (Rc, 180.0);
+      }
     }
 
@@ -206 +202 @@
 }
 
-int calculate_host_image_bounds (RegionHostTable *regionHosts, double Rmid) {
-
-  int i, n;
-  off_t j;
-
-  for (i = 0; i < regionHosts->Nhosts; i++) {
-
-    RegionHostInfo *host = &regionHosts->hosts[i];
-
-    // XXX clear the chip match?
-
-    BuildChipMatch (host->image, host->Nimage);
-
-    double Rmin =  720.0;
-    double Rmax = -360.0;
-    double Dmin =  +90.0;
-    double Dmax = -90.0;
-
-    for (j = 0; j < host->Nimage; j++) {
-
-      Image *image = &host->image[j];
-
-      if (!FindMosaicForImage (host->image, host->Nimage, j)) {
-        fprintf (stderr, "missing astrometry? programming error?\n");
-        abort ();
-      }
-      
-      // define image corners
-      for (n = 0; n < 4; n++) {
-        double Xc, Yc, Rc, Dc;
-        Xc = Xf[n]*image->NX; 
-        Yc = Yf[n]*image->NY;
-        XY_to_RD (&Rc, &Dc, Xc, Yc, &image->coords);
-        Rc = ohana_normalize_angle_to_midpoint (Rc, Rmid);
-      
-        Rmin = MIN (Rmin, Rc);
-        Dmin = MIN (Dmin, Rc);
-        
-        Rmax = MAX (Rmax, Rc);
-        Dmax = MAX (Dmax, Rc);
-      }
-
-    }
-
-    // RminCat, RmaxCat may extended beyond 0.0 - 360.0
-    host->RminCat = Rmin;
-    host->DminCat = Dmin;
-    host->RmaxCat = Rmax;
-    host->DmaxCat = Dmax;
-
-    // regionHosts needs to have the full outer boundary
-    // (so reload_catalogs covers the correct region)
-    regionHosts->Rmin = MIN(Rmin, regionHosts->Rmin);
-    regionHosts->Rmax = MAX(Rmax, regionHosts->Rmax);
-    regionHosts->Dmin = MIN(Dmin, regionHosts->Dmin);
-    regionHosts->Dmax = MAX(Dmax, regionHosts->Dmax);
-  }
-  return TRUE;
-}
-
-
 // Rc is in range 0.0 - 360.0, hosts Rmin,Rmax in range 0.0 - 360.0
 int find_host_for_coords (RegionHostTable *regionHosts, double Rc, double Dc) {