Changeset 36800 for branches/eam_branches/ipp-20140423/Ohana/src/relastro/src/UpdateObjects.c

Timestamp:

Jun 2, 2014, 2:20:19 PM (12 years ago)

Author:

eugene

Message:

exclude bogus measurements (dRadius > 2.0) before solving for object parameters

File:

• branches/eam_branches/ipp-20140423/Ohana/src/relastro/src/UpdateObjects.c (modified) (3 diffs)

branches/eam_branches/ipp-20140423/Ohana/src/relastro/src/UpdateObjects.c

@@ -140 +140 @@
         // does the measurement pass the supplied filtering constraints?
         // MeasFilterTestTiny does not test psfQF
+        // exclude bad detections based on: photcodes, psfQF, time range, photflags & astromBadMask, mag_inst
         int keepMeasure = measureBig ? MeasFilterTest(&measureBig[k], FALSE) : MeasFilterTestTiny(&measure[k], FALSE);
         if (!keepMeasure) {
@@ -147 +148 @@
         }
 
+        // mark (as POOR) any measurements which are deviant from the mean by > ExcludeBogusRadius
+        if (ExcludeBogus) {
+          double Ri = getMeanR (&measure[k], &catalog[i].average[j], &catalog[i].secfilt[j*Nsecfilt]);
+          double Di = getMeanD (&measure[k], &catalog[i].average[j], &catalog[i].secfilt[j*Nsecfilt]);
+          coords.crval1 = catalog[i].average[j].R;
+          coords.crval2 = catalog[i].average[j].D;
+          double Xi, Yi;
+          RD_to_XY (&Xi, &Yi, Ri, Di, &coords);
+          double radius = hypot(Xi, Yi);
+          if (radius > ExcludeBogusRadius) {
+              measure[k].dbFlags &= ~ID_MEAS_USED_OBJ;
+              if (measureBig) { measureBig[k].dbFlags &= ~ID_MEAS_USED_OBJ; }
+              measure[k].dbFlags |= ID_MEAS_POOR_ASTROM;
+              if (measureBig) { measureBig[k].dbFlags |= ID_MEAS_POOR_ASTROM; }
+              continue;
+          }
+          measure[k].dbFlags &= ~ID_MEAS_POOR_ASTROM;
+          if (measureBig) { measureBig[k].dbFlags &= ~ID_MEAS_POOR_ASTROM; }
+        }
+
         // outlier rejection
-        if (FlagOutlier && (measure[k].dbFlags & ID_MEAS_POOR_ASTROM)) {
+        if (FALSE && FlagOutlier && (measure[k].dbFlags & ID_MEAS_POOR_ASTROM)) {
           measure[k].dbFlags &= ~ID_MEAS_USED_OBJ;
           if (measureBig) { measureBig[k].dbFlags &= ~ID_MEAS_USED_OBJ; }
@@ -271 +292 @@
 
       if (mode == FIT_PM_AND_PAR) {
-        // fprintf (stderr, "parallax fitting is still untested (%s, %d)\n", __FILE__, __LINE__);
-
         float pXmin = +2.0;
         float pXmax = -2.0;