diff --git a/Data-Analyzer/+Analyzer/fitTwoGaussianCurvesToRadialSpectralDistribution.m b/Data-Analyzer/+Analyzer/fitTwoGaussianCurvesToRadialSpectralDistribution.m index c826ab8..875798d 100644 --- a/Data-Analyzer/+Analyzer/fitTwoGaussianCurvesToRadialSpectralDistribution.m +++ b/Data-Analyzer/+Analyzer/fitTwoGaussianCurvesToRadialSpectralDistribution.m @@ -86,7 +86,7 @@ function [fitResults, rawCurves] = fitTwoGaussianCurvesToRadialSpectralDistribut sigma2_guess = 0.1 * kSecondary; p0 = [A1_guess, mu1_guess, sigma1_guess, A2_guess, mu2_guess, sigma2_guess]; else - p0 = [opts.AmplitudeRange(2), 0, 0.1, 0.01, opts.KRhoRange(2)/3, 0.1]; + p0 = [opts.AmplitudeRange(2), 0, 0.1, 0.001, opts.KRhoRange(2)/2, 0.1]; end lb = [0, 0, 1e-6, 0, opts.PositionThreshold, 1e-6]; @@ -95,7 +95,7 @@ function [fitResults, rawCurves] = fitTwoGaussianCurvesToRadialSpectralDistribut 'MaxFunctionEvaluations',1e4,'MaxIterations',1e4); pFit = lsqcurvefit(twoGauss, p0, kVals(:), x(:), lb, ub, optsLSQ); - if pFit(4) <= 1e-3 + if pFit(4) <= 1e-4 pFit(4) = 0; pFit(5:6) = NaN; end diff --git a/Data-Analyzer/+Analyzer/runInteractiveASDTwoGaussianFitGUI.m b/Data-Analyzer/+Analyzer/runInteractiveASDTwoGaussianFitGUI.m index f4fd164..3b079d9 100644 --- a/Data-Analyzer/+Analyzer/runInteractiveASDTwoGaussianFitGUI.m +++ b/Data-Analyzer/+Analyzer/runInteractiveASDTwoGaussianFitGUI.m @@ -203,8 +203,6 @@ function runInteractiveASDTwoGaussianFitGUI(spectral_analysis_results) end end - set(gca, 'YScale', 'log'); - title(hAx,sprintf('Curve %d / %d', idx, Ncurves),'FontSize',16); legend(hAx,'Location','northeast','FontSize',14); hold(hAx,'off'); diff --git a/Data-Analyzer/+Analyzer/runInteractiveRSDTwoGaussianFitGUI.m b/Data-Analyzer/+Analyzer/runInteractiveRSDTwoGaussianFitGUI.m index a1766e1..5b9acb9 100644 --- a/Data-Analyzer/+Analyzer/runInteractiveRSDTwoGaussianFitGUI.m +++ b/Data-Analyzer/+Analyzer/runInteractiveRSDTwoGaussianFitGUI.m @@ -32,7 +32,7 @@ function runInteractiveRSDTwoGaussianFitGUI(spectral_analysis_results) % Default fit parameters params.KRhoRange = [0, 3]; - params.AmplitudeRange = [0, 0.5]; + params.AmplitudeRange = [0, 0.3]; params.ResidualThreshold = 0.15; params.PositionThreshold = 0.5; params.AmplitudeThreshold = 0.015; diff --git a/Data-Analyzer/+Scripts/BECToDroplets/runRadialSpectralDistributionAnalysis.m b/Data-Analyzer/+Scripts/BECToDroplets/runRadialSpectralDistributionAnalysis.m index 76c2e09..42dbe0a 100644 --- a/Data-Analyzer/+Scripts/BECToDroplets/runRadialSpectralDistributionAnalysis.m +++ b/Data-Analyzer/+Scripts/BECToDroplets/runRadialSpectralDistributionAnalysis.m @@ -117,7 +117,7 @@ Plotter.plotSpectralCurves( ... spectral_analysis_results.S_k_all, ... % radial spectral curves spectral_analysis_results.k_rho_vals, ... % corresponding k_rho values 'KRhoRange', [0, 3], ... % truncate curves to 0 <= k_rho <= 3 - 'AmplitudeRange', [0, 0.5], ... % truncate curves to y >= 0 (all amplitudes) + 'AmplitudeRange', [0, 0.3], ... % truncate curves to y >= 0 (all amplitudes) 'ResidualThreshold', 0.15, ... % maximum allowed residual 'PositionThreshold', 0.5, ... % minimum separation between peaks 'AmplitudeThreshold', 0.015); % minimum secondary peak fraction @@ -149,7 +149,7 @@ Plotter.plotFitParameterPDF(fitResults, scan_reference_values, 'A2', ... 'NormalizeHistogram', true, ... 'Colormap', @Colormaps.coolwarm, ... 'XLim', [min(scan_reference_values), max(scan_reference_values)], ... - 'YLim', [0, 0.06]); + 'YLim', [0, 0.025]); %% ------------------ 4. Plot fit parameters - position ------------------ Plotter.plotFitParameterPDF(fitResults, scan_reference_values, 'mu2', ... @@ -167,7 +167,7 @@ Plotter.plotFitParameterPDF(fitResults, scan_reference_values, 'mu2', ... 'NormalizeHistogram', true, ... 'Colormap', @Colormaps.coolwarm, ... 'XLim', [min(scan_reference_values), max(scan_reference_values)], ... - 'YLim', [1, 2]); + 'YLim', [0, 3]); %% ------------------ 5. Plot fit parameters - width ------------------ Plotter.plotFitParameterPDF(fitResults, scan_reference_values, 'sigma2', ... 'Title', options.titleString, ... diff --git a/Data-Analyzer/+Scripts/BECToDropletsToStripes/runRadialSpectralDistributionAnalysis.m b/Data-Analyzer/+Scripts/BECToDropletsToStripes/runRadialSpectralDistributionAnalysis.m index cdac9f9..362aa52 100644 --- a/Data-Analyzer/+Scripts/BECToDropletsToStripes/runRadialSpectralDistributionAnalysis.m +++ b/Data-Analyzer/+Scripts/BECToDropletsToStripes/runRadialSpectralDistributionAnalysis.m @@ -149,7 +149,7 @@ Plotter.plotFitParameterPDF(fitResults, scan_reference_values, 'A2', ... 'NormalizeHistogram', true, ... 'Colormap', @Colormaps.coolwarm, ... 'XLim', [min(scan_reference_values), max(scan_reference_values)], ... - 'YLim', [0, 0.025]); + 'YLim', [0, 0.055]); %% ------------------ 4. Plot fit parameters - position ------------------ Plotter.plotFitParameterPDF(fitResults, scan_reference_values, 'mu2', ... @@ -167,7 +167,7 @@ Plotter.plotFitParameterPDF(fitResults, scan_reference_values, 'mu2', ... 'NormalizeHistogram', true, ... 'Colormap', @Colormaps.coolwarm, ... 'XLim', [min(scan_reference_values), max(scan_reference_values)], ... - 'YLim', [1, 2]); + 'YLim', [0, 2]); %% ------------------ 5. Plot fit parameters - width ------------------ Plotter.plotFitParameterPDF(fitResults, scan_reference_values, 'sigma2', ... 'Title', options.titleString, ... diff --git a/Data-Analyzer/+Scripts/BECToStripes/runRadialSpectralDistributionAnalysis.m b/Data-Analyzer/+Scripts/BECToStripes/runRadialSpectralDistributionAnalysis.m index f0807bb..41d66d6 100644 --- a/Data-Analyzer/+Scripts/BECToStripes/runRadialSpectralDistributionAnalysis.m +++ b/Data-Analyzer/+Scripts/BECToStripes/runRadialSpectralDistributionAnalysis.m @@ -149,7 +149,7 @@ Plotter.plotFitParameterPDF(fitResults, scan_reference_values, 'A2', ... 'NormalizeHistogram', true, ... 'Colormap', @Colormaps.coolwarm, ... 'XLim', [min(scan_reference_values), max(scan_reference_values)], ... - 'YLim', [0, 0.06]); + 'YLim', [0, 0.025]); %% ------------------ 4. Plot fit parameters - position ------------------ Plotter.plotFitParameterPDF(fitResults, scan_reference_values, 'mu2', ... @@ -167,7 +167,7 @@ Plotter.plotFitParameterPDF(fitResults, scan_reference_values, 'mu2', ... 'NormalizeHistogram', true, ... 'Colormap', @Colormaps.coolwarm, ... 'XLim', [min(scan_reference_values), max(scan_reference_values)], ... - 'YLim', [1, 2]); + 'YLim', [0, 2]); %% ------------------ 5. Plot fit parameters - width ------------------ Plotter.plotFitParameterPDF(fitResults, scan_reference_values, 'sigma2', ... 'Title', options.titleString, ... diff --git a/Data-Analyzer/+Scripts/BECToStripesToDroplets/runRadialSpectralDistributionAnalysis.m b/Data-Analyzer/+Scripts/BECToStripesToDroplets/runRadialSpectralDistributionAnalysis.m index 5211b80..228bd2b 100644 --- a/Data-Analyzer/+Scripts/BECToStripesToDroplets/runRadialSpectralDistributionAnalysis.m +++ b/Data-Analyzer/+Scripts/BECToStripesToDroplets/runRadialSpectralDistributionAnalysis.m @@ -149,7 +149,7 @@ Plotter.plotFitParameterPDF(fitResults, scan_reference_values, 'A2', ... 'NormalizeHistogram', true, ... 'Colormap', @Colormaps.coolwarm, ... 'XLim', [min(scan_reference_values), max(scan_reference_values)], ... - 'YLim', [0, 0.06]); + 'YLim', [0, 0.055]); %% ------------------ 4. Plot fit parameters - position ------------------ Plotter.plotFitParameterPDF(fitResults, scan_reference_values, 'mu2', ... @@ -167,7 +167,7 @@ Plotter.plotFitParameterPDF(fitResults, scan_reference_values, 'mu2', ... 'NormalizeHistogram', true, ... 'Colormap', @Colormaps.coolwarm, ... 'XLim', [min(scan_reference_values), max(scan_reference_values)], ... - 'YLim', [1, 2]); + 'YLim', [0, 2]); %% ------------------ 5. Plot fit parameters - width ------------------ Plotter.plotFitParameterPDF(fitResults, scan_reference_values, 'sigma2', ... 'Title', options.titleString, ...