Changeset 39542

Timestamp:

Apr 19, 2016, 1:56:14 PM (10 years ago)

Author:

eugene

Message:

handle (reject) galaxy model fits with bad ID

Location:

trunk/Ohana/src/addstar/src

Files:

• loadgalphot_join.c (modified) (3 diffs)
• loadgalphot_readstars.c (modified) (1 diff)

trunk/Ohana/src/addstar/src/loadgalphot_join.c

@@ -16 +16 @@
   { 
     int i;
-    for (i = 0; i < gal->N; i++) { seq_gal[i] = i; }
+    for (i = 0; i < gal->N; i++) { seq_gal[i] = i; idx_gal[i] = -1; }
     for (i = 0; i < fit->N; i++) { seq_fit[i] = i; }
   }
@@ -28 +28 @@
     int Igal = seq_gal[igal];
     int Ifit = seq_fit[ifit];
+
+    if (gal->ID[Igal] < 0) { igal++; continue; }
+    if (fit->ID[Ifit] < 0) { ifit++; continue; }
 
     int dID = gal->ID[Igal] - fit->ID[Ifit];
@@ -59 +62 @@
   free (seq_fit);
 
-  myAssert (Nmatch == gal->N, "did not find matches for all galaxies");
+  // myAssert (Nmatch == gal->N, "did not find matches for all galaxies");
   
   for (igal = 0; igal < gal->N; igal++) {
     ifit = idx_gal[igal];
+    if (ifit < 0) continue;
     myAssert (fit->ID[ifit]   == gal->ID[igal],   "ID mis-match");
     myAssert (fit->type[ifit] == gal->type[igal], "type mis-match");

trunk/Ohana/src/addstar/src/loadgalphot_readstars.c

@@ -241 +241 @@
 
     int ifit = idx_gal[i];
+    if (ifit < 0) { Nbad ++; continue; } // skip galaxy models with bad IDs
 
     double R, D;