Changeset 25027 for branches/pap/Ohana/src/relastro/src/FitChip.c

Timestamp:

Aug 7, 2009, 4:08:25 PM (17 years ago)

Author:

Paul Price

Message:

Merging trunk (r25026) to get up-to-date on old branch.

Location:

branches/pap

Files:

• . (modified) (1 prop)
• Ohana (modified) (1 prop)
• Ohana/src/relastro/src/FitChip.c (modified) (9 diffs)

branches/pap/Ohana/src/relastro/src/FitChip.c

@@ -1 +1 @@
 # include "relastro.h"
+# include "relastroVisual.h"
 
 // XXX make these user parameters
@@ -5 +6 @@
 # define FIT_CHIP_NITER     3
 # define FIT_CHIP_NSIGMA    3.0
+
 
 // XXX we should test if the fit is sufficiently constrained across the chip, or if the
@@ -22 +24 @@
 
   ALLOCATE (values, double, Nmatch);
-
   for (Niter = 0; Niter < FIT_CHIP_NITER; Niter ++) {
 
@@ -28 +29 @@
     for (i = Nscatter = 0; i < Nmatch; i++) {
       if (raw[i].mask) continue;
-      if (raw[i].dMag > FIT_CHIP_MAX_ERROR) continue;
+      if (isnan(raw[i].dMag) || raw[i].dMag > FIT_CHIP_MAX_ERROR) continue;
 
       dL = raw[i].L - ref[i].L;
       dM = raw[i].M - ref[i].M;
       dR = hypot (dL, dM);
-    
+
       values[Nscatter] = dR;
       Nscatter++;
@@ -41 +42 @@
     dsort (values, Nscatter);
     dRmax = FIT_CHIP_NSIGMA*values[(int)(0.40*Nscatter)];
+    relastroVisualPlotScatter(values, dRmax, Nscatter);
+    relastroVisualPlotRawRef(raw, ref, dRmax, Nmatch);
 
     // fit the requested order polynomial
@@ -50 +53 @@
     // generate the fit matches
     for (i = 0; i < Nmatch; i++) {
-      if (raw[i].mask) continue;
+      if (raw[i].mask) {
+        continue;
+      }
+      if (isnan(raw[i].dMag) || raw[i].dMag > FIT_CHIP_MAX_ERROR) {
+        continue;
+      }
 
       // only keep objects within dRmax
@@ -57 +65 @@
       dR = hypot (dL, dM);
       if (dR > dRmax) continue;
-    
+
       fit_add (fit, raw[i].X, raw[i].Y, ref[i].L, ref[i].M, raw[i].dPos);
     }
@@ -66 +74 @@
       case 0:
       case 1:
-        skip = (fit[0].Npts < 8);
-        break;
+        skip = (fit[0].Npts < 8);
+        break;
       case 2:
-        skip = (fit[0].Npts < 11);
-        break;
+        skip = (fit[0].Npts < 11);
+        break;
       case 3:
-        skip = (fit[0].Npts < 15);
-        break;
+        skip = (fit[0].Npts < 15);
+        break;
       default:
-        fprintf (stderr, "invalid chip order %d\n", coords[0].Npolyterms);
-        abort ();
+        fprintf (stderr, "invalid chip order %d\n", coords[0].Npolyterms);
+        abort ();
     }
     if (skip) {
@@ -95 +103 @@
       XY_to_LM (&raw[i].L, &raw[i].M, raw[i].X, raw[i].Y, coords);
     }
+
   }