Commit e39ac5d8 authored by Jan-Gerrit Richter's avatar Jan-Gerrit Richter
Browse files

reset measurement setup repetitions after measurement

parent 08d7dc32
...@@ -95,6 +95,7 @@ classdef test_itaEimarMotorControl < itaMeasurementTasksScan ...@@ -95,6 +95,7 @@ classdef test_itaEimarMotorControl < itaMeasurementTasksScan
wait = true; % Status - do we wait for motors to reach final position? -> Set by prepare-functions! wait = true; % Status - do we wait for motors to reach final position? -> Set by prepare-functions!
mMotorControl = []; mMotorControl = [];
mRepetitionsSave = 0;
end end
% ********************************************************************* % *********************************************************************
properties(Constant, Hidden = true) properties(Constant, Hidden = true)
...@@ -206,6 +207,7 @@ classdef test_itaEimarMotorControl < itaMeasurementTasksScan ...@@ -206,6 +207,7 @@ classdef test_itaEimarMotorControl < itaMeasurementTasksScan
% the pre angle is needed because the measurement setup will % the pre angle is needed because the measurement setup will
% not start recording imidiately % not start recording imidiately
numRepetitions = this.measurementSetup.repetitions; numRepetitions = this.measurementSetup.repetitions;
this.measurementSetup.repetitions = numRepetitions;
timePerRepetition = this.measurementSetup.twait*length(this.measurementSetup.outputChannels); timePerRepetition = this.measurementSetup.twait*length(this.measurementSetup.outputChannels);
speed = 360/(numRepetitions*timePerRepetition); speed = 360/(numRepetitions*timePerRepetition);
motorControl = this.getMotorControl; motorControl = this.getMotorControl;
...@@ -259,7 +261,7 @@ classdef test_itaEimarMotorControl < itaMeasurementTasksScan ...@@ -259,7 +261,7 @@ classdef test_itaEimarMotorControl < itaMeasurementTasksScan
result = this.measurementSetup.deconvolve(result_raw); result = this.measurementSetup.deconvolve(result_raw);
% this.stop; % this.stop;
this.mMotorControl.setWait(true); this.mMotorControl.setWait(true);
this.measurementSetup.repetitions = this.mRepetitionsSave;
% add history line % add history line
commitID = ita_git_getMasterCommitHash; commitID = ita_git_getMasterCommitHash;
if ~isempty(commitID) if ~isempty(commitID)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment