Merge pull request #167 from xsuite/release/v0.7.1

Release 0.7.1

Author: freddieknets

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "xcoll"
-version = "0.7.0"
+version = "0.7.1"
 description = "Xsuite collimation package"
 authors = [
     {name="Frederik F. Van der Veken", email="[email protected]"},
@@ -22,10 +22,10 @@ dependencies = [
     "ruamel-yaml (>=0.17.31,<0.18.15)",
     "numpy>=1.0",
     "pandas>=1.4",
-    "xobjects>=0.5.5",
+    "xobjects>=0.5.6",
     "xdeps>=0.10.8",
-    "xpart>=0.23.1",
-    "xtrack>=0.94.2",
+    "xpart>=0.23.2",
+    "xtrack>=0.95.0",
 ]
 
 [project.optional-dependencies]
@@ -46,7 +46,7 @@ exclude = ["xcoll/lib", "xcoll/config"]
 
 [poetry.group.dev.dependencies]
 pytest = ">=7.3"
-xaux = ">=0.3.9"
+xaux = ">=0.3.10"
 
 [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.7.0'
+    assert __version__ == '0.7.1'

xcoll/beam_elements/geant4.py

@@ -79,19 +79,25 @@ def angle(self, val):
 
     @property
     def material(self):
-        return self._material
+        if self._material != _DEFAULT_MATERIAL:
+            return self._material
 
     @material.setter
     def material(self, material):
         if material is None:
-            material = Material()
+            material = _DEFAULT_MATERIAL
         elif isinstance(material, dict):
             material = Material.from_dict(material)
         elif isinstance(material, str):
             material = material_db[material]
-        if not isinstance(material, Material):
-            raise ValueError("Invalid material!")
-        self._material = material
+        elif isinstance(material, RefMaterial):
+            if material.geant4_name is None:
+                raise ValueError(f"RefMaterial {material} does not have a Geant4 name!")
+        if not isinstance(material, Material) \
+        or isinstance(material, CrystalMaterial):
+            raise ValueError(f"Invalid material of type {type(material)}!")
+        if self.material != material:
+            self._material = material
 
 
     def track(self, part):

xcoll/general.py

@@ -12,5 +12,5 @@
 # ======================
 # Do not change
 # ======================
-__version__ = '0.7.0'
+__version__ = '0.7.1'
 # ======================

xcoll/scattering_routines/environment.py

@@ -32,6 +32,8 @@ def __init__(self, *args, **kwargs):
         self._in_constructor = True
         for path in self._paths.keys():
             setattr(self, f'_{path}', None)
+        self._config_dir.mkdir(parents=True, exist_ok=True)
+        self._data_dir.mkdir(parents=True, exist_ok=True)
         self._config_file = self._config_dir / f'{self.__class__.__name__[:-11].lower()}.config.json'
         sys.path.append(self._data_dir.as_posix())
         self.load()
@@ -167,6 +169,8 @@ def load(self):
             try:
                 data = json.load(fid)
             except json.JSONDecodeError:
+                with open(self._config_file, 'w') as fid:
+                    json.dump({'paths': {}, 'read_only_paths': {}}, fid, indent=4)
                 return
         if 'paths' not in data or 'read_only_paths' not in data:
             return