diff --git a/OOequipment/RLC_TransferFunction.mlx b/OOequipment/RLC_TransferFunction.mlx index 03fce8b..cf69d6d 100644 Binary files a/OOequipment/RLC_TransferFunction.mlx and b/OOequipment/RLC_TransferFunction.mlx differ diff --git a/OOequipment/subfiles/RC_TransferFunction_script.m b/OOequipment/subfiles/RC_TransferFunction_script.m index 05d1293..8ccf40f 100644 --- a/OOequipment/subfiles/RC_TransferFunction_script.m +++ b/OOequipment/subfiles/RC_TransferFunction_script.m @@ -1,6 +1,9 @@ %% Run the measurements data = transferFunction(oscilloscope,functiongenerator,f_start,f_stop,n_steps,amplitude); + +%% plot the data S = asymptote(S_smaller,S_larger,f,Fc); +P = mod(P,pi); figure; subplot(2,1,1) semilogx(data.frequency,data.magnitude,f,A,f,S) diff --git a/OOequipment/subfiles/RLC_TransferFunction_script.m b/OOequipment/subfiles/RLC_TransferFunction_script.m index 05d1293..bcaa57c 100644 --- a/OOequipment/subfiles/RLC_TransferFunction_script.m +++ b/OOequipment/subfiles/RLC_TransferFunction_script.m @@ -1,16 +1,24 @@ %% Run the measurements data = transferFunction(oscilloscope,functiongenerator,f_start,f_stop,n_steps,amplitude); +%% plot the data S = asymptote(S_smaller,S_larger,f,Fc); +P = mod(P,pi); figure; subplot(2,1,1) -semilogx(data.frequency,data.magnitude,f,A,f,S) +semilogx(data.frequency,data.magnitude) +hold on +semilogx(f,A,f,S) +hold off ylabel('Magnitude [dB]','Fontsize',10); xlabel('Frequency [Hz]','Fontsize',10); legend('Measurement','Theory','Asymptote'); grid on -title('RC-circuit Bodeplot') +title('RLC-circuit Bodeplot') subplot(2,1,2); -semilogx(data.frequency,data.phase,f,P) +semilogx(data.frequency,data.phase) +hold on +semilogx(f,P) +hold off ylabel('Phase [rad]','Fontsize',10); xlabel('Frequency [Hz]','Fontsize',10); legend('Measurement','Theory'); diff --git a/OOequipment/subfiles/phamag.m b/OOequipment/subfiles/phamag.m index edb33e8..2556382 100644 --- a/OOequipment/subfiles/phamag.m +++ b/OOequipment/subfiles/phamag.m @@ -7,7 +7,7 @@ Fs = 1/T; n = 2^nextpow2(length); X = fft(wave,n,2)/n; idx = ceil(frequency*n/Fs); -phase = mod(angle(mean(X(2,idx)))-angle(mean(X(1,idx)))+pi,2*pi)-pi; +phase = mod(angle(mean(X(2,idx)))-angle(mean(X(1,idx))),pi); magnitude = 20*log10(abs(X(2,idx))/abs(X(1,idx))); end