Changeset 37807 for trunk/Ohana/src/checkastro

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/checkastro/src/ImageOps.c (modified) (2 diffs)
• src/checkastro/src/bcatalog.c (modified) (1 diff)
• src/checkastro/src/load_images.c (modified) (1 diff)
• src/checkastro/src/select_images.c (modified) (2 diffs)

trunk/Ohana/src/checkastro/src/ImageOps.c

@@ -130 +130 @@
   }
 
-  BuildChipMatch (image, Nimage);
-
   char output[128];
   snprintf (output, 128, "checkastrom.%+3.0f.%+3.0f.%03.0f.%03.0f.dat", UserPatch.Rmin, UserPatch.Rmax, UserPatch.Dmin, UserPatch.Dmax);
@@ -148 +146 @@
     name = GetPhotcodeNamebyCode (image[i].photcode);
 
-    off_t myMosaic = FindMosaicForImage (image, Nimage, i);
-
     /* only check exposure center */
     double Rexp = NAN, Dexp = NAN, Rccd = NAN, Dccd = NAN;
 
-    if (myMosaic) {
-      myMosaic --;
-      XY_to_RD (&Rccd, &Dccd, 0.5*image[i].NX, 0.5*image[i].NY, &image[i].coords);
-      XY_to_RD (&Rexp, &Dexp, 0.0, 0.0, &image[myMosaic].coords);
-    }
+    XY_to_RD (&Rccd, &Dccd, 0.5*image[i].NX, 0.5*image[i].NY, &image[i].coords);
+    XY_to_RD (&Rexp, &Dexp, 0.0, 0.0, &image[i].parent->coords);
 
     char *date = ohana_sec_to_date(image[i].tzero);

trunk/Ohana/src/checkastro/src/bcatalog.c

@@ -191 +191 @@
   /* project coordinates to a plane centered on the object with units of arcsec */
   Coords coords;
+  InitCoords (&coords, "DEC--SIN");
   coords.crval1 = Rc;
   coords.crval2 = Dc;
-  coords.crpix1 = 0;
-  coords.crpix2 = 0;
   coords.cdelt1 = coords.cdelt2 = 1.0 / 3600.0;
-  coords.pc1_1  = coords.pc2_2 = 1.0;
-  coords.pc1_2  = coords.pc2_1 = 0.0;
-  coords.Npolyterms = 1;
-  strcpy (coords.ctype, "DEC--SIN");
 
   // convert all average R,D values to X,Y:

trunk/Ohana/src/checkastro/src/load_images.c

@@ -17 +17 @@
   MARKTIME("  convert image table: %f sec\n", dtime);
 
+  BuildChipMatch (image, Nimage);
+
   // select the images which overlap the selected sky regions
   subset = select_images (skylist, image, Nimage, &LineNumber, &Nsubset);

trunk/Ohana/src/checkastro/src/select_images.c

@@ -43 +43 @@
 
   if (VERBOSE) fprintf (stderr, "finding images\n");
-  BuildChipMatch (timage, Ntimage);
-  MARKTIME("build chip match: %f sec\n", dtime);
 
   nimage = 0;
@@ -83 +81 @@
     }
     
-    // this adds 1.3 sec for 3M images
-    off_t myMosaic = FindMosaicForImage (timage, Ntimage, i);
-    if (!myMosaic) {
-      fprintf (stderr, "cannot find mosaic for "OFF_T_FMT"\n", i);
-      continue;
-    }
-    myMosaic --;
-
     /* only check exposure center */
     if (!strcmp(&timage[i].coords.ctype[4], "-DIS")) {
       XY_to_RD (&Rexp, &Dexp, 0.0, 0.0, &timage[i].coords);
     } else {
-      XY_to_RD (&Rexp, &Dexp, 0.0, 0.0, &timage[myMosaic].coords);
+      XY_to_RD (&Rexp, &Dexp, 0.0, 0.0, &timage[i].parent->coords);
     }
     Rexp = ohana_normalize_angle_to_midpoint (Rexp, RmidSkyRegion);