Move instrument and extinction to SC base

Author: AndrewSazonov

src/easydiffraction/experiments/experiment/base.py

@@ -11,6 +11,8 @@
 from easydiffraction.core.datablock import DatablockItem
 from easydiffraction.experiments.categories.data.factory import DataFactory
 from easydiffraction.experiments.categories.excluded_regions import ExcludedRegions
+from easydiffraction.experiments.categories.extinction import Extinction
+from easydiffraction.experiments.categories.instrument.factory import InstrumentFactory
 from easydiffraction.experiments.categories.linked_crystal import LinkedCrystal
 from easydiffraction.experiments.categories.linked_phases import LinkedPhases
 from easydiffraction.experiments.categories.peak.factory import PeakFactory
@@ -108,7 +110,11 @@ def __init__(
         super().__init__(name=name, type=type)
 
         self._linked_crystal: LinkedCrystal = LinkedCrystal()
-
+        self._extinction: Extinction = Extinction()
+        self._instrument = InstrumentFactory.create(
+            scattering_type=self.type.scattering_type.value,
+            beam_mode=self.type.beam_mode.value,
+        )
         self._data = DataFactory.create(
             sample_form=self.type.sample_form.value,
             beam_mode=self.type.beam_mode.value,
@@ -130,14 +136,13 @@ def linked_crystal(self):
         """Linked crystal model for this experiment."""
         return self._linked_crystal
 
-    @linked_crystal.setter
-    def linked_crystal(self, value):
-        """Set the linked crystal model for this experiment.
+    @property
+    def extinction(self):
+        return self._extinction
 
-        Args:
-            value: New linked crystal model.
-        """
-        self._linked_crystal = value
+    @property
+    def instrument(self):
+        return self._instrument
 
     @property
     def data(self):

src/easydiffraction/experiments/experiment/bragg_sc.py

@@ -7,22 +7,16 @@
 
 import numpy as np
 
-from easydiffraction.experiments.categories.extinction import Extinction
-from easydiffraction.experiments.categories.linked_crystal import LinkedCrystal
 from easydiffraction.experiments.experiment.base import ScExperimentBase
 from easydiffraction.experiments.experiment.enums import BeamModeEnum
-from easydiffraction.experiments.experiment.instrument_mixin import InstrumentMixin
 from easydiffraction.utils.logging import console
 from easydiffraction.utils.logging import log
 
 if TYPE_CHECKING:
     from easydiffraction.experiments.categories.experiment_type import ExperimentType
 
 
-class BraggScExperiment(
-    InstrumentMixin,
-    ScExperimentBase,
-):
+class BraggScExperiment(ScExperimentBase):
     """Standard (Bragg) Single Crystal experiment class with specific
     attributes.
     """
@@ -35,9 +29,6 @@ def __init__(
     ) -> None:
         super().__init__(name=name, type=type)
 
-        self._linked_crystal = LinkedCrystal()
-        self._extinction = Extinction()
-
     def _load_ascii_data_to_experiment(self, data_path: str) -> None:
         """Load measured data from an ASCII file into the data category.
 
@@ -88,19 +79,3 @@ def _load_ascii_data_to_experiment(self, data_path: str) -> None:
 
         console.paragraph('Data loaded successfully')
         console.print(f"Experiment 🔬 '{self.name}'. Number of data points: {len(indices_h)}")
-
-    @property
-    def linked_crystal(self):
-        return self._linked_crystal
-
-    @linked_crystal.setter
-    def linked_crystal(self, value):
-        self._linked_crystal = value
-
-    @property
-    def extinction(self):
-        return self._extinction
-
-    @extinction.setter
-    def extinction(self, value):
-        self._extinction = value