Bump version, fixes to control

ChristopherMayes · Mar 24, 2021 · 9f4a08e · 9f4a08e
1 parent fdfb17c
commit 9f4a08e
Show file tree

Hide file tree

Showing 6 changed files with 507 additions and 93 deletions.
diff --git a/astra/_version.py b/astra/_version.py
@@ -1,3 +1,3 @@
 
 
-__version__ = '0.4.1'
+__version__ = '0.4.2'
diff --git a/astra/astra.py b/astra/astra.py
@@ -708,6 +708,7 @@ def set_astra(astra_object, generator_input, settings, verbose=False):
     astra_input = astra_object.input # legacy syntax
 
     for k, v in settings.items():
+        found = False
 
         # Check for direct settable attribute
         if ':' in k:

diff --git a/astra/control.py b/astra/control.py
@@ -119,13 +119,10 @@ def set_delta(self, key, item):
         """
         Sets a change (delta) in the underlying attributes. 
         """
-        delta = item - self.value 
-        if delta == 0:
-            return
 
         self.value = item     
         for name, attrib, f, ref in zip(self.ele_names, self.attributes, self.factors, self.reference_values):
-            self.ele_dict[name][attrib] += f * delta  
+            self.ele_dict[name][attrib] = ref + f * self.value
 
     def __setitem__(self, key, item):
         """

diff --git a/examples/functional_astra_run.ipynb b/examples/functional_astra_run.ipynb
diff --git a/examples/simple_astra_run.ipynb b/examples/simple_astra_run.ipynb
diff --git a/setup.py b/setup.py
@@ -10,7 +10,7 @@
 
 setup(
     name='lume-astra',
-    version = '0.4.1',
+    version = '0.4.2',
     packages=find_packages(),  
     package_dir={'xopt':'xopt'},
     url='https://github.com/ChristopherMayes/lume-astra',