Changeset 41672

Timestamp:

Jun 29, 2021, 11:13:17 AM (5 years ago)

Author:

eugene

Message:

add option to choose OLS or IRLS for the final pass

Location:

trunk/Ohana/src/relphot

Files:

• include/relphot.h (modified) (1 diff)
• src/args.c (modified) (2 diffs)
• src/setMrelCatalog.c (modified) (1 diff)

trunk/Ohana/src/relphot/include/relphot.h

@@ -428 +428 @@
 double CLOUD_TOLERANCE;
 int    VARIABILITY_STATS;
+int    USE_OLS_FOR_AVERAGES;
 
 int    PARALLEL;

trunk/Ohana/src/relphot/src/args.c

@@ -440 +440 @@
     remove_argument (N, &argc, argv);
     VARIABILITY_STATS = TRUE;
+  }
+  USE_OLS_FOR_AVERAGES = FALSE;
+  if ((N = get_argument (argc, argv, "-use-ols-for-averages"))) {
+    remove_argument (N, &argc, argv);
+    USE_OLS_FOR_AVERAGES = TRUE;
   }
 
@@ -876 +881 @@
     VARIABILITY_STATS = TRUE;
   }
+  USE_OLS_FOR_AVERAGES = FALSE;
+  if ((N = get_argument (argc, argv, "-use-ols-for-averages"))) {
+    remove_argument (N, &argc, argv);
+    USE_OLS_FOR_AVERAGES = TRUE;
+  }
 
   MIN_ERROR = 0.001;

trunk/Ohana/src/relphot/src/setMrelCatalog.c

@@ -81 +81 @@
   SetMrelInfoReset (results); // reset the counters
 
-  useOLS = UseStandardOLS (ZPT_STARS);
+  // XXX if we are iterating on the image zero points, we should use OLS
+  // until we have performed a few iterations.  UseStandardOLS() returns
+  // true (use OLS) or false depending on the zero point mode (TGROUP, MOSAIC, IMAGE) and the
+  // number of iterations.
+
+  // On the final pass (isSetMrelFinal), we should use OLS or IRLS depending on
+  // the user choice (USE_OLS_FOR_AVERAGES)
+
+  useOLS = isSetMrelFinal ? USE_OLS_FOR_AVERAGES : UseStandardOLS (ZPT_STARS);
   for (j = 0; j < catalog[Nc].Naverage; j++) {