diff --git a/MOD2-files/LabManual_EC2017_Hueting_MATLAB.docx b/MOD2-files/LabManual_EC2017_Hueting_MATLAB.docx index c783446..2521867 100644 Binary files a/MOD2-files/LabManual_EC2017_Hueting_MATLAB.docx and b/MOD2-files/LabManual_EC2017_Hueting_MATLAB.docx differ diff --git a/OOequipment/Experiment5.zip b/OOequipment/Experiment5.zip index f6787c6..fc87230 100644 Binary files a/OOequipment/Experiment5.zip and b/OOequipment/Experiment5.zip differ diff --git a/OOequipment/subfiles/RC_TransferFunction_script.m b/OOequipment/subfiles/RC_TransferFunction_script.m index 120a23b..34e1d1b 100644 --- a/OOequipment/subfiles/RC_TransferFunction_script.m +++ b/OOequipment/subfiles/RC_TransferFunction_script.m @@ -25,10 +25,14 @@ if theory_only == false data = transferFunction(oscilloscope,functiongenerator,f_start,f_stop,amplitude,n_steps,n_measurements); %% Plotting %% Process the data - A_mean = mean(data.magnitude); - P_mean = mean(data.phase); - A_std = std(data.magnitude); - P_std = std(data.phase); + A_mean = mean(data.magnitude,1); + P_mean = mean(data.phase,1); + A_std = zeros(1,data.steps); + P_std = zeros(1,data.steps); + if data.measurements > 1 + A_std = std(data.magnitude,1); + P_std = std(data.phase,1); + end A_mean_log = 20*log10(A_mean); A_std_log_neg = A_mean_log - 20*log10(A_mean - A_std); A_std_log_pos = 20*log10(A_mean + A_std) - A_mean_log;