Author: gegorbet Date: 2019-05-07 02:13:23 +0000 (Tue, 07 May 2019) New Revision: 2756 Modified: trunk/programs/us_mpi_analysis/us_mpi_analysis.cpp Log: fix backend mpi_analysis to handle no edit bottom when doing a fit-bottom Modified: trunk/programs/us_mpi_analysis/us_mpi_analysis.cpp =================================================================== --- trunk/programs/us_mpi_analysis/us_mpi_analysis.cpp 2019-05-03 19:53:00 UTC (rev 2755) +++ trunk/programs/us_mpi_analysis/us_mpi_analysis.cpp 2019-05-07 02:13:23 UTC (rev 2756) @@ -455,8 +455,17 @@ // Calculate bottom values bottom_values.resize( bottom_points ); - double bottom_start = data_sets[ 0 ]->run_data.bottom - - bottom_range / 2.0; + // Use bottom from edited data if it is given + US_SolveSim::DataSet* ds = data_sets[ 0 ]; + double bottom_ds = ds->run_data.bottom; + if ( bottom_ds == 0.0 ) + { + double rpm = ds->run_data.scanData[ 0 ].rpm; + bottom_ds = US_AstfemMath::calc_bottom( rpm, + ds->centerpiece_bottom, + ds->rotor_stretch ); + } + double bottom_start = bottom_ds - bottom_range / 2.0; double dbot = fit_bott ? ( bottom_range / ( bottom_points - 1 ) ) :