fixes, automatic creation of strengths, Solenoid support

Author: michi42

README.md

@@ -74,11 +74,18 @@ plt.show()
 ```python
 lhcModel.strengths
 ```
+Set strengths:
 ```python
 lhcModel.strengths['on_x1'] = 140
 lhcModel.strengths['on_x5'] = 140
 print(lhcModel.strengths['on_x5'])
 ```
+Note that a new strength is automatically created if you assign it a value;
+a warning is issued in this case:
+```python
+lhcModel.strengths['on_xx5_v'] = 140
+```
+```INFO:root:Creating new MAD-X strength on_xx5_v```
 (jupyter/ipython autocompletion hints supported)
 
 ### Deal with Elements:

pyjmad/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.0.10"
+__version__ = "0.0.11"
 
 __cmmnbuild_deps__ = [
     "jmad-core-pro",
@@ -13,10 +13,10 @@
 ]
 
 __gradle_deps__ = [
-    "jmad:jmad-core:0.2.2+",
+    "jmad:jmad-core:0.2.3+",
     'jmad:jmad-modelpack-service:0.2.7+',
     'jmad:jmad-modelpack-fx:0.2.5+',
-    "jmad:jmad-gui:0.3.24+",
+    "jmad:jmad-gui:0.3.25+",
     "org.slf4j:slf4j-api:+",
     "org.slf4j:slf4j-log4j12:+",
     "log4j:log4j:1.2.17",

pyjmad/element.py

@@ -65,6 +65,7 @@ def _specific_element(name, attributes):
 Quadrupole = _specific_element('Quadrupole', ['k1', 'tilt'])
 Sextupole = _specific_element('Sextupole', ['k2', 'tilt'])
 Octupole = _specific_element('Octupole', ['k3', 'tilt'])
+Solenoid = _specific_element('Solenoid', ['ks', 'ksi'])
 
 
 def from_jmad(jmadElement):
@@ -77,6 +78,7 @@ def from_jmad(jmadElement):
         'Octupole': Octupole,
         'Quadrupole': Quadrupole,
         'Sextupole': Sextupole,
+        'Solenoid': Solenoid,
         'UnknownElement': Element
     }
     return _jmadElementMap[jmadElement.getClass().getSimpleName()](jmadElement)

pyjmad/modelpack.py

@@ -34,16 +34,6 @@ def _repo_from_uri(uri):
         raise ValueError('invalid repository URI: ' + uri)
 
 
-jmad_default_repositories = {}
-try:
-    _JMadModelRepositories = org.jmad.modelpack.domain.JMadModelRepositories
-    for method in _JMadModelRepositories.__javaclass__.getDeclaredMethods():
-        if method.getModifiers() & java.lang.reflect.Modifier.PUBLIC:
-            repo = method.getName()
-            jmad_default_repositories[repo] = _repo_to_uri(getattr(_JMadModelRepositories, repo)())
-except Exception:
-    logging.exception('can not fetch default models from jmad-modelpack-service')
-
 class JMadModelPackService(object):
     def __init__(self, applicationContext):
         self._javaService = applicationContext['jmadModelPackageService']

pyjmad/pyjmad.py

@@ -137,7 +137,7 @@ def range(self, range):
 
     @property
     def strengths(self):
-        return Strengths(self._jmadModel.getStrengthsAndVars())
+        return Strengths(self._jmadModel)
 
     @property
     def elements(self):
@@ -397,20 +397,24 @@ def __repr__(self):
 
 
 class Strengths(MutableMapping):
-    def __init__(self, jmadStrengthVarSet):
-        self._jmadStrengthVarSet = jmadStrengthVarSet
+    def __init__(self, jmadModel):
+        self._jmadStrengthVarSet = jmadModel.getStrengthsAndVars()
+        self._jmadModel = jmadModel
 
-    def _jmadStrength(self, k):
+    def __getitem__(self, k):
         jmadStrength = self._jmadStrengthVarSet.getStrength(k)
         if jmadStrength is None:
             raise KeyError('Invalid Strength Name: ' + k)
-        return jmadStrength
-
-    def __getitem__(self, k):
-        return self._jmadStrength(k).getValue()
+        return jmadStrength.getValue()
 
     def __setitem__(self, k, v):
-        return self._jmadStrength(k).setValue(float(v))
+        jmadStrength = self._jmadStrengthVarSet.getStrength(k)
+        if jmadStrength is None:
+            logging.info("Creating new MAD-X strength " + k)
+            SimpleStrength = cern.accsoft.steering.jmad.domain.knob.strength.SimpleStrength
+            jmadStrength = SimpleStrength(k, 0.0, None)
+            jmadStrength.addListener(self._jmadModel.strengthListener)
+        return jmadStrength.setValue(float(v))
 
     def __delitem__(self, k):
         raise NotImplementedError('Deletion of Strengths is not supported')

pyjmad/spring.py

@@ -7,9 +7,9 @@
 class SpringApplicationContext(object):
     def __init__(self, configuration):
         if type(configuration) is str:
-            self._context = ClassPathXmlApplicationContext(configuration)
+            self._context = ClassPathXmlApplicationContext([configuration])
         else:
-            self._context = AnnotationConfigApplicationContext(configuration)
+            self._context = AnnotationConfigApplicationContext([configuration])
 
     def bean_definitions(self):
         return [str(s) for s in self._context.getBeanDefinitionNames()]