Refactors to use Factory classes for model and experiment creation

Author: AndrewSazonov

tutorials/advanced_joint-fit_pd-neut-xray-cwl_PbSO4.py

@@ -15,9 +15,9 @@
 # ## Import Library
 
 # %%
-from easydiffraction import Experiment
+from easydiffraction import ExperimentFactory
 from easydiffraction import Project
-from easydiffraction import SampleModel
+from easydiffraction import SampleModelFactory
 from easydiffraction import download_from_repository
 
 # %% [markdown]
@@ -29,7 +29,7 @@
 # #### Create Sample Model
 
 # %%
-model = SampleModel(name='pbso4')
+model = SampleModelFactory.create(name='pbso4')
 
 # %% [markdown]
 # #### Set Space Group
@@ -113,7 +113,7 @@
 # #### Create Experiment
 
 # %%
-expt1 = Experiment(
+expt1 = ExperimentFactory.create(
     name='npd',
     data_path='data/d1a_pbso4.dat',
     radiation_probe='neutron',
@@ -179,7 +179,7 @@
 # #### Create Experiment
 
 # %%
-expt2 = Experiment(
+expt2 = ExperimentFactory.create(
     name='xrd',
     data_path='data/lab_pbso4.dat',
     radiation_probe='xray',

tutorials/cryst-struct_pd-neut-cwl_CoSiO4-D20.py

@@ -9,9 +9,9 @@
 # ## Import Library
 
 # %%
-from easydiffraction import Experiment
+from easydiffraction import ExperimentFactory
 from easydiffraction import Project
-from easydiffraction import SampleModel
+from easydiffraction import SampleModelFactory
 from easydiffraction import download_from_repository
 
 # %% [markdown]
@@ -23,7 +23,7 @@
 # #### Create Sample Model
 
 # %%
-model = SampleModel(name='cosio')
+model = SampleModelFactory.create(name='cosio')
 
 # %% [markdown]
 # #### Set Space Group
@@ -128,7 +128,7 @@
 # #### Create Experiment
 
 # %%
-expt = Experiment(name='d20', data_path='data/co2sio4_d20.xye')
+expt = ExperimentFactory.create(name='d20', data_path='data/co2sio4_d20.xye')
 
 # %% [markdown]
 # #### Set Instrument

tutorials/cryst-struct_pd-neut-cwl_HS-HRPT.py

@@ -9,9 +9,9 @@
 # ## Import Library
 
 # %%
-from easydiffraction import Experiment
+from easydiffraction import ExperimentFactory
 from easydiffraction import Project
-from easydiffraction import SampleModel
+from easydiffraction import SampleModelFactory
 from easydiffraction import download_from_repository
 
 # %% [markdown]
@@ -23,7 +23,7 @@
 # #### Create Sample Model
 
 # %%
-model = SampleModel(name='hs')
+model = SampleModelFactory.create(name='hs')
 
 # %% [markdown]
 # #### Set Space Group
@@ -125,7 +125,7 @@
 # #### Create Experiment
 
 # %%
-expt = Experiment(name='hrpt', data_path='data/hrpt_hs.xye')
+expt = ExperimentFactory.create(name='hrpt', data_path='data/hrpt_hs.xye')
 
 # %% [markdown]
 # #### Set Instrument

tutorials/cryst-struct_pd-neut-tof_Si-SEPD.py

@@ -9,9 +9,9 @@
 # ## Import Library
 
 # %%
-from easydiffraction import Experiment
+from easydiffraction import ExperimentFactory
 from easydiffraction import Project
-from easydiffraction import SampleModel
+from easydiffraction import SampleModelFactory
 from easydiffraction import download_from_repository
 
 # %% [markdown]
@@ -23,7 +23,7 @@
 # #### Create Sample Model
 
 # %%
-model = SampleModel(name='si')
+model = SampleModelFactory.create(name='si')
 
 # %% [markdown]
 # #### Set Space Group
@@ -66,7 +66,9 @@
 # #### Create Experiment
 
 # %%
-expt = Experiment(name='sepd', data_path='data/sepd_si.xye', beam_mode='time-of-flight')
+expt = ExperimentFactory.create(
+    name='sepd', data_path='data/sepd_si.xye', beam_mode='time-of-flight'
+)
 
 # %% [markdown]
 # #### Set Instrument

tutorials/cryst-struct_pd-neut-tof_multidata_NCAF-WISH.py

@@ -12,9 +12,9 @@
 # ## Import Library
 
 # %%
-from easydiffraction import Experiment
+from easydiffraction import ExperimentFactory
 from easydiffraction import Project
-from easydiffraction import SampleModel
+from easydiffraction import SampleModelFactory
 from easydiffraction import download_from_repository
 
 # %% [markdown]
@@ -26,7 +26,7 @@
 # #### Create Sample Model
 
 # %%
-model = SampleModel(name='ncaf')
+model = SampleModelFactory.create(name='ncaf')
 
 # %% [markdown]
 # #### Set Space Group
@@ -124,14 +124,14 @@
 # #### Create Experiment
 
 # %%
-expt56 = Experiment(
+expt56 = ExperimentFactory.create(
     name='wish_5_6',
     data_path='data/wish_ncaf_5_6.xys',
     beam_mode='time-of-flight',
 )
 
 # %%
-expt47 = Experiment(
+expt47 = ExperimentFactory.create(
     name='wish_4_7',
     data_path='data/wish_ncaf_4_7.xys',
     beam_mode='time-of-flight',

tutorials/cryst-struct_pd-neut-tof_multiphase-LBCO-Si_McStas.py

@@ -9,9 +9,9 @@
 # ## Import Library
 
 # %%
-from easydiffraction import Experiment
+from easydiffraction import ExperimentFactory
 from easydiffraction import Project
-from easydiffraction import SampleModel
+from easydiffraction import SampleModelFactory
 from easydiffraction import download_from_repository
 
 # %% [markdown]
@@ -23,7 +23,7 @@
 # ### Create Sample Model 1: LBCO
 
 # %%
-model_1 = SampleModel(name='lbco')
+model_1 = SampleModelFactory.create(name='lbco')
 
 # %% [markdown]
 # #### Set Space Group
@@ -85,7 +85,7 @@
 # ### Create Sample Model 2: Si
 
 # %%
-model_2 = SampleModel(name='si')
+model_2 = SampleModelFactory.create(name='si')
 
 # %% [markdown]
 # #### Set Space Group
@@ -129,7 +129,7 @@
 # #### Create Experiment
 
 # %%
-experiment = Experiment(
+experiment = ExperimentFactory.create(
     name='mcstas',
     data_path='data/mcstas_lbco-si.xye',
     sample_form='powder',