Changeset 41891 for trunk/Ohana/src/getstar

Timestamp:

Nov 4, 2021, 6:02:11 PM (5 years ago)

Author:

eugene

Message:

merge changes from eam_branches/ipp-dev-20210817 (add chebyshev, add fit2d_full, add inner_fraction to medimage, change dvoImageOverlap test to CERSTD)

Location:

trunk/Ohana

Files:

• . (modified) (1 prop)
• src/getstar/src/ConfigInit_overlaps.c (modified) (1 diff)
• src/getstar/src/MatchImages.c (modified) (1 diff)
• src/getstar/src/ReadImageHeader.c (modified) (1 diff)

trunk/Ohana/src/getstar/src/ConfigInit_overlaps.c

@@ -44 +44 @@
   if (*CATFORMAT == 0) strcpy (CATFORMAT, "ELIXIR");
 
-  MAX_CERROR = 0.5; // arcseconds
+  MAX_CERROR = NAN; // NAN means do not cut on this value
   ScanConfig (config, "OVERLAPS_MAX_CERROR",     "%lf", 0, &MAX_CERROR);
 

trunk/Ohana/src/getstar/src/MatchImages.c

@@ -21 +21 @@
 
   // exclude chips / images with errors larger than OVERLAP_MAX_CERROR:
-  if (fabs(MAX_CERROR) > 1e-6) {
+  // 2021.11.03 : MAX_CERROR is now compared to the header value CERSTD
+  if (isfinite(MAX_CERROR)) {
     if (image[0].cerror * 0.02 > MAX_CERROR) return NULL;
   }

trunk/Ohana/src/getstar/src/ReadImageHeader.c

@@ -93 +93 @@
   }
     
-  /* CERROR in data file is in arcsec, image structure uses units of 20 mas */
-  if (!gfits_scan (header, "CERROR",   "%lf", 1, &tmp)) tmp = 1.0;
+  // CERROR & CERSTD in data file are in arcsec, image structure uses units of 20 mas
+  // if (!gfits_scan (header, "CERROR",   "%lf", 1, &tmp)) tmp = 1.0;
+  // 2021.11.03 : getstar now checks CERSTD, not CERROR
+  if (!gfits_scan (header, "CERSTD",   "%lf", 1, &tmp)) tmp = 1.0;
   image[0].cerror = tmp * 50.0;