From d782bb3db56847c6c810d7ff8577a2feaa203751 Mon Sep 17 00:00:00 2001
From: Matthew Feldman <matthew.feldman@vanderbilt.edu>
Date: Mon, 18 Nov 2019 20:43:44 -0500
Subject: [PATCH] driver for pulseTimer hw is now a callback.

---
 .../PulseSequenceSweep_invisible.m            | 24 ++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/Modules/+Experiments/+PulseSequenceSweep/@PulseSequenceSweep_invisible/PulseSequenceSweep_invisible.m b/Modules/+Experiments/+PulseSequenceSweep/@PulseSequenceSweep_invisible/PulseSequenceSweep_invisible.m
index 935a4a9d3..b09614125 100644
--- a/Modules/+Experiments/+PulseSequenceSweep/@PulseSequenceSweep_invisible/PulseSequenceSweep_invisible.m
+++ b/Modules/+Experiments/+PulseSequenceSweep/@PulseSequenceSweep_invisible/PulseSequenceSweep_invisible.m
@@ -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
@@ -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
@@ -109,4 +111,4 @@ function UpdateRun(obj,varargin)
         function PostRun(obj,varargin)
         end
     end
-end
+end
\ No newline at end of file