added NGX SAB

Author: jirhiker

pychron/hardware/actuators/ngx_gp_actuator.py

@@ -43,11 +43,16 @@ def initialize(self, *args, **kw):
             return True
 
     def actuate(self, *args, **kw):
+        self.controller.set_acquisition_buffer(True)
+        ret = super(NGXGPActuator, self).actuate(*args, **kw)
+        self.controller.set_acquisition_buffer(False)
+        return ret
+
         # self.ask("StopAcq")
-        self.controller.stop_acquisition()
-        self.controller.canceled = True
+        # self.controller.stop_acquisition()
+        # self.controller.canceled = True
         # time.sleep(1)
-        return super(NGXGPActuator, self).actuate(*args, **kw)
+        # return super(NGXGPActuator, self).actuate(*args, **kw)
 
     def get_channel_state(self, obj, delay=False, verbose=False, **kw):
         """ """

pychron/hardware/core/communicators/ethernet_communicator.py

@@ -252,7 +252,7 @@ class EthernetCommunicator(Communicator):
     message_frame = ""
     timeout = Float(1.0)
     strip = True
-    default_timeout = 3
+    # default_timeout = 3
     default_datasize = 2**12
 
     _comms_report_attrs = (
@@ -319,14 +319,14 @@ def load(self, config, path):
         self.message_frame = self.config_get(
             config, "Communications", "message_frame", optional=True, default=""
         )
-        self.default_timeout = self.config_get(
-            config,
-            "Communications",
-            "default_timeout",
-            cast="int",
-            optional=True,
-            default=3,
-        )
+        # self.default_timeout = self.config_get(
+        #     config,
+        #     "Communications",
+        #     "default_timeout",
+        #     cast="int",
+        #     optional=True,
+        #     default=3,
+        # )
         self.default_datasize = self.config_get(
             config,
             "Communications",
@@ -461,7 +461,7 @@ def ask(
                 retries = 2
 
             if timeout is None:
-                timeout = self.default_timeout
+                timeout = self.timeout
 
             re = "ERROR: Connection refused: {}, timeout={}".format(
                 self.address, timeout
@@ -506,7 +506,7 @@ def reset(self):
         self._reset_connection()
 
     def select_read(self, *args, **kw):
-        timeout = self.default_timeout
+        timeout = self.timeout
         handler = self.get_handler(timeout=timeout)
         if handler:
             handler = self.get_read_handler(handler, timeout=timeout)
@@ -583,7 +583,7 @@ def _reset_error_mode(self, timeout=None, use_error_mode=True):
                 timeout = 0.5
 
         if timeout is None:
-            timeout = self.default_timeout
+            timeout = self.timeout
 
         self.error_mode = False
         return timeout

pychron/hardware/isotopx_spectrometer_controller.py

@@ -58,6 +58,10 @@ def ask(self, cmd, *args, **kw):
     #    else:
     #        resp = self.event_buffer.get()
     #    return resp
+    def set_acquisition_buffer(self, flag):
+        flag = "1" if flag else "0"
+        self.debug(f"set acquisition buffer {flag}")
+        self.ask(f"SAB {flag}")
 
     def stop_acquisition(self):
         self.triggered = False
@@ -75,7 +79,8 @@ def initialize(self, *args, **kw):
 
         self.communicator.strip = False
         # trying a new locking mechanism see ngx.trigger for more details
-        self.lock = RLock()
+
+        self.lock = Lock()
         #   self.event_buffer = Queue()
 
         if ret:

pychron/spectrometer/isotopx/spectrometer/ngx.py

@@ -128,7 +128,7 @@ def trigger_acq(self, verbose=True):
         #    time.sleep(0.25)
 
         if not self.microcontroller.triggered:
-            self.microcontroller.lock.acquire()
+            # self.microcontroller.lock.acquire()
             # self.ask("StopAcq", verbose=verbose)
             self.microcontroller.stop_acquisition()
             self.microcontroller.triggered = True
@@ -192,7 +192,7 @@ def read_intensities(
         # verbose=True
         self._read_enabled = True
 
-        verbose = True
+        # verbose = True
 
         if verbose:
             self.debug(
@@ -201,12 +201,12 @@ def read_intensities(
                 )
             )
 
-        self.microcontroller.lock.acquire()
+        # self.microcontroller.lock.acquire()
         resp = True
-        trigger_release = self.microcontroller.triggered
+        # trigger_release = self.microcontroller.triggered
         if trigger or not self.microcontroller.triggered:
             resp = self.trigger_acq()
-            trigger_release = True
+            # trigger_release = True
             # self.microcontroller.lock.release()
             if resp is not None:
                 # if verbose:
@@ -227,7 +227,7 @@ def read_intensities(
             keys = self.detector_names[::-1]
             while self._read_enabled:
                 # with self.microcontroller.lock:
-                line = self.readline(verbose=True)
+                line = self.readline(verbose=verbose)
 
                 if verbose:
                     self.debug("raw: {}".format(line))
@@ -292,16 +292,16 @@ def read_intensities(
             self.debug("keys: {}".format(keys))
             self.debug("signals: {}".format(signals))
 
-        try:
-            self.microcontroller.lock.release()
-        except RuntimeError as e:
-            self.debug(f'Cannot release lock. "RuntimeError" {e}')
-
-        if trigger_release:
-            try:
-                self.microcontroller.lock.release()
-            except RuntimeError as e:
-                self.debug(f'Trigger Release. Cannot release lock. "RuntimeError" {e}')
+        # try:
+        #     self.microcontroller.lock.release()
+        # except RuntimeError as e:
+        #     self.debug(f'Cannot release lock. "RuntimeError" {e}')
+        #
+        # if trigger_release:
+        #     try:
+        #         self.microcontroller.lock.release()
+        #     except RuntimeError as e:
+        #         self.debug(f'Trigger Release. Cannot release lock. "RuntimeError" {e}')
 
         return keys, signals, collection_time, inc
 

pychron/spectrometer/jobs/dac_scanner.py

@@ -316,14 +316,14 @@ def _scan_min_dac_changed(self):
             self.tool.low = self.scan_min_dac
             self.tool.overlay.low = self.scan_min_dac
         self._scan_time_length_changed()
-        self.graph.redraw()
+        # self.graph.redraw()
 
     def _scan_max_dac_changed(self):
         if self.tool:
             self.tool.high = self.scan_max_dac
             self.tool.overlay.high = self.scan_max_dac
         self._scan_time_length_changed()
-        self.graph.redraw()
+        # self.graph.redraw()
 
     def _min_dac_changed(self):
         if self.min_dac < self.max_dac: