merged

OOequipment/subfiles/transferFunction.m

@@ -8,11 +8,12 @@ function data = transferFunction(oscilloscope,functiongenerator,f_start,f_stop,a
     oscilloscope.enable_channels;
     oscilloscope.trigger.source = 'CH1';
     emptydata = zeros(n_measurements,n_steps);
-    data = struct('magnitude',emptydata,'phase',emptydata,'frequency',f_array);
+    data = struct('magnitude',emptydata,'phase',emptydata,'frequency',f_array,'measurements',n_measurements,'steps',n_steps);
     for j = 1:n_measurements
         for i = 1:n_steps
 %             fprintf('Measurement %i of %i - Frequency: %.2f Hertz\n',i,n_steps,f_array(i));
             functiongenerator.frequency = f_array(i);
+            oscilloscope.run;
             oscilloscope.auto;
             wavedata = oscilloscope.waveform(1:2,'DEF','SAMP');
             [data.phase(j,i),data.magnitude(j,i)] = phamag(wavedata.ch1,wavedata.ch2,wavedata.length,f_array(i),wavedata.sampletime);