Merge branch 'master' of github.com:cschreib/fastpp

Author: cschreib

src/fast++-fitter.cpp

@@ -64,6 +64,8 @@ fitter_t::fitter_t(const options_t& opt, const input_state_t& inp, const gridder
         uint_t ilow = 1 + 2*ic + 0;
         uint_t iup  = 1 + 2*ic + 1;
 
+        bool error_shown = false;
+
         for (uint_t is : range(input.id)) {
             if (is_finite(input.zphot.safe(is,ilow)) && is_finite(input.zphot.safe(is,iup))) {
                 // Get range from zlow and zup
@@ -77,9 +79,15 @@ fitter_t::fitter_t(const options_t& opt, const input_state_t& inp, const gridder
                         input.zphot.safe(is,0), ") falls outside of the chosen confidence "
                         "interval (", input.zphot.safe(is,ilow), " to ", input.zphot.safe(is,iup),
                         ")");
+                    error_shown = true;
                 }
             }
         }
+
+        if (error_shown) {
+            warning("for these galaxies, the confidence intervals may not be consistent with "
+                "the best fit values");
+        }
     }
 
     for (uint_t is : range(input.id)) {

src/fast++-read_input.cpp

@@ -753,20 +753,6 @@ bool read_fluxes(const options_t& opts, input_state_t& state) {
         ++gid;
     }
 
-    if (col_zspec != npos) {
-        // Check that zspecs are covered by the redshift grid
-        if (min(state.zspec) < opts.z_min) {
-            error("the smallest z_spec is outside of the grid (", min(state.zspec),
-                " vs. ", opts.z_min, ")");
-            return false;
-        }
-        if (max(state.zspec) > opts.z_max) {
-            error("the largest z_spec is outside of the grid (", max(state.zspec),
-                " vs. ", opts.z_max, ")");
-            return false;
-        }
-    }
-
     // Convert photometry from [catalog unit] to [uJy]
     float abzp = e10(0.4*(23.9 - opts.ab_zeropoint));
     // Convert photometry from fnu [uJy] to flambda [1e-19 x erg/s/cm2/A]
@@ -1255,30 +1241,6 @@ bool read_photoz(const options_t& opts, input_state_t& state) {
         return false;
     }
 
-    // Check that zspecs are covered by the redshift grid
-    if (min(state.zspec) < opts.z_min) {
-        error("the smallest z_spec is outside of the grid ", min(state.zspec),
-            " vs. ", opts.z_min, ")");
-        return false;
-    }
-    if (max(state.zspec) > opts.z_max) {
-        error("the largest z_spec is outside of the grid ", max(state.zspec),
-            " vs. ", opts.z_max, ")");
-        return false;
-    }
-
-    // Check that zphots are covered by the redshift grid
-    if (min(state.zphot(_,0)) < opts.z_min) {
-        error("the smallest z_phot is outside of the grid ", min(state.zphot(_,0)),
-            " vs. ", opts.z_min, ")");
-        return false;
-    }
-    if (max(state.zphot(_,0)) > opts.z_max) {
-        error("the largest z_phot is outside of the grid ", max(state.zphot(_,0)),
-            " vs. ", opts.z_max, ")");
-        return false;
-    }
-
     return true;
 }
 
@@ -1401,6 +1363,58 @@ bool read_template_error(const options_t& opts, input_state_t& state) {
     return true;
 }
 
+bool check_input(options_t& opts, input_state_t& state) {
+    if (!state.zspec.empty()) {
+        // Check that zspecs are covered by the redshift grid
+        vec1u idb = where(state.zspec < opts.z_min);
+        if (!idb.empty()) {
+            warning("found ", idb.size(), " galaxies with z_spec lower than "
+                "the minimum value of the grid (z < ", opts.z_min, ")");
+            warning("will put them at z=", opts.z_min);
+
+            state.zspec[idb] = opts.z_min;
+        }
+
+        idb = where(state.zspec > opts.z_max);
+        if (!idb.empty()) {
+            warning("found ", idb.size(), " galaxies with z_spec lower than "
+                "the minimum value of the grid (z < ", opts.z_min, ")");
+            warning("will put them at z=", opts.z_min);
+
+            state.zspec[idb] = opts.z_max;
+        }
+    }
+
+    if (!state.zphot.empty()) {
+        // Check that zphots are covered by the redshift grid
+        for (uint_t c : range(state.zphot.dims[1])) {
+            vec1u idb = where(state.zphot(_,c) < opts.z_min);
+            if (!idb.empty()) {
+                if (c == 0) {
+                    warning("found ", idb.size(), " galaxies with z_phot lower than "
+                        "the minimum value of the grid (z < ", opts.z_min, ")");
+                    warning("will put them at z=", opts.z_min);
+                }
+
+                state.zphot(idb,c) = opts.z_min;
+            }
+
+            idb = where(state.zphot(_,c) > opts.z_max);
+            if (!idb.empty()) {
+                if (c == 0) {
+                    warning("found ", idb.size(), " galaxies with z_phot lower than "
+                        "the minimum value of the grid (z < ", opts.z_min, ")");
+                    warning("will put them at z=", opts.z_min);
+                }
+
+                state.zphot(idb,c) = opts.z_max;
+            }
+        }
+    }
+
+    return true;
+}
+
 bool read_input(options_t& opts, input_state_t& state, const std::string& filename) {
     // First read options from the parameter file
     if (!read_params(opts, state, filename)) {
@@ -1432,5 +1446,10 @@ bool read_input(options_t& opts, input_state_t& state, const std::string& filena
         return false;
     }
 
+    // Check and adjust input
+    if (!check_input(opts, state)) {
+        return false;
+    }
+
     return true;
 }