diff --git a/Fit classes/@MyMechExponentialFit/MyMechExponentialFit.m b/Fit classes/@MyMechExponentialFit/MyMechExponentialFit.m index 9a02d7e..8ed4430 100644 --- a/Fit classes/@MyMechExponentialFit/MyMechExponentialFit.m +++ b/Fit classes/@MyMechExponentialFit/MyMechExponentialFit.m @@ -1,30 +1,30 @@ % Exponential fit with user parameters defined for convenient % characterization of mechanical resonators classdef MyMechExponentialFit < MyExponentialFit methods (Access = protected) function createUserParamList(this) addUserParam(this, 'tau', 'title', '\tau (s)', ... 'editable', 'off') addUserParam(this, 'lw', 'title', 'Linewidth (Hz)', ... 'editable', 'off'); % Frequency at must be inputed by user addUserParam(this, 'freq', 'title', 'Frequency (MHz)', ... 'editable', 'on', 'default', 1) - addUserParam(this, 'Q', 'title', 'Qualify Factor (x10^6)', ... + addUserParam(this, 'Q', 'title', 'Quality Factor (x10^6)', ... 'editable', 'off'); addUserParam(this, 'Qf', 'title', 'Q\times f (10^{14} Hz)', ... 'editable', 'off'); end %Function for calculating the parameters shown in the user panel function calcUserParams(this) this.tau=abs(1/this.param_vals(2)); this.lw=abs(this.param_vals(2)/pi); this.Q=pi*this.freq*this.tau; - this.Qf=this.Q*this.freq; + this.Qf=this.Q*this.freq/1e2; end end end \ No newline at end of file diff --git a/Fit classes/@MyMechLorentzianFit/MyMechLorentzianFit.m b/Fit classes/@MyMechLorentzianFit/MyMechLorentzianFit.m index 335e61e..6eedd46 100644 --- a/Fit classes/@MyMechLorentzianFit/MyMechLorentzianFit.m +++ b/Fit classes/@MyMechLorentzianFit/MyMechLorentzianFit.m @@ -1,30 +1,30 @@ % Lorenzian fit customized for the characterization of quality factors of % mechanical resonators classdef MyMechLorentzianFit < MyLorentzianFit methods (Access = protected) % Function for calculating the parameters shown in the user panel function calcUserParams(this) lw = this.param_vals(2); freq = this.param_vals(3); this.lw = lw; % Linewidth in Hz this.freq = freq/1e6; % Frequency in MHz this.Q = (freq/lw)/1e6; % Q in millions this.Qf = (freq^2/lw)/1e14; % Qf in 10^14 Hz end function createUserParamList(this) addUserParam(this, 'lw', 'title', 'Linewidth (Hz)', ... 'editable', 'off') addUserParam(this, 'freq', 'title', 'Frequency (MHz)', ... 'editable', 'off') - addUserParam(this, 'Q', 'title', 'Qualify factor (x10^6)', ... + addUserParam(this, 'Q', 'title', 'Quality factor (x10^6)', ... 'editable', 'off'); addUserParam(this, 'Qf', 'title', 'Q\times f (10^{14} Hz)', ... 'editable', 'off'); end end end