Merge pull request #31 from T-Nicholls/BBA_changes

BBA Changes

Author: T-Nicholls

.github/workflows/code.yml

@@ -10,7 +10,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python: ["3.7", "3.8"]
+        python: ["3.8", "3.9"]
 
     steps:
       - name: Checkout Source

INSTALL.rst

@@ -4,7 +4,7 @@ ATIP Installation
 
 This guide is for Linux and is based on the current structures of AT and Pytac,
 if you find a mistake anywhere in ATIP please raise an issue on ATIP's GitHub
-page, `here. <https://github.com/dls-controls/atip>`_
+page, `here. <https://github.com/DiamondLightSource/atip>`_
 
 Initial Setup and Installation
 ------------------------------
@@ -18,7 +18,7 @@ Initial Setup and Installation
 1. Clone ATIP::
 
     $ cd <source-directory>
-    $ git clone https://github.com/dls-controls/atip.git
+    $ git clone https://github.com/DiamondLightSource/atip.git
 
 2. Create a pipenv and install the dependencies::
 

Pipfile

@@ -13,7 +13,7 @@ mock = "*"
 flake8 = "<4.0"
 sphinx = "*"
 sphinx_rtd_theme = "*"
-black = "==21.5b2"
+black = "==22.3.0"
 
 [packages]
 # All production requirements from setup.cfg.

Pipfile.lock

@@ -1,7 +1,7 @@
-.. image:: https://travis-ci.org/dls-controls/atip.svg?branch=master
-    :target: https://travis-ci.org/dls-controls/atip
-.. image:: https://coveralls.io/repos/github/dls-controls/atip/badge.svg?branch=master
-    :target: https://coveralls.io/github/dls-controls/atip?branch=master
+.. image:: https://travis-ci.org/DiamondLightSource/atip.svg?branch=master
+    :target: https://travis-ci.org/DiamondLightSource/atip
+.. image:: https://coveralls.io/repos/github/DiamondLightSource/atip/badge.svg?branch=master
+    :target: https://coveralls.io/github/DiamondLightSource/atip?branch=master
 .. image:: https://readthedocs.org/projects/atip/badge/?version=latest
     :target: https://atip.readthedocs.io/en/latest/?badge=latest
 .. image:: https://badge.fury.io/py/atip.svg
@@ -11,7 +11,7 @@
 ATIP - Accelerator Toolbox Interface for Pytac
 ==============================================
 
-ATIP is an addition to `Pytac <https://github.com/dls-controls/pytac>`_,
+ATIP is an addition to `Pytac <https://github.com/DiamondLightSource/pytac>`_,
 a framework for controlling particle accelerators. ATIP adds a simulator to
 Pytac, which can be used and addressed in the same way as a real accelerator.
 
@@ -108,7 +108,7 @@ that AT element is returned.
 The ``ATSimulator`` object has a queue of pending changes. When a set request
 is received by an element, the element puts the changes onto the queue of the
 ``ATSimulator``. Inside the ``ATSimulator`` a
-`Cothread <https://github.com/dls-controls/cothread>`_ thread checks the
+`Cothread <https://github.com/DiamondLightSource/cothread>`_ thread checks the
 length of the queue. When it sees changes on the queue, the thread
 recalculates the physics data of the lattice to ensure that it is up to date.
 This means that the emittance and linear optics data held by ``ATSimulator``

README.rst

@@ -1,6 +1,6 @@
 """ATIP: Accelerator Toolbox Interface for Pytac.
 See README.rst & INSTALL.rst for more information.
 """
-from . import simulator, load_sim, sim_data_sources, utils
+from . import load_sim, sim_data_sources, simulator, utils
 
-__all__ = ["simulator", "load_sim", "sim_data_sources", "utils"]
+__all__ = ["load_sim", "sim_data_sources", "simulator", "utils"]

atip/__init__.py

@@ -2,11 +2,10 @@
 import at
 import pytac
 from pytac.exceptions import FieldException
-from pytac.load_csv import DEFAULT_UC
+from pytac.units import NullUnitConv
 
-from atip.simulator import ATSimulator
 from atip.sim_data_sources import ATElementDataSource, ATLatticeDataSource
-
+from atip.simulator import ATSimulator
 
 # List of all the element fields that can be currently simulated.
 SIMULATED_FIELDS = {"a1", "b0", "b1", "b2", "x", "y", "f", "x_kick", "y_kick"}
