Changeset 36800

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

Location:

branches/eam_branches/ipp-20140423/Ohana/src/relastro/src

Files:

• ImageOps.c (modified) (2 diffs)
• UpdateObjects.c (modified) (3 diffs)
• args.c (modified) (2 diffs)
• bcatalog.c (modified) (2 diffs)
• load_catalogs.c (modified) (3 diffs)

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

@@ -859 +859 @@
     N = 0;
     for (k = 0; k < catalog[0].average[j].Nmeasure; k++) {
-      //reset flag on each invocation
+      // reset flag on each invocation
       measure[k].dbFlags &= ~ID_MEAS_POOR_ASTROM;
 
@@ -898 +898 @@
   double *R, *D, *dR, *dD, *d2;
   StatType statsR, statsD;
+
+  // XXX we are not going to use this for now
+  return;
 
   Nsecfilt = GetPhotcodeNsecfilt();

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;

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

@@ -179 +179 @@
   FlagOutlier = FALSE;
   if ((N = get_argument (argc, argv, "-clip"))) {
+    fprintf (stderr, "-clip is currently disabled\n");
     remove_argument (N, &argc, argv);
     CLIP_THRESH = atof (argv[N]);
@@ -598 +599 @@
   FlagOutlier = FALSE;
   if ((N = get_argument (argc, argv, "-clip"))) {
+    fprintf (stderr, "-clip is currently disabled\n");
     remove_argument (N, &argc, argv);
     CLIP_THRESH = atof (argv[N]);

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

@@ -104 +104 @@
 
       // filter out outliers - these are detections inconsistent with the offset distribution
-      if (FlagOutlier && (catalog[0].measure[offset].dbFlags & ID_MEAS_POOR_ASTROM)) {
+      // XXX disable this for now
+      if (FALSE && FlagOutlier && (catalog[0].measure[offset].dbFlags & ID_MEAS_POOR_ASTROM)) {
         catalog[0].measure[offset].dbFlags &= ~ID_MEAS_USED_CHIP;
         if (FALSE && (abs(catalog[0].measure[offset].t - Tref) < 10) && (catalog[0].measure[offset].photcode == Cref)) {
@@ -122 +123 @@
           RD_to_XY (&Xi, &Yi, Ri, Di, &coords);
           double radius = hypot(Xi, Yi);
-          // XXX this radius needs to be configurable
           if (radius > ExcludeBogusRadius) {
               NskipBogus ++;

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

@@ -6 +6 @@
 Catalog *load_catalogs (SkyList *skylist, int *Ncatalog, int subselect, int hostID, char *hostpath) {
 
-  int i, j, k, m, Nstar;
+  int i, j, Nstar;
+  // int k, m;
   Catalog *catalog, *pcatalog, tcatalog;
 
@@ -73 +74 @@
       if (RESET) {
         for (j = 0; j < catalog[Ncat].Naverage; j++) {
+# if (0)          
           catalog[Ncat].average[j].flags = 0;
           m = catalog[Ncat].average[j].measureOffset;
@@ -78 +80 @@
             catalog[Ncat].measure[m+k].dbFlags = 0;
           }
+# endif
         }
       }