Changeset 33621

Timestamp:

Mar 29, 2012, 2:19:40 PM (14 years ago)

Author:

eugene

Message:

only run parallax analysis on objects with large enough parallax factor

Location:

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

Files:

• include/relastro.h (modified) (1 diff)
• src/ConfigInit.c (modified) (1 diff)
• src/UpdateObjects.c (modified) (1 diff)

branches/eam_branches/ipp-20111122/Ohana/src/relastro/include/relastro.h

@@ -169 +169 @@
 int    PM_TOOFEW;
 double PM_DT_MIN;
+double PAR_FACTOR_MIN;
 int    PLOTDELAY;
 int    CHIPORDER;

branches/eam_branches/ipp-20111122/Ohana/src/relastro/src/ConfigInit.c

@@ -29 +29 @@
   GetConfig (config, "PM_TOOFEW",              "%d",  0, &PM_TOOFEW);
   GetConfig (config, "POS_TOOFEW",             "%d",  0, &POS_TOOFEW);
+
+  GetConfig (config, "PAR_FACTOR_MIN",         "%lf", 0, &PAR_FACTOR_MIN);
 
   GetConfig (config, "RELASTRO_MAP_NX",        "%d",  0, &NX_MAP);

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

@@ -241 +241 @@
         // fprintf (stderr, "parallax fitting is still untested (%s, %d)\n", __FILE__, __LINE__);
 
+        float pXmin = +2.0;
+        float pXmax = -2.0;
+        float pYmin = +2.0;
+        float pYmax = -2.0;
         for (k = 0; k < N; k++) {
           ParFactor (&pX[k], &pY[k], R[k], D[k], T[k], Tmean);
-        }
-        FitPMandPar (&fitPAR, X, dX, Y, dY, T, pX, pY, N, XVERB);
-        XY_to_RD (&fitPAR.Ro, &fitPAR.Do, fitPAR.Ro, fitPAR.Do, &coords);
-        catalog[i].average[j].flags |= ID_STAR_FIT_PAR;
-        Npar ++;
+          pXmin = MIN (pXmin, pX[k]);
+          pXmax = MAX (pXmax, pX[k]);
+          pYmin = MIN (pYmin, pY[k]);
+          pYmax = MAX (pYmax, pY[k]);
+        }
+        float dXRange = pXmax - pXmin;
+        float dYRange = pYmax - pYmin;
+        float parRange = hypot (dXRange, dYRange);
+        
+        if (parRange >= PAR_FACTOR_MIN) {
+          FitPMandPar (&fitPAR, X, dX, Y, dY, T, pX, pY, N, XVERB);
+          XY_to_RD (&fitPAR.Ro, &fitPAR.Do, fitPAR.Ro, fitPAR.Do, &coords);
+          catalog[i].average[j].flags |= ID_STAR_FIT_PAR;
+          Npar ++;
+        }
       }