Skip to content

driver for pulseTimer hw is now a callback. #87

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
egonspin wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

driver for pulseTimer hw is now a callback. #87

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 13 additions & 11 deletions ...eriments/+PulseSequenceSweep/@PulseSequenceSweep_invisible/PulseSequenceSweep_invisible.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,16 @@
nCounterBins
end
properties
prefs = {'averages','samples','pb_IP','NIDAQ_dev'};
prefs = {'averages','samples','pbDriver','NIDAQ_dev'};
end
properties(SetObservable,AbortSet)
averages = 2; % Number of times to perform entire sweep
samples = 1000; % Number of samples at each point in sweep
pb_IP = 'None Set';
NIDAQ_dev = 'None Set';
end
properties(GetObservable,SetObservable)
pbDriver = Prefs.String('None Set','allow_empty',false,'set','set_pbDriver');
end
properties(SetAccess=protected,Hidden)
data = [] % subclasses should not set this; it can be manipulated in GetData if necessary
meta = [] % Store experimental settings
Expand All @@ -68,17 +70,17 @@ function abort(obj)
dat.meta = obj.meta;
end

function set.pb_IP(obj,val)
if strcmp(val,'None Set') % Short circuit
obj.pbH = [];
obj.pb_IP = val;
end

function val = set_pbDriver(obj,val,pref)

try
obj.pbH = Drivers.PulseBlaster.Remote.instance(val); %#ok<*MCSUP>
obj.pb_IP = val;
if strcmp(val,'None Set') % Short circuit
obj.pbH = []; %obj.pb_IP = val;
else
obj.pbH = eval(val); %#ok<*MCSUP> %modified 11/10/19
end
catch err
obj.pbH = [];
obj.pb_IP = 'None Set';
rethrow(err);
end
end
Expand Down Expand Up @@ -109,4 +111,4 @@ function UpdateRun(obj,varargin)
function PostRun(obj,varargin)
end
end
end
end