Changeset 37807 for trunk/Ohana/src/opihi/dvo/skycoverage.c

Timestamp:

Jan 11, 2015, 2:14:39 PM (12 years ago)

Author:

eugene

Message:

merge changes from eam branch ipp-20140904

Location:

trunk/Ohana

Files:

• . (modified) (1 prop)
• src/opihi/dvo/skycoverage.c (modified) (4 diffs)

trunk/Ohana/src/opihi/dvo/skycoverage.c

@@ -204 +204 @@
   strcpy (buf[0].file, "(empty)");
 
+  InitCoords (&coords, projection);
   coords.crval1 = RaCenter;
   coords.crval2 = DecCenter;
   coords.crpix1 = 0.5*Nx;
   coords.crpix2 = 0.5*Ny;
-  strcpy (coords.ctype, projection);
-  coords.pc1_1 = -1.0;
+  coords.pc1_1 = -1.0; // sky parity
   coords.pc2_2 = +1.0;
-  coords.pc1_2 =  0.0;
-  coords.pc2_1 =  0.0;
   coords.cdelt1 = coords.cdelt2 = pixscale;
-  coords.Npolyterms = 0;
 
   PutCoords (&coords, &buf[0].header);
@@ -222 +219 @@
       return (FALSE);
   }
-  BuildChipMatch (image, Nimage);
+  // BuildChipMatch (image, Nimage);
 
   V = (float *)buf[0].matrix.buffer;
@@ -230 +227 @@
     for (xs = 0; xs < Nx; xs++) {
       status = XY_to_RD (&r, &d, (double)(xs), (double)(ys), &coords);
-      status &= (r >= 0);
-      status &= (r <= 360);
+      r = ohana_normalize_angle (r);
+
       // are we in a part of the projection covering the sky or not?
       if (status) {
@@ -284 +281 @@
       }
     }
-
-    if (!FindMosaicForImage (image, Nimage, i)) continue;
 
     typehash = wordhash (&image[i].coords.ctype[4]);