Fixed BEST_FROM_SIM=1 chi2 and best-fit SEDs.

cschreib · cschreib · commit e763bf7e70d0 · 2017-11-08T17:06:05.000+01:00
diff --git a/src/fast++-fitter.cpp b/src/fast++-fitter.cpp
@@ -344,7 +344,7 @@ void fitter_t::fit_galaxies(const model_t& model, uint_t i0, uint_t i1) {
             wsp.sfr.safe[i]  = scale*model.sfr;
         }
 
-        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]) {
@@ -422,7 +422,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);

Original file line number	Diff line number	Diff line change
`@@ -344,7 +344,7 @@ void fitter_t::fit_galaxies(const model_t& model, uint_t i0, uint_t i1) {`
`344`	`344`	`wsp.sfr.safe[i] = scale*model.sfr;`
`345`	`345`	`}`
`346`	`346`
`347`		`- if (!opts.best_from_sim && opts.parallel == parallel_choice::none) {`
	`347`	`+ if (opts.parallel == parallel_choice::none) {`
`348`	`348`	`// Compare to best`
`349`	`349`	`// WARNING: read/modify shared resource`
`350`	`350`	`if (output.best_chi2.safe[is] > wsp.chi2.safe[i]) {`
`@@ -422,7 +422,7 @@ void fitter_t::fit_galaxies(const model_t& model, uint_t i0, uint_t i1) {`
`422`	`422`	`}`
`423`	`423`	`}`
`424`	`424`
`425`		`- if (!opts.best_from_sim && opts.parallel != parallel_choice::none) {`
	`425`	`+ if (opts.parallel != parallel_choice::none) {`
`426`	`426`	`// Compare to best`
`427`	`427`	`// WARNING: read/modify shared resource`
`428`	`428`	`std::lock_guard<std::mutex> lock(output.fit_result_mutex);`