@@ -55,7 +54,7 @@ def load(pytac_lattice, at_lattice, callback=None, disable_emittance=False):
     if len(at_lattice) != len(pytac_lattice):
         raise ValueError(
             "Incompatible AT and Pytac lattices, length mismatch "
-            "(AT:{0} Pytac:{1}).".format(len(at_lattice), len(pytac_lattice))
+            f"(AT:{len(at_lattice)} Pytac:{len(pytac_lattice)})."
         )
     # Initialise an instance of the ATSimulator Object.
     atsim = ATSimulator(at_lattice, callback, disable_emittance)
@@ -75,5 +74,5 @@ def load(pytac_lattice, at_lattice, callback=None, disable_emittance=False):
         try:
             pytac_lattice.get_unitconv(field)
         except FieldException:
-            pytac_lattice.set_unitconv(field, DEFAULT_UC)
+            pytac_lattice.set_unitconv(field, NullUnitConv())
     return pytac_lattice

atip/load_sim.py

@@ -4,7 +4,7 @@
 
 import at
 import pytac
-from pytac.exceptions import FieldException, HandleException, ControlSystemException
+from pytac.exceptions import ControlSystemException, FieldException, HandleException
 
 
 class ATElementDataSource(pytac.data_source.DataSource):
@@ -87,9 +87,7 @@ def __init__(self, at_element, index, atsim, fields=None):
         # We assume that every set field has a corresponding get field.
         supported_fields = set(self._get_field_funcs.keys())
         if not all(f in supported_fields for f in fields):
-            raise FieldException(
-                "Unsupported field(s) {0}.".format(fields - supported_fields)
-            )
+            raise FieldException(f"Unsupported field(s) {fields - supported_fields}.")
         else:
             self._fields = list(fields)
 
@@ -117,11 +115,10 @@ def add_field(self, field):
         """
         if field in self._fields:
             raise FieldException(
-                "Field {0} already present on element data "
-                "source {1}.".format(field, self)
+                f"Field {field} already present on element data source {self}."
             )
         elif field not in self._get_field_funcs.keys():
-            raise FieldException("Unsupported field {0}.".format(field))
+            raise FieldException(f"Unsupported field {field}.")
         else:
             self._fields.append(field)
 
@@ -151,7 +148,7 @@ def get_value(self, field, handle=None, throw=True):
         # complete before a value is returned; if the wait times out then raise
         # an error message or log a warning according to the value of throw.
         if not self._atsim.wait_for_calculations():
-            error_msg = "Check for completion of outstanding " "calculations timed out."
+            error_msg = "Check for completion of outstanding calculations timed out."
             if throw:
                 raise ControlSystemException(error_msg)
             else:
@@ -160,9 +157,7 @@ def get_value(self, field, handle=None, throw=True):
         if field in self._fields:
             return self._get_field_funcs[field]()
         else:
-            raise FieldException(
-                "No field {0} on AT element {1}.".format(field, self._at_element)
-            )
+            raise FieldException(f"No field {field} on AT element {self._at_element}.")
 
     def set_value(self, field, value, throw=None):
         """Set the value for a field. The field and value go onto the queue of
@@ -182,17 +177,13 @@ def set_value(self, field, value, throw=None):
         """
         if field in self._fields:
             if field in self._set_field_funcs.keys():
-                self._atsim.up_to_date.Reset()
                 self._atsim.queue_set(self._make_change, field, value)
             else:
                 raise HandleException(
-                    "Field {0} cannot be set on element data"
-                    " source {1}.".format(field, self)
+                    f"Field {field} cannot be set on element data source {self}."
                 )
         else:
-            raise FieldException(
-                "No field {0} on AT element {1}.".format(field, self._at_element)
-            )
+            raise FieldException(f"No field {field} on AT element {self._at_element}.")
 
     def _make_change(self, field, value):
         """Calls the appropriate field setting function to actually modify the
@@ -466,7 +457,7 @@ def get_value(self, field, handle=None, throw=True):
                 return self._field_funcs[field]()
         else:
             raise FieldException(
-                "Lattice data source {0} does not have field " "{1}".format(self, field)
+                f"Lattice data source {self} does not have field {field}"
             )
 
     def set_value(self, field, value, throw=None):
@@ -486,5 +477,5 @@ def set_value(self, field, value, throw=None):
                               currently supported.
         """
         raise HandleException(
-            "Field {0} cannot be set on lattice data source " "{1}.".format(field, self)
+            f"Field {field} cannot be set on lattice data source {self}."
         )