Merge branch main

zhengpuas47 · Jul 26, 2024 · 40abb02 · 40abb02
2 parents 6447923 + b78efc7
commit 40abb02
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 10 deletions.
diff --git a/ChromAn b/ChromAn
diff --git a/MERlin b/MERlin
diff --git a/storm_control/fluidics/kilroy.py b/storm_control/fluidics/kilroy.py
@@ -1,11 +1,11 @@
 #!/usr/bin/python
 # ----------------------------------------------------------------------------------------
 # A master control class to implemented a series of automated flow protocols
-# using a daisy chained valve system (and eventually syringe pumps)
+# using a daisy chained valve system and peristaltic or syringe pumps
 # ----------------------------------------------------------------------------------------
 # Jeff Moffitt
 # 12/28/13
-# jeffmoffitt@gmail.com
+# jeffrey.moffitt@childrens.harvard.edu
 # ----------------------------------------------------------------------------------------
 
 # ----------------------------------------------------------------------------------------
@@ -14,7 +14,6 @@
 import sys
 import os
 import time
-import sys
 sys.path.append(r"..\..")
 from PyQt5 import QtCore, QtGui, QtWidgets
 from storm_control.fluidics.valves.valveChain import ValveChain
@@ -32,7 +31,6 @@ def __init__(self, parameters):
 
  # Parse parameters into internal attributes
  self.verbose = parameters.get("verbose")
- self.valve_com_port = parameters.get("valves_com_port")
  self.tcp_port = parameters.get("tcp_port")
  self.pump_com_port = parameters.get("pump_com_port")
  self.pump_ID = parameters.get("pump_ID")
@@ -85,8 +83,7 @@ def __init__(self, parameters):
  # Create KilroyProtocols instance and connect signals
  self.kilroyProtocols = KilroyProtocols(protocol_xml_path = self.protocols_file,
  command_xml_path = self.commands_file,
- verbose = self.verbose,
- pumpType = self.pump_type)
+ verbose = self.verbose, )
 
  self.kilroyProtocols.command_ready_signal.connect(self.sendCommand)
  self.kilroyProtocols.status_change_signal.connect(self.handleProtocolStatusChange)

diff --git a/storm_control/fluidics/kilroyProtocols.py b/storm_control/fluidics/kilroyProtocols.py
@@ -36,8 +36,7 @@ class KilroyProtocols(QtWidgets.QMainWindow):
  def __init__(self,
  protocol_xml_path = "default_config.xml",
  command_xml_path = "default_config.xml",
- verbose = False,
- pumpType='peristaltic'):
+ verbose = False):
  super(KilroyProtocols, self).__init__()
 
  # Initialize internal attributes