Changeset 39747

Timestamp:

Oct 11, 2016, 8:40:34 AM (10 years ago)

Author:

eugene

Message:

add USE_IRLS

Location:

branches/czw_branch/20160809/Ohana/src/relastro

Files:

• include/relastro.h (modified) (1 diff)
• src/BootstrapOps.c (modified) (1 diff)
• src/UpdateObjects.c (modified) (6 diffs)
• src/args.c (modified) (1 diff)
• src/relastro_images.c (modified) (2 diffs)

branches/czw_branch/20160809/Ohana/src/relastro/include/relastro.h

@@ -453 +453 @@
 
 FitMode FIT_MODE;
+int USE_IRLS;
+int ALLOW_IRLS;
 
 RelastroOp RELASTRO_OP;

branches/czw_branch/20160809/Ohana/src/relastro/src/BootstrapOps.c

@@ -77 +77 @@
     case FIT_RESULT_RA:
       // result->Ro = median;
-      result->dRo = sigma;
+      result->dRo = MAX(sigma, result->dRo);
       break;
     case FIT_RESULT_DEC:
       // result->Do = median;
-      result->dDo = sigma;
+      result->dDo = MAX(sigma, result->dDo);
       break;
     case FIT_RESULT_uR:
       // result->uR = median;
-      result->duR = sigma;
+      result->duR = MAX(sigma, result->duR);
       break;
     case FIT_RESULT_uD:
       // result->uD = median;
-      result->duD = sigma;
+      result->duD = MAX(sigma, result->duD);
       break;
     case FIT_RESULT_PLX:
       // result->p = median;
-      result->dp = sigma;
+      result->dp = MAX(sigma, result->dp);
       break;
     default:

branches/czw_branch/20160809/Ohana/src/relastro/src/UpdateObjects.c

@@ -200 +200 @@
     // then run N_BOOTSTRAP_SAMPLES to measure the errors
     fitStats->fitdataPar->getError = !N_BOOTSTRAP_SAMPLES;
-    if (!FitPMandPar_IRLS (&fitPar, fitStats->fitdataPar, fitStats->points, fitStats->Npoints)) {
-      mode = FIT_PM_ONLY;
-      goto skipParallax;
-    }
-
-    if (N_BOOTSTRAP_SAMPLES) {
+    if (USE_IRLS) {
+      if (!FitPMandPar_IRLS (&fitPar, fitStats->fitdataPar, fitStats->points, fitStats->Npoints)) {
+        mode = FIT_PM_ONLY;
+        goto skipParallax;
+      }
+    } else {
+      if (!FitPMandPar_Basic (&fitPar, fitStats->fitdataPar, fitStats->points, fitStats->Npoints)) {
+        mode = FIT_PM_ONLY;
+        goto skipParallax;
+      }
+    }
+
+    // in the fits above, we have saved the formal error for the unmasked points.  
+    // if we do not have enough points for bootstrap, we will keep those errors
+    if (N_BOOTSTRAP_SAMPLES && (fitPar.Nfit >= PAR_MIN_NPTS_BOOT)) {
       fitStats->Nfit = 0;
       int Nnomask = BootstrapSaveUnmasked (fitStats->nomask, fitStats->points, fitStats->Npoints);
@@ -218 +227 @@
         fitStats->Nfit ++;
       }
-      // these calls set the ERRORS on the fit parameters, not the fit values (set in IRLS above)
+      // These calls set the ERRORS on the fit parameters, not the fit values (set in IRLS above)
+      // this call expects the fitted parameters to have the formal error set: it will apply the 
+      // max of the formal and bootstrap errors
       BootstrapRobustStats (&fitPar, fitStats->fit, fitStats->Nfit, FIT_RESULT_RA);
       BootstrapRobustStats (&fitPar, fitStats->fit, fitStats->Nfit, FIT_RESULT_DEC);
@@ -273 +284 @@
     } else {
       fitStats->fitdataPM->getError = !N_BOOTSTRAP_SAMPLES;
-      if (!FitPM_IRLS (&fitPM, fitStats->fitdataPM, fitStats->points, fitStats->Npoints)) {
-        mode = FIT_AVERAGE;
-        goto justPosition;
-      }
-      if (N_BOOTSTRAP_SAMPLES) {
+      if (USE_IRLS) {
+        if (!FitPM_IRLS (&fitPM, fitStats->fitdataPM, fitStats->points, fitStats->Npoints)) {
+          mode = FIT_AVERAGE;
+          goto justPosition;
+        }
+      } else {
+        if (!FitPM_Basic (&fitPM, fitStats->fitdataPM, fitStats->points, fitStats->Npoints)) {
+          mode = FIT_AVERAGE;
+          goto justPosition;
+        }
+      }
+
+    // in the fits above, we have saved the formal error for the unmasked points.  
+    // if we do not have enough points for bootstrap, we will keep those errors
+      if (N_BOOTSTRAP_SAMPLES && (fitPM.Nfit >= PM_MIN_NPTS_BOOT)) {
         fitStats->Nfit = 0;
         int Nnomask = BootstrapSaveUnmasked (fitStats->nomask, fitStats->points, fitStats->Npoints);
@@ -289 +310 @@
           fitStats->Nfit ++;
         }
+      // These calls set the ERRORS on the fit parameters, not the fit values (set in IRLS above)
+      // this call expects the fitted parameters to have the formal error set: it will apply the 
+      // max of the formal and bootstrap errors
         BootstrapRobustStats (&fitPM, fitStats->fit, fitStats->Nfit, FIT_RESULT_RA);
         BootstrapRobustStats (&fitPM, fitStats->fit, fitStats->Nfit, FIT_RESULT_DEC);
@@ -343 +367 @@
         goto useBasic;
       }
-      if (!FitPosPMfixed_IRLS (&fitPos, fitStats->fitdataPos, fitStats->points, fitStats->Npoints)) {
-        // if the above fails, we need to clear the masks and try again below
-        FitPointsClearMasks (fitStats->points, fitStats->Npoints); 
-        // just calculate the weighted average
+      if (USE_IRLS) {
+        if (!FitPosPMfixed_IRLS (&fitPos, fitStats->fitdataPos, fitStats->points, fitStats->Npoints)) {
+          // if the above fails, we need to clear the masks and try again below
+          FitPointsClearMasks (fitStats->points, fitStats->Npoints); 
+          // just calculate the weighted average
+          if (!FitPosPMfixed_Basic (&fitPos, fitStats->fitdataPos, fitStats->points, fitStats->Npoints)) { 
+            // if this fails, find a single unmasked point below
+            goto doneWithFit;
+          }
+          average[0].flags |= ID_OBJ_USE_AVE;
+          average[0].flags |= ID_OBJ_RAW_AVE;
+          goto useBasic;
+        }
+      } else {
         if (!FitPosPMfixed_Basic (&fitPos, fitStats->fitdataPos, fitStats->points, fitStats->Npoints)) { 
           // if this fails, find a single unmasked point below
@@ -360 +394 @@
         int Nnomask = BootstrapSaveUnmasked (fitStats->nomask, fitStats->points, fitStats->Npoints);
         if (Nnomask < POS_MIN_NPTS_BOOT) {
-          // if the above fails, we need to clear the masks and try again below
+          // XXX if the above fails, accept the formal error from unmasked points?
           FitPointsClearMasks (fitStats->points, fitStats->Npoints); 
           if (!FitPosPMfixed_Basic (&fitPos, fitStats->fitdataPos, fitStats->points, fitStats->Npoints)) { 

branches/czw_branch/20160809/Ohana/src/relastro/src/args.c

@@ -176 +176 @@
       exit (2);
     }
+  }
+
+  // for fitting objects, this is always the same as 'ALLOW_IRLS' below, but for fitting
+  // images, this is set to FALSE while doing the fit for the image parameters
+  USE_IRLS = TRUE;  
+  ALLOW_IRLS = TRUE;
+  if ((N = get_argument (argc, argv, "-no-irls"))) {
+    remove_argument (N, &argc, argv);
+    USE_IRLS = FALSE;
+    ALLOW_IRLS = FALSE;
   }
 

branches/czw_branch/20160809/Ohana/src/relastro/src/relastro_images.c

@@ -64 +64 @@
 
   // XXX NOTE : for 2mass reset, photcodesKeep should now limit to 2MASS measurements
+
+  USE_IRLS = FALSE;  // do not use IRLS yet -- leads to excessive outlier rejections in the loops
 
   /* major modes */
@@ -161 +163 @@
   // iterate over catalogs to make detection coordinates consistant
   if (APPLY_OFFSETS) {
+    USE_IRLS = ALLOW_IRLS;  // now that we have fitted the images, choose the user's option
     UpdateObjectOffsets (skylist, 0, NULL);
   }