Fixed BEST_FROM_SIM=1 giving infinite chi2 and issues with best SEDs

Author: cschreib

src/fast++-fitter.cpp

@@ -528,14 +528,16 @@ void fitter_t::fit_galaxies(const model_t& model, uint_t i0, uint_t i1) {
             }
         }
 
-        if (!opts.best_from_sim && opts.parallel == parallel_choice::none) {
+        if (opts.parallel == parallel_choice::none) {
             // Compare to best
             // WARNING: read/modify shared resource
             if (output.best_chi2.safe[is]  > wsp.chi2.safe[i]) {
                 output.best_chi2.safe[is]  = wsp.chi2.safe[i];
                 output.best_model.safe[is] = model.igrid;
-                for (uint_t ip : range(model.props)) {
-                    output.best_params.safe(is,gridder.nparam+ip,0) = wsp.props.safe(i,ip);
+                if (!opts.best_from_sim) {
+                    for (uint_t ip : range(model.props)) {
+                        output.best_params.safe(is,gridder.nparam+ip,0) = wsp.props.safe(i,ip);
+                    }
                 }
             }
         }
@@ -630,7 +632,7 @@ void fitter_t::fit_galaxies(const model_t& model, uint_t i0, uint_t i1) {
         }
     }
 
-    if (!opts.best_from_sim && opts.parallel != parallel_choice::none) {
+    if (opts.parallel != parallel_choice::none) {
         // Compare to best
         // WARNING: read/modify shared resource
         std::lock_guard<std::mutex> lock(output.fit_result_mutex);
@@ -640,8 +642,10 @@ void fitter_t::fit_galaxies(const model_t& model, uint_t i0, uint_t i1) {
             if (output.best_chi2.safe[is]  > wsp.chi2[i]) {
                 output.best_chi2.safe[is]  = wsp.chi2[i];
                 output.best_model.safe[is] = model.igrid;
-                for (uint_t ip : range(model.props)) {
-                    output.best_params.safe(is,gridder.nparam+ip,0) = wsp.props.safe(i,ip);
+                if (!opts.best_from_sim) {
+                    for (uint_t ip : range(model.props)) {
+                        output.best_params.safe(is,gridder.nparam+ip,0) = wsp.props.safe(i,ip);
+                    }
                 }
             }
         }