Merge pull request #161 from xsuite/release/v0.6.7

Release 0.6.7

Author: freddieknets

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "xcoll"
-version = "0.6.6"
+version = "0.6.7"
 description = "Xsuite collimation package"
 authors = [
     {name="Frederik F. Van der Veken", email="[email protected]"},
@@ -25,7 +25,7 @@ dependencies = [
     "xobjects>=0.5.3",
     "xdeps>=0.10.6",
     "xpart>=0.23.1",
-    "xtrack>=0.90.2",
+    "xtrack>=0.93.0",
 ]
 
 [project.optional-dependencies]
@@ -46,7 +46,7 @@ exclude = ["xcoll/lib", "xcoll/config"]
 
 [poetry.group.dev.dependencies]
 pytest = ">=7.3"
-xaux = ">=0.3.6"
+xaux = ">=0.3.7"
 
 [build-system]
 # Needed for pip install -e (BTW: need pip version 22)

tests/test_version.py

@@ -6,4 +6,4 @@
 from xcoll import __version__
 
 def test_version():
-    assert __version__ == '0.6.6'
+    assert __version__ == '0.6.7'

xcoll/colldb.py

@@ -36,7 +36,7 @@ def _dict_keys_to_lower(dct):
     else:
         return dct
 
-
+# TODO: need better handling of beam argument (not hardcoded 'b1' and 'b2' strings)
 def _get_coll_dct_by_beam(coll, beam):
     # The dictionary can be a CollimatorDatabase for a single beam (beam=None)
     # or for both beams (beam='b1' or beam='b2)
@@ -51,7 +51,7 @@ def _get_coll_dct_by_beam(coll, beam):
             raise ValueError("Need to specify a beam, because the given dict is for both beams!")
         return coll[beam]
 
-    elif len(beam_in_db) == 1:
+    elif len(beam_in_db) == 1 and beam_in_db[0].lower() in ['b1','b2']:
         if beam is None:
             beam = beam_in_db[0].lower()
         elif beam != beam_in_db[0].lower():
@@ -551,7 +551,8 @@ def _create_collimator(self, cls, line, name, **kwargs):
         prop_dict.update(kwargs)
         el = cls(**prop_dict)
         el.emittance = [self.nemitt_x, self.nemitt_y]
-        if 'family' in self[name] and self[name]['family'].lower() != 'unknown':
+        if 'family' in self[name] and self[name]['family'] \
+        and self[name]['family'].lower() != 'unknown':
             if self[name]['family'] == name:
                 raise ValueError(f"Collimator {name} has the same name as its family!")
             el.family = self[name]['family']

xcoll/general.py

@@ -12,5 +12,5 @@
 # ======================
 # Do not change
 # ======================
-__version__ = '0.6.6'
+__version__ = '0.6.7'
 # ======================