Merge pull request #54 from simonsobs/separate-socs

Separate socs
simonsobs · May 16, 2019 · 4f205b3 · 4f205b3
2 parents e8626f9 + 3ae0ee8
commit 4f205b3
Show file tree

Hide file tree

Showing 51 changed files with 89 additions and 5,718 deletions.
diff --git a/README.rst b/README.rst
@@ -7,7 +7,7 @@ OCS - Observatory Control System
     :alt: Documentation Status
 
 Overview
-========
+--------
 
 The OCS makes it easy to coordinate hardware operation and I/O tasks in a
 distributed system such as an astronomical observatory or test laboratory. OCS
@@ -21,11 +21,21 @@ perform cleanup operations on a particular file system. A Control Client could
 be a web page with control buttons and log windows, or a script written by a
 user to perform a series of unattended, interlocking data acquisition tasks.
 
+This repository, `OCS`_, contains library code and core system
+components.  Additional code for operating specific hardware can be
+found in the `Simons Observatory Control System (SOCS)`_ repository.
+The time-domain data query system, with grafana integration, is
+provided through `Sisock`_.
+
 .. _crossbar.io: http://crossbario.com
+.. _`OCS`: https://github.com/simonsobs/ocs/
+.. _`Simons Observatory Control System (SOCS)`: https://github.com/simonsobs/socs/
+.. _`SiSock`: https://github.com/simonsobs/sisock/
 
 Dependencies
 ------------
-* python >= 3.5
+
+This code targets Python 3.5+.
 
 There are also several Python package dependencies, which are listed in the
 `requirements.txt`_ file.

diff --git a/agents/keithley2230G-psu/__init__.py b/agents/keithley2230G-psu/__init__.py
diff --git a/agents/keithley2230G-psu/keithley_agent.py b/agents/keithley2230G-psu/keithley_agent.py
diff --git a/agents/keithley2230G-psu/keithley_driver.py b/agents/keithley2230G-psu/keithley_driver.py
diff --git a/agents/keithley2230G-psu/prologixInterface.py b/agents/keithley2230G-psu/prologixInterface.py
diff --git a/agents/ocs_plugin_standard.py b/agents/ocs_plugin_standard.py
@@ -11,10 +11,6 @@
 for n,f in [
         ('RegistryAgent', 'registry/registry.py'),
         ('AggregatorAgent', 'aggregator/aggregator_agent.py'),
-        ('Lakeshore372Agent', 'thermometry/LS372_agent.py'),
-        ('Lakeshore240Agent', 'thermometry/LS240_agent.py'),
-        ('Keithley2230G-PSU', 'keithley2230G-psu/keithley_agent.py'),
-        ('SmurfAgent', 'smurf/Smurf_Agent.py'),
         ('HostMaster', 'host_master/host_master.py'),
 ]:
     ocs.site_config.register_agent_class(n, os.path.join(root, f))