Changeset 39287 for trunk

Timestamp:

Dec 17, 2015, 8:53:07 PM (11 years ago)

Author:

eugene

Message:

adding FitPosPMfixed_IRLS

Location:

trunk/Ohana/src/relastro/src

Files:

• FitPM.c (modified) (2 diffs)
• FitPosPMfixed_IRLS.c (added)
• ImageOps.c (modified) (6 diffs)
• UpdateObjects.c (modified) (1 diff)
• bcatalog.c (modified) (8 diffs)
• fitpm.c (modified) (1 diff)

trunk/Ohana/src/relastro/src/FitPM.c

@@ -13 +13 @@
 
   for (i = 0; i < Npoints; i++) {
+    if (points[i].mask) continue; // respect the mask if set
+    fit->Nfit ++;
+
     /* handle case where dX or dY = 0.0 */
     wx = 1.0 / SQ(points[i].dX);
@@ -64 +67 @@
   fit->dp  = 0.0;
   
-  fit->Nfit = Npoints;
-
   return (TRUE);
 }

trunk/Ohana/src/relastro/src/ImageOps.c

@@ -1195 +1195 @@
 }
 
+# define SUPER_VERBOSE 0
+
 /** Determine whether a measurement should be included in the analysis, based on supplied filter criteria */ 
 // we only optionally apply the sigma limit: for object averages, this should not be used (should it?)
@@ -1203 +1205 @@
   float mag;
 
-  if (!finite(measure[0].R) || !finite(measure[0].D)) return FALSE;
-  if (!finite(measure[0].M)) return FALSE; //XXX is this necessary for all relastro tasks?
-  if (!finite(measure[0].dM)) return FALSE; //XXX is this necessary for all relastro tasks?
+  if (!finite(measure[0].R) || !finite(measure[0].D)) { if (SUPER_VERBOSE) fprintf (stderr, "filter 1\n"); return FALSE; };
+  if (!finite(measure[0].M)) { if (SUPER_VERBOSE) fprintf (stderr, "filter 2\n"); return FALSE; }; //XXX is this necessary for all relastro tasks?
+  if (!finite(measure[0].dM)) { if (SUPER_VERBOSE) fprintf (stderr, "filter 3\n"); return FALSE; }; //XXX is this necessary for all relastro tasks?
   
   /* select measurements by photcode, or equiv photcode, if specified */
@@ -1214 +1216 @@
       if (photcodesKeep[k][0].code == GetPhotcodeEquivCodebyCode(measure[0].photcode)) found = TRUE;
     }
-    if (!found) return FALSE;
+    if (!found) { if (SUPER_VERBOSE) fprintf (stderr, "filter 4\n"); return FALSE; };
   }
   
@@ -1223 +1225 @@
       if (photcodesSkip[k][0].code == GetPhotcodeEquivCodebyCode(measure[0].photcode)) found = TRUE;
     }
-    if (found) return FALSE;
+    if (found) { if (SUPER_VERBOSE) fprintf (stderr, "filter 5\n"); return FALSE; };
   }  
   
   if ((MinBadQF > 0.0) && isGPC1chip(measure[0].photcode)) {
-    if (!isfinite(measure[0].psfQF)) return FALSE;
-    if (measure[0].psfQF < MinBadQF) return FALSE;
+    if (!isfinite(measure[0].psfQF)) { if (SUPER_VERBOSE) fprintf (stderr, "filter 6\n"); return FALSE; };
+    if (measure[0].psfQF < MinBadQF) { if (SUPER_VERBOSE) fprintf (stderr, "filter 7\n"); return FALSE; };
   }
 
   /* select measurements by time */
   if (TimeSelect) {
-    if (measure[0].t < TSTART) return FALSE;
-    if (measure[0].t > TSTOP) return FALSE;
+    if (measure[0].t < TSTART) { if (SUPER_VERBOSE) fprintf (stderr, "filter 8\n"); return FALSE; };
+    if (measure[0].t > TSTOP) { if (SUPER_VERBOSE) fprintf (stderr, "filter 9\n"); return FALSE; };
   }
   
@@ -1243 +1245 @@
     } else {
       code = GetPhotcodebyCode (measure[0].photcode);
-      if (!code) return FALSE;
+      if (!code) { if (SUPER_VERBOSE) fprintf (stderr, "filter 10\n"); return FALSE; };
       mask = code[0].astromBadMask;
     }
-    if (mask & measure[0].photFlags) return FALSE;
+    if (mask & measure[0].photFlags) { if (SUPER_VERBOSE) fprintf (stderr, "filter 11\n"); return FALSE; };
   }
 
   /* select measurements by measurement error */
   if (applySigmaLim && (SIGMA_LIM > 0) && (measure[0].dM > SIGMA_LIM)) {
-    return FALSE;
+    { if (SUPER_VERBOSE) fprintf (stderr, "filter 12\n"); return FALSE; };
   }
   
@@ -1257 +1259 @@
   if (ImagSelect) {
     mag = PhotInst (measure, MAG_CLASS_PSF);
-    if (mag < ImagMin || mag > ImagMax) return FALSE;
+    if (mag < ImagMin || mag > ImagMax) { if (SUPER_VERBOSE) fprintf (stderr, "filter 13\n"); return FALSE; };
   }
   

trunk/Ohana/src/relastro/src/UpdateObjects.c

@@ -211 +211 @@
 
     if (average[0].flags & ID_STAR_USE_PAR) {
+      // get the best pm fit and chisq given the set of points (mask is respected)
       if (!FitPM (&fitPM, fitStats->fitdataPM, fitStats->points, fitStats->Npoints)) {
         myAbort ("oops");

trunk/Ohana/src/relastro/src/bcatalog.c

@@ -61 +61 @@
   }
 
+  int myNskip1 = 0, myNskip2 = 0, myNskip3 = 0, myNskip4 = 0, myNskip5 = 0, myNskip6 = 0;
+
   /* exclude stars not in range or with too few measurements */
   for (i = 0; i < catalog[0].Naverage; i++) {
     if (catalog[0].average[i].Nmeasure <= SRC_MEAS_TOOFEW) {
+      myNskip1 ++;
       continue;
     }
@@ -108 +111 @@
         REALLOCATE (subcatalog[0].secfilt, SecFilt, NAVERAGE*Nsecfilt);
       }
+      myNskip2 ++;
       continue;
     }
@@ -146 +150 @@
           Nskip1 ++;
         }
+        myNskip3 ++;
         continue;
       }
@@ -159 +164 @@
           Nskip2 ++;
         }
+        myNskip4 ++;
         continue;
       }
@@ -180 +186 @@
             free (date);
           }
+          myNskip5 ++;
           continue;
         }
@@ -220 +227 @@
     if (Nm <= SRC_MEAS_TOOFEW) {
       Nmeasure -= Nm;
+      myNskip6 ++;
       continue;
     }
@@ -230 +238 @@
     }
   }
+  fprintf (stderr, "skips: %d %d %d %d %d %d\n", myNskip1, myNskip2, myNskip3, myNskip4, myNskip5, myNskip6);
   REALLOCATE (subcatalog[0].average,  Average,     MAX (Naverage, 1));
   REALLOCATE (subcatalog[0].measureT, MeasureTiny, MAX (Nmeasure, 1));
@@ -244 +253 @@
     LimitDensityCatalog_ByNmeasureGrid (subcatalog, catalog);
   } else {
-    if (VERBOSE2) {
+    if (VERBOSE) {
       char *basename = filebasename (catalog[0].filename);
       fprintf (stderr, "subset of "OFF_T_FMT" ("OFF_T_FMT" total) stars, "OFF_T_FMT" ("OFF_T_FMT" total) measures for catalog %s\n", 

trunk/Ohana/src/relastro/src/fitpm.c

@@ -14 +14 @@
 # define N_STARS 3000
 # define N_POINTS 100
-# define N_OUTLIERS 100
+# define N_OUTLIERS 5
 # define N_BOOTSTRAP 100