Merge pull request #166 from xsuite/fix/prebuild

Fix/prebuild

Author: freddieknets

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/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