Changeset 42389 for trunk/Ohana/src/relphot

Timestamp:

Feb 8, 2023, 12:17:35 PM (3 years ago)

Author:

eugene

Message:

merge from eam_branches/ipp-20220316. fixes for more pendantic gcc; add opihi memory stats; string vector improvements; use named macros for fixed string lengths

Location:

trunk/Ohana

Files:

• . (modified) (1 prop)
• src/relphot (modified) (1 prop)
• src/relphot/include/relphot.h (modified) (1 diff)
• src/relphot/src/args.c (modified) (1 diff)
• src/relphot/src/bcatalog.c (modified) (3 diffs)
• src/relphot/src/save_images.c (modified) (2 diffs)

trunk/Ohana/src/relphot/include/relphot.h

@@ -470 +470 @@
 int    PRESERVE_PS1;
 int    REQUIRE_PSFFIT;
+int    USE_APER_FOR_STARGAL;
 int    UPDATE;
 int    SAVE_IMAGE_UPDATES;

trunk/Ohana/src/relphot/src/args.c

@@ -247 +247 @@
     REQUIRE_PSFFIT = TRUE;
   }
+  USE_APER_FOR_STARGAL = FALSE;
+  if ((N = get_argument (argc, argv, "-use-aper-for-stargal"))) {
+    remove_argument (N, &argc, argv);
+    USE_APER_FOR_STARGAL = TRUE;
+  }
 
   UPDATE = FALSE;

trunk/Ohana/src/relphot/src/bcatalog.c

@@ -82 +82 @@
       if (DophotSelect && ((catalog[0].measure[offset].photFlags >> 16) != DophotValue)) { Ndophot ++; continue; }
 
+      float Maper = USE_APER_FOR_STARGAL ? catalog[0].measure[offset].Map : catalog[0].measure[offset].Mkron;
+
       // skip garbage measurements
       if (isnan(catalog[0].measure[offset].psfQF)     || (catalog[0].measure[offset].psfQF < 0.95))     { Npsfqf ++; continue; }
       if (isnan(catalog[0].measure[offset].psfQFperf) || (catalog[0].measure[offset].psfQFperf < 0.95)) { Npsfqf ++; continue; }
       if (isnan(catalog[0].measure[offset].M)) { Nnan ++; continue; }
-      if (isnan(catalog[0].measure[offset].Mkron)) { Nnan ++; continue; }
+      if (isnan(Maper)) { Nnan ++; continue; }
 
       // require 0x01 in photFlags (fitted with a PSF) -- add to the test data
       if (REQUIRE_PSFFIT && (catalog[0].measure[offset].photFlags & 0x01) == 0) { Nbad ++; continue; }
 
-      // very loose cut on PSF - Kron 
-      float Mkp = catalog[0].measure[offset].M - catalog[0].measure[offset].Mkron;
+      // very loose cut on PSF - APER mag (Map or Mkron) -- this lightly rejects galaxies & other oddities
+      float Mkp = catalog[0].measure[offset].M - Maper;
       if (fabs(Mkp) > 1.0) { Nbad ++; continue; }
 
@@ -101 +103 @@
       if (catalog[0].measure[offset].photFlags & code->photomPoorMask) { Npoor++; continue;}
 
-      // check for galaxies (XXX skip for now)
-      if (FALSE && !isnan(catalog[0].measure[offset].Map)) {
-        if (catalog[0].measure[offset].M - catalog[0].measure[offset].Map > 0.15) {
-          nEXT ++;
-        } else {
-          nPSF ++;
-        }
+      // weak test for galaxies
+      if (Mkp > 0.5) {
+        nEXT ++;
+      } else {
+        nPSF ++;
       }
 
@@ -145 +145 @@
 
     // skip object if it is likely to be a galaxy
-    if (FALSE && (nEXT >= nPSF)) {
+    if (nEXT >= nPSF) {
       Nmeasure -= Nm;
       Ngalaxy ++;

trunk/Ohana/src/relphot/src/save_images.c

@@ -19 +19 @@
 
   char filename[1024];
-  snprintf (filename, 1024, "%s.bck", ImageCat); // ImageCat is global
+  snprintf_nowarn (filename, 1024, "%s.bck", ImageCat); // ImageCat is global
   if (!gfits_db_lock (&dbX, filename)) {
     fprintf (stderr, "can't lock backup image image catalog\n");
@@ -85 +85 @@
   dbX.format    = db->format;
 
-  snprintf (filename, 1024, "%s.bck", ImageCat);
+  snprintf_nowarn (filename, 1024, "%s.bck", ImageCat);
   if (!gfits_db_lock (&dbX, filename)) {
     fprintf (stderr, "can't lock backup image image catalog\n");