easydiffraction 0.2.1__tar.gz → 0.3.0__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/.github/workflows/ci-testing.yaml +2 -2
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/PKG-INFO +6 -5
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/README.md +3 -3
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/examples/Fitting_pd-neut-tof_Si-SEPD.ipynb +244 -41
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/src/easydiffraction/calculators/cryspy/calculator.py +26 -1
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/src/easydiffraction/calculators/cryspy/wrapper.py +10 -2
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/src/easydiffraction/calculators/wrapper_base.py +4 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/src/easydiffraction/calculators/wrapper_factory.py +3 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/src/easydiffraction/io/cif.py +2 -4
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/src/easydiffraction/io/cif_reader.py +2 -2
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/src/easydiffraction/job/experiment/backgrounds/background.py +1 -1
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/src/easydiffraction/job/experiment/experiment.py +15 -1
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/src/easydiffraction/job/job.py +42 -17
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/src/easydiffraction/job/old_sample/old_sample.py +8 -1
- {easydiffraction-0.2.1/tests/integration_tests → easydiffraction-0.3.0/tests/functional_tests}/fitting/test_fitting_pd-neut.py +5 -3
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/tests/unit_tests/job/experiment/test_experiment.py +1 -1
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/tests/unit_tests/job/test_job.py +3 -3
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/tools/linting_and_formatting.sh +1 -1
- easydiffraction-0.3.0/tools/run_notebooks.sh +6 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/tools/run_tests.sh +3 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/.github/dependabot.yml +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/.github/release-drafter.yml +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/.github/workflows/delete-old-runs.yml +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/.github/workflows/ossar-analysis.yml +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/.github/workflows/pypi-publish.yml +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/.github/workflows/release-drafter.yml +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/.github/workflows/verify-pr-labels.yml +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/.gitignore +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/.prettierignore +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/CONTRIBUTING.md +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/DEVELOPMENT.md +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/LICENSE +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/examples/Change-minimizer.ipynb +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/examples/Define-experiment.ipynb +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/examples/Define-model.ipynb +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/examples/Fitting-emcee_pd-neut-cwl_LBCO-HRPT.ipynb +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/examples/Fitting_pd-neut-cwl_LBCO-HRPT.ipynb +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/examples/Fitting_pd-neut-tof_NCAF-WISH.ipynb +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/examples/Simulation_pd-xray_NaCl.ipynb +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/examples/data/d1a.cif +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/examples/data/hrpt.xye +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/examples/data/lbco.cif +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/examples/data/lbco_adp.cif +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/examples/data/ncaf.cif +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/examples/data/sepd.xye +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/examples/data/si.cif +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/examples/data/wish.xye +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/examples_old/3T2@LLB.xye +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/examples_old/D1A@ILL.xye +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/examples_old/Fitting.ipynb +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/examples_old/Fitting_PD-CW_La0.5Ba0.5CoO3-HRPT@PSI/fitting.ipynb +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/examples_old/Fitting_PD-CW_La0.5Ba0.5CoO3-HRPT@PSI/fitting.py +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/examples_old/Fitting_PD-CW_La0.5Ba0.5CoO3-HRPT@PSI/hrpt.xye +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/examples_old/Fitting_PD-TOF_Si-SEPD@Argonne/fitting copy.py +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/examples_old/Fitting_PD-TOF_Si-SEPD@Argonne/fitting.ipynb +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/examples_old/Fitting_PD-TOF_Si-SEPD@Argonne/fitting.py +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/examples_old/Fitting_PD-TOF_Si-SEPD@Argonne/sepd.xye +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/examples_old/Fitting_PD-TOF_Si-SEPD@Argonne/si.cif +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/examples_old/Fitting_TOF.ipynb +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/examples_old/Fitting_TOF_xye.ipynb +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/examples_old/Fitting_multiphase.ipynb +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/examples_old/PDF/Calculate_PDF_Profile_Ni.ipynb +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/examples_old/PDF/Fitting_PDF_Profile_Ni.ipynb +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/examples_old/PDF/Fitting_PDF_Profile_Si.ipynb +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/examples_old/PDF/data/4507226.cif +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/examples_old/PDF/data/Ni-xray.gr +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/examples_old/PDF/data/Ni.cif +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/examples_old/PDF/data/Si_calibration_cryostat_100A.fgr +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/examples_old/PDF/data/Si_calibration_cryostat_20A.fgr +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/examples_old/PDF/data/Si_calibration_cryostat_20A_01Rmin.fgr +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/examples_old/PDF/data/Si_calibration_cryostat_50A.fgr +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/examples_old/PDF/data/Si_calibration_cryostat_50A_01Rmin.fgr +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/examples_old/PDF2/Calculate_PDF_Profile.ipynb +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/examples_old/PDF2/Fitting_PDF_Profile.ipynb +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/examples_old/PDF2/Ni-xray.gr +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/examples_old/PDF2/Ni.cif +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/examples_old/PDF2/Ni_fitting.py +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/examples_old/PDF2/Ni_profile.py +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/examples_old/PbSO4.cif +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/examples_old/PolNPD5T.cif +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/examples_old/Polarized.ipynb +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/examples_old/Simulation.ipynb +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/examples_old/Simulation_xray.ipynb +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/examples_old/TestingAPI/CrysPy/rhochi_unpolarized_tof_powder_Si/calc_chisq.py +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/examples_old/TestingAPI/CrysPy/rhochi_unpolarized_tof_powder_Si/cryspy_PbSO4-D1A@ILL.rcif +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/examples_old/TestingAPI/CrysPy/rhochi_unpolarized_tof_powder_Si/cryspy_unpolarized_tof_powder_Si.rcif +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/examples_old/TestingAPI/CrysPy/rhochi_unpolarized_tof_powder_Si/refinement.py +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/examples_old/TestingAPI/CrysPy/rhochi_unpolarized_tof_powder_Si/rhochi_unpolarized_tof_powder_CeCuAl.rcif +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/examples_old/TestingAPI/EDB/experiments/d1a.cif +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/examples_old/TestingAPI/EDB/models/pbso4.cif +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/examples_old/TestingAPI/EDB/models/pbso4_dark.png +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/examples_old/TestingAPI/EDB/project.cif +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/examples_old/TestingAPI/EDB/summary/report.cif +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/examples_old/TestingAPI/EDL/D1A@ILL.xye +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/examples_old/TestingAPI/EDL/PbSO4.cif +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/examples_old/TestingAPI/EDL/TestingAPI.py +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/examples_old/advanced/refinement_bumps_dream.ipynb +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/examples_old/advanced/refinement_emcee.ipynb +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/examples_old/d1a.cif +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/examples_old/diamond_exp.xye +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/examples_old/diamond_phase.cif +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/examples_old/experiment_polarized.xye +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/examples_old/multiphase.cif +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/examples_old/ncaf.cif +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/examples_old/structure_polarized.cif +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/examples_old/wish.cif +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/prettierrc.toml +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/pyproject.toml +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/src/easydiffraction/__init__.py +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/src/easydiffraction/calculators/__init__.py +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/src/easydiffraction/calculators/cryspy/parser.py +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/src/easydiffraction/calculators/pdffit2/calculator.py +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/src/easydiffraction/calculators/pdffit2/wrapper.py +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/src/easydiffraction/calculators/pycrysfml/calculator.py +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/src/easydiffraction/calculators/pycrysfml/wrapper.py +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/src/easydiffraction/calculators/wrapper_types.py +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/src/easydiffraction/io/__init__.py +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/src/easydiffraction/job/__init__.py +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/src/easydiffraction/job/analysis/__init__.py +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/src/easydiffraction/job/analysis/analysis.py +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/src/easydiffraction/job/experiment/__init__.py +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/src/easydiffraction/job/experiment/backgrounds/__init__.py +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/src/easydiffraction/job/experiment/backgrounds/factorial.py +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/src/easydiffraction/job/experiment/backgrounds/point.py +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/src/easydiffraction/job/experiment/common.py +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/src/easydiffraction/job/experiment/data_container.py +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/src/easydiffraction/job/experiment/experiment_type.py +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/src/easydiffraction/job/experiment/pd_1d.py +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/src/easydiffraction/job/experiment/polarization.py +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/src/easydiffraction/job/experiment/simulation.py +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/src/easydiffraction/job/model/__init__.py +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/src/easydiffraction/job/model/phase.py +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/src/easydiffraction/job/model/site.py +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/src/easydiffraction/job/old_sample/__init__.py +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/src/easydiffraction/job/project/__init__.py +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/src/easydiffraction/job/summary/__init__.py +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/src/easydiffraction/main.py +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/src/easydiffraction/utils.py +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/tests/data/PbSO4.cif +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/tests/data/PolNPD5T.cif +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/tests/data/d1a.cif +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/tests/data/hrpt.xye +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/tests/data/lbco.cif +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/tests/data/scipp.cif +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/tests/data/sepd.xye +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/tests/data/si.cif +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/tests/integration_tests/scipp/test_scipp.py +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/tests/unit_tests/job/experiment/test_experiment_type.py +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/tests_old/integration_tests/CFML_Cryspy.png +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/tests_old/integration_tests/FittingData.ipynb +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/tests_old/integration_tests/FittingData_CFML-xarrays.ipynb +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/tests_old/integration_tests/FittingData_CFML.ipynb +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/tests_old/integration_tests/PbSO4.cif +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/tests_old/integration_tests/PbSO4_neutrons_short.xye +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/tests_old/integration_tests/PbSO4_xrays_short.xye +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/tests_old/integration_tests/SrTiO3.cif +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/tests_old/integration_tests/WorkedExample2.ipynb +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/tests_old/integration_tests/fit_script.py +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/tests_old/integration_tests/test1.py +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/tests_old/integration_tests/test3.py +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/tests_old/integration_tests/workedExample1.ipynb +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/tests_old/integration_tests/xarray_test.ipynb +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/tests_old/unit_tests/Calculators/__init__.py +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/tests_old/unit_tests/Elements/__init__.py +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/tests_old/unit_tests/Interfaces/__init__.py +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/tests_old/unit_tests/test_Jobs.py +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/tests_old/unit_tests/test_Runner.py +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/tests_old/unit_tests/test_interface.py +0 -0
- {easydiffraction-0.2.1 → easydiffraction-0.3.0}/tests_old/unit_tests/test_sample.py +0 -0
|
@@ -14,7 +14,7 @@
|
|
|
14
14
|
# - Download the Python package from the previous job
|
|
15
15
|
# - Install the downloaded Python package
|
|
16
16
|
# - Test the code base
|
|
17
|
-
# - Check if
|
|
17
|
+
# - Check if Jupyter Notebooks run without errors
|
|
18
18
|
|
|
19
19
|
name: Test code, notebooks and package
|
|
20
20
|
|
|
@@ -251,7 +251,7 @@ jobs:
|
|
|
251
251
|
run: >
|
|
252
252
|
pytest tests/ --color=yes -n auto
|
|
253
253
|
|
|
254
|
-
- name: Check if
|
|
254
|
+
- name: Check if Jupyter Notebooks run without errors
|
|
255
255
|
shell: bash
|
|
256
256
|
run: >
|
|
257
257
|
pytest --nbmake examples/ --ignore-glob='examples/*emcee*'
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
Metadata-Version: 2.
|
|
1
|
+
Metadata-Version: 2.4
|
|
2
2
|
Name: easydiffraction
|
|
3
|
-
Version: 0.
|
|
3
|
+
Version: 0.3.0
|
|
4
4
|
Summary: Making diffraction data analysis and modelling easy
|
|
5
5
|
Project-URL: homepage, https://easydiffraction.org
|
|
6
6
|
Project-URL: documentation, https://docs.easydiffraction.org/lib
|
|
@@ -36,6 +36,7 @@ License: BSD 3-Clause License
|
|
|
36
36
|
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
|
|
37
37
|
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
|
38
38
|
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
39
|
+
License-File: LICENSE
|
|
39
40
|
Classifier: Development Status :: 4 - Beta
|
|
40
41
|
Classifier: License :: OSI Approved :: BSD License
|
|
41
42
|
Classifier: Operating System :: OS Independent
|
|
@@ -75,11 +76,11 @@ Description-Content-Type: text/markdown
|
|
|
75
76
|
<p align='left'>
|
|
76
77
|
<picture>
|
|
77
78
|
<!-- light mode logo -->
|
|
78
|
-
<source media='(prefers-color-scheme: light)' srcset='https://raw.githubusercontent.com/EasyScience/
|
|
79
|
+
<source media='(prefers-color-scheme: light)' srcset='https://raw.githubusercontent.com/EasyScience/BrandingResources/refs/heads/master/EasyDiffraction/logos/ed-logo_light.svg'>
|
|
79
80
|
<!-- dark mode logo -->
|
|
80
|
-
<source media='(prefers-color-scheme: dark)' srcset='https://raw.githubusercontent.com/EasyScience/
|
|
81
|
+
<source media='(prefers-color-scheme: dark)' srcset='https://raw.githubusercontent.com/EasyScience/BrandingResources/refs/heads/master/EasyDiffraction/logos/ed-logo_dark.svg'>
|
|
81
82
|
<!-- default logo == light mode logo -->
|
|
82
|
-
<img src='https://raw.githubusercontent.com/EasyScience/
|
|
83
|
+
<img src='https://raw.githubusercontent.com/EasyScience/BrandingResources/refs/heads/master/EasyDiffraction/logos/ed-logo_light.svg' alt='EasyDiffraction'>
|
|
83
84
|
</picture>
|
|
84
85
|
</p>
|
|
85
86
|
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
<p align='left'>
|
|
2
2
|
<picture>
|
|
3
3
|
<!-- light mode logo -->
|
|
4
|
-
<source media='(prefers-color-scheme: light)' srcset='https://raw.githubusercontent.com/EasyScience/
|
|
4
|
+
<source media='(prefers-color-scheme: light)' srcset='https://raw.githubusercontent.com/EasyScience/BrandingResources/refs/heads/master/EasyDiffraction/logos/ed-logo_light.svg'>
|
|
5
5
|
<!-- dark mode logo -->
|
|
6
|
-
<source media='(prefers-color-scheme: dark)' srcset='https://raw.githubusercontent.com/EasyScience/
|
|
6
|
+
<source media='(prefers-color-scheme: dark)' srcset='https://raw.githubusercontent.com/EasyScience/BrandingResources/refs/heads/master/EasyDiffraction/logos/ed-logo_dark.svg'>
|
|
7
7
|
<!-- default logo == light mode logo -->
|
|
8
|
-
<img src='https://raw.githubusercontent.com/EasyScience/
|
|
8
|
+
<img src='https://raw.githubusercontent.com/EasyScience/BrandingResources/refs/heads/master/EasyDiffraction/logos/ed-logo_light.svg' alt='EasyDiffraction'>
|
|
9
9
|
</picture>
|
|
10
10
|
</p>
|
|
11
11
|
|
|
@@ -16,6 +16,10 @@
|
|
|
16
16
|
"execution_count": null,
|
|
17
17
|
"id": "99026183",
|
|
18
18
|
"metadata": {
|
|
19
|
+
"ExecuteTime": {
|
|
20
|
+
"end_time": "2025-01-23T09:34:43.698644Z",
|
|
21
|
+
"start_time": "2025-01-23T09:34:43.695633Z"
|
|
22
|
+
},
|
|
19
23
|
"tags": [
|
|
20
24
|
"hide_in_docs"
|
|
21
25
|
]
|
|
@@ -46,7 +50,12 @@
|
|
|
46
50
|
"cell_type": "code",
|
|
47
51
|
"execution_count": null,
|
|
48
52
|
"id": "cec2a6a5",
|
|
49
|
-
"metadata": {
|
|
53
|
+
"metadata": {
|
|
54
|
+
"ExecuteTime": {
|
|
55
|
+
"end_time": "2025-01-23T09:34:49.088064Z",
|
|
56
|
+
"start_time": "2025-01-23T09:34:46.202611Z"
|
|
57
|
+
}
|
|
58
|
+
},
|
|
50
59
|
"outputs": [],
|
|
51
60
|
"source": [
|
|
52
61
|
"import easydiffraction as ed"
|
|
@@ -72,7 +81,12 @@
|
|
|
72
81
|
"cell_type": "code",
|
|
73
82
|
"execution_count": null,
|
|
74
83
|
"id": "3a6a92e0",
|
|
75
|
-
"metadata": {
|
|
84
|
+
"metadata": {
|
|
85
|
+
"ExecuteTime": {
|
|
86
|
+
"end_time": "2025-01-23T09:34:52.380083Z",
|
|
87
|
+
"start_time": "2025-01-23T09:34:52.337822Z"
|
|
88
|
+
}
|
|
89
|
+
},
|
|
76
90
|
"outputs": [],
|
|
77
91
|
"source": [
|
|
78
92
|
"job = ed.Job(type='tof')\n",
|
|
@@ -93,7 +107,12 @@
|
|
|
93
107
|
"cell_type": "code",
|
|
94
108
|
"execution_count": null,
|
|
95
109
|
"id": "d8d3d078",
|
|
96
|
-
"metadata": {
|
|
110
|
+
"metadata": {
|
|
111
|
+
"ExecuteTime": {
|
|
112
|
+
"end_time": "2025-01-23T09:34:53.372500Z",
|
|
113
|
+
"start_time": "2025-01-23T09:34:53.360076Z"
|
|
114
|
+
}
|
|
115
|
+
},
|
|
97
116
|
"outputs": [],
|
|
98
117
|
"source": [
|
|
99
118
|
"phase = ed.Phase(name='si')"
|
|
@@ -111,10 +130,17 @@
|
|
|
111
130
|
"cell_type": "code",
|
|
112
131
|
"execution_count": null,
|
|
113
132
|
"id": "784719ae",
|
|
114
|
-
"metadata": {
|
|
133
|
+
"metadata": {
|
|
134
|
+
"ExecuteTime": {
|
|
135
|
+
"end_time": "2025-01-23T09:39:32.198479Z",
|
|
136
|
+
"start_time": "2025-01-23T09:39:31.964001Z"
|
|
137
|
+
}
|
|
138
|
+
},
|
|
115
139
|
"outputs": [],
|
|
116
140
|
"source": [
|
|
117
|
-
"phase.space_group.name_hm_alt = 'F d -3 m'"
|
|
141
|
+
"phase.space_group.name_hm_alt = 'F d -3 m'\n",
|
|
142
|
+
"print(phase.space_group.name_hm_alt)\n",
|
|
143
|
+
"print(phase.space_group.it_coordinate_system_code)"
|
|
118
144
|
]
|
|
119
145
|
},
|
|
120
146
|
{
|
|
@@ -129,7 +155,12 @@
|
|
|
129
155
|
"cell_type": "code",
|
|
130
156
|
"execution_count": null,
|
|
131
157
|
"id": "9d66e7dc",
|
|
132
|
-
"metadata": {
|
|
158
|
+
"metadata": {
|
|
159
|
+
"ExecuteTime": {
|
|
160
|
+
"end_time": "2025-01-23T09:35:50.841182Z",
|
|
161
|
+
"start_time": "2025-01-23T09:35:50.838592Z"
|
|
162
|
+
}
|
|
163
|
+
},
|
|
133
164
|
"outputs": [],
|
|
134
165
|
"source": [
|
|
135
166
|
"phase.cell.length_a = 5.43146"
|
|
@@ -147,14 +178,19 @@
|
|
|
147
178
|
"cell_type": "code",
|
|
148
179
|
"execution_count": null,
|
|
149
180
|
"id": "a180af30",
|
|
150
|
-
"metadata": {
|
|
181
|
+
"metadata": {
|
|
182
|
+
"ExecuteTime": {
|
|
183
|
+
"end_time": "2025-01-23T09:35:51.944868Z",
|
|
184
|
+
"start_time": "2025-01-23T09:35:51.876608Z"
|
|
185
|
+
}
|
|
186
|
+
},
|
|
151
187
|
"outputs": [],
|
|
152
188
|
"source": [
|
|
153
189
|
"phase.atom_sites.append(label='Si',\n",
|
|
154
190
|
" type_symbol='Si',\n",
|
|
155
|
-
" fract_x=0,\n",
|
|
156
|
-
" fract_y=0,\n",
|
|
157
|
-
" fract_z=0,\n",
|
|
191
|
+
" fract_x=0.125,\n",
|
|
192
|
+
" fract_y=0.125,\n",
|
|
193
|
+
" fract_z=0.125,\n",
|
|
158
194
|
" occupancy=1,\n",
|
|
159
195
|
" b_iso_or_equiv=0.529)"
|
|
160
196
|
]
|
|
@@ -171,7 +207,12 @@
|
|
|
171
207
|
"cell_type": "code",
|
|
172
208
|
"execution_count": null,
|
|
173
209
|
"id": "6b670878",
|
|
174
|
-
"metadata": {
|
|
210
|
+
"metadata": {
|
|
211
|
+
"ExecuteTime": {
|
|
212
|
+
"end_time": "2025-01-23T09:35:53.792410Z",
|
|
213
|
+
"start_time": "2025-01-23T09:35:53.333729Z"
|
|
214
|
+
}
|
|
215
|
+
},
|
|
175
216
|
"outputs": [],
|
|
176
217
|
"source": [
|
|
177
218
|
"job.add_phase(phase=phase)\n",
|
|
@@ -190,7 +231,12 @@
|
|
|
190
231
|
"cell_type": "code",
|
|
191
232
|
"execution_count": null,
|
|
192
233
|
"id": "08d364c1",
|
|
193
|
-
"metadata": {
|
|
234
|
+
"metadata": {
|
|
235
|
+
"ExecuteTime": {
|
|
236
|
+
"end_time": "2025-01-23T09:35:54.843688Z",
|
|
237
|
+
"start_time": "2025-01-23T09:35:54.838709Z"
|
|
238
|
+
}
|
|
239
|
+
},
|
|
194
240
|
"outputs": [],
|
|
195
241
|
"source": [
|
|
196
242
|
"phase = job.phases['si']\n",
|
|
@@ -209,7 +255,12 @@
|
|
|
209
255
|
"cell_type": "code",
|
|
210
256
|
"execution_count": null,
|
|
211
257
|
"id": "0339f8c6",
|
|
212
|
-
"metadata": {
|
|
258
|
+
"metadata": {
|
|
259
|
+
"ExecuteTime": {
|
|
260
|
+
"end_time": "2025-01-23T09:35:55.871734Z",
|
|
261
|
+
"start_time": "2025-01-23T09:35:55.866129Z"
|
|
262
|
+
}
|
|
263
|
+
},
|
|
213
264
|
"outputs": [],
|
|
214
265
|
"source": [
|
|
215
266
|
"job.show_crystal_structure(id='si')"
|
|
@@ -229,7 +280,12 @@
|
|
|
229
280
|
"cell_type": "code",
|
|
230
281
|
"execution_count": null,
|
|
231
282
|
"id": "008b6844",
|
|
232
|
-
"metadata": {
|
|
283
|
+
"metadata": {
|
|
284
|
+
"ExecuteTime": {
|
|
285
|
+
"end_time": "2025-01-23T09:36:01.251409Z",
|
|
286
|
+
"start_time": "2025-01-23T09:36:01.249209Z"
|
|
287
|
+
}
|
|
288
|
+
},
|
|
233
289
|
"outputs": [],
|
|
234
290
|
"source": [
|
|
235
291
|
"ed.download_from_repository('sepd.xye', destination='data')"
|
|
@@ -247,7 +303,12 @@
|
|
|
247
303
|
"cell_type": "code",
|
|
248
304
|
"execution_count": null,
|
|
249
305
|
"id": "615a112f",
|
|
250
|
-
"metadata": {
|
|
306
|
+
"metadata": {
|
|
307
|
+
"ExecuteTime": {
|
|
308
|
+
"end_time": "2025-01-23T09:36:02.278118Z",
|
|
309
|
+
"start_time": "2025-01-23T09:36:02.274659Z"
|
|
310
|
+
}
|
|
311
|
+
},
|
|
251
312
|
"outputs": [],
|
|
252
313
|
"source": [
|
|
253
314
|
"with open('data/sepd.xye') as f:\n",
|
|
@@ -266,7 +327,12 @@
|
|
|
266
327
|
"cell_type": "code",
|
|
267
328
|
"execution_count": null,
|
|
268
329
|
"id": "30cb31e4",
|
|
269
|
-
"metadata": {
|
|
330
|
+
"metadata": {
|
|
331
|
+
"ExecuteTime": {
|
|
332
|
+
"end_time": "2025-01-23T09:36:04.527565Z",
|
|
333
|
+
"start_time": "2025-01-23T09:36:03.309012Z"
|
|
334
|
+
}
|
|
335
|
+
},
|
|
270
336
|
"outputs": [],
|
|
271
337
|
"source": [
|
|
272
338
|
"job.add_experiment_from_file('data/sepd.xye')"
|
|
@@ -284,7 +350,12 @@
|
|
|
284
350
|
"cell_type": "code",
|
|
285
351
|
"execution_count": null,
|
|
286
352
|
"id": "35daa023",
|
|
287
|
-
"metadata": {
|
|
353
|
+
"metadata": {
|
|
354
|
+
"ExecuteTime": {
|
|
355
|
+
"end_time": "2025-01-23T09:36:04.741828Z",
|
|
356
|
+
"start_time": "2025-01-23T09:36:04.532639Z"
|
|
357
|
+
}
|
|
358
|
+
},
|
|
288
359
|
"outputs": [],
|
|
289
360
|
"source": [
|
|
290
361
|
"job.show_experiment_chart(show_legend=False)"
|
|
@@ -302,7 +373,12 @@
|
|
|
302
373
|
"cell_type": "code",
|
|
303
374
|
"execution_count": null,
|
|
304
375
|
"id": "8fc580cc",
|
|
305
|
-
"metadata": {
|
|
376
|
+
"metadata": {
|
|
377
|
+
"ExecuteTime": {
|
|
378
|
+
"end_time": "2025-01-23T09:36:06.222660Z",
|
|
379
|
+
"start_time": "2025-01-23T09:36:06.219628Z"
|
|
380
|
+
}
|
|
381
|
+
},
|
|
306
382
|
"outputs": [],
|
|
307
383
|
"source": [
|
|
308
384
|
"background_points = [(x, 200) for x in range(0, 35000, 5000)]\n",
|
|
@@ -313,7 +389,12 @@
|
|
|
313
389
|
"cell_type": "code",
|
|
314
390
|
"execution_count": null,
|
|
315
391
|
"id": "98ae6fa7",
|
|
316
|
-
"metadata": {
|
|
392
|
+
"metadata": {
|
|
393
|
+
"ExecuteTime": {
|
|
394
|
+
"end_time": "2025-01-23T09:36:07.171646Z",
|
|
395
|
+
"start_time": "2025-01-23T09:36:07.164518Z"
|
|
396
|
+
}
|
|
397
|
+
},
|
|
317
398
|
"outputs": [],
|
|
318
399
|
"source": [
|
|
319
400
|
"job.set_background(background_points)"
|
|
@@ -331,7 +412,12 @@
|
|
|
331
412
|
"cell_type": "code",
|
|
332
413
|
"execution_count": null,
|
|
333
414
|
"id": "825592f8",
|
|
334
|
-
"metadata": {
|
|
415
|
+
"metadata": {
|
|
416
|
+
"ExecuteTime": {
|
|
417
|
+
"end_time": "2025-01-23T09:36:08.633462Z",
|
|
418
|
+
"start_time": "2025-01-23T09:36:08.598582Z"
|
|
419
|
+
}
|
|
420
|
+
},
|
|
335
421
|
"outputs": [],
|
|
336
422
|
"source": [
|
|
337
423
|
"job.show_experiment_chart()"
|
|
@@ -357,7 +443,12 @@
|
|
|
357
443
|
"cell_type": "code",
|
|
358
444
|
"execution_count": null,
|
|
359
445
|
"id": "20faa380",
|
|
360
|
-
"metadata": {
|
|
446
|
+
"metadata": {
|
|
447
|
+
"ExecuteTime": {
|
|
448
|
+
"end_time": "2025-01-23T09:36:10.810522Z",
|
|
449
|
+
"start_time": "2025-01-23T09:36:10.542087Z"
|
|
450
|
+
}
|
|
451
|
+
},
|
|
361
452
|
"outputs": [],
|
|
362
453
|
"source": [
|
|
363
454
|
"job.show_analysis_chart()"
|
|
@@ -375,7 +466,12 @@
|
|
|
375
466
|
"cell_type": "code",
|
|
376
467
|
"execution_count": null,
|
|
377
468
|
"id": "17e0a56a",
|
|
378
|
-
"metadata": {
|
|
469
|
+
"metadata": {
|
|
470
|
+
"ExecuteTime": {
|
|
471
|
+
"end_time": "2025-01-23T09:36:11.934668Z",
|
|
472
|
+
"start_time": "2025-01-23T09:36:11.932778Z"
|
|
473
|
+
}
|
|
474
|
+
},
|
|
379
475
|
"outputs": [],
|
|
380
476
|
"source": [
|
|
381
477
|
"pattern_params = job.pattern\n",
|
|
@@ -394,7 +490,12 @@
|
|
|
394
490
|
"cell_type": "code",
|
|
395
491
|
"execution_count": null,
|
|
396
492
|
"id": "117ddecb",
|
|
397
|
-
"metadata": {
|
|
493
|
+
"metadata": {
|
|
494
|
+
"ExecuteTime": {
|
|
495
|
+
"end_time": "2025-01-23T09:36:13.979115Z",
|
|
496
|
+
"start_time": "2025-01-23T09:36:13.739198Z"
|
|
497
|
+
}
|
|
498
|
+
},
|
|
398
499
|
"outputs": [],
|
|
399
500
|
"source": [
|
|
400
501
|
"experiment_params.dtt1 = 7476.91\n",
|
|
@@ -415,7 +516,12 @@
|
|
|
415
516
|
"cell_type": "code",
|
|
416
517
|
"execution_count": null,
|
|
417
518
|
"id": "ebcd54e6",
|
|
418
|
-
"metadata": {
|
|
519
|
+
"metadata": {
|
|
520
|
+
"ExecuteTime": {
|
|
521
|
+
"end_time": "2025-01-23T09:36:15.840051Z",
|
|
522
|
+
"start_time": "2025-01-23T09:36:15.599464Z"
|
|
523
|
+
}
|
|
524
|
+
},
|
|
419
525
|
"outputs": [],
|
|
420
526
|
"source": [
|
|
421
527
|
"phase.scale = 10\n",
|
|
@@ -434,7 +540,12 @@
|
|
|
434
540
|
"cell_type": "code",
|
|
435
541
|
"execution_count": null,
|
|
436
542
|
"id": "119417fb",
|
|
437
|
-
"metadata": {
|
|
543
|
+
"metadata": {
|
|
544
|
+
"ExecuteTime": {
|
|
545
|
+
"end_time": "2025-01-23T09:36:17.591973Z",
|
|
546
|
+
"start_time": "2025-01-23T09:36:17.351422Z"
|
|
547
|
+
}
|
|
548
|
+
},
|
|
438
549
|
"outputs": [],
|
|
439
550
|
"source": [
|
|
440
551
|
"experiment_params.alpha0 = 0.024\n",
|
|
@@ -459,7 +570,12 @@
|
|
|
459
570
|
"cell_type": "code",
|
|
460
571
|
"execution_count": null,
|
|
461
572
|
"id": "bdf7b6ca",
|
|
462
|
-
"metadata": {
|
|
573
|
+
"metadata": {
|
|
574
|
+
"ExecuteTime": {
|
|
575
|
+
"end_time": "2025-01-23T09:36:19.093090Z",
|
|
576
|
+
"start_time": "2025-01-23T09:36:19.090310Z"
|
|
577
|
+
}
|
|
578
|
+
},
|
|
463
579
|
"outputs": [],
|
|
464
580
|
"source": [
|
|
465
581
|
"phase.scale.free = True\n",
|
|
@@ -478,7 +594,12 @@
|
|
|
478
594
|
"cell_type": "code",
|
|
479
595
|
"execution_count": null,
|
|
480
596
|
"id": "95bafcea",
|
|
481
|
-
"metadata": {
|
|
597
|
+
"metadata": {
|
|
598
|
+
"ExecuteTime": {
|
|
599
|
+
"end_time": "2025-01-23T09:36:21.045573Z",
|
|
600
|
+
"start_time": "2025-01-23T09:36:21.036012Z"
|
|
601
|
+
}
|
|
602
|
+
},
|
|
482
603
|
"outputs": [],
|
|
483
604
|
"source": [
|
|
484
605
|
"job.show_free_parameters()"
|
|
@@ -496,7 +617,12 @@
|
|
|
496
617
|
"cell_type": "code",
|
|
497
618
|
"execution_count": null,
|
|
498
619
|
"id": "4b5e21a7",
|
|
499
|
-
"metadata": {
|
|
620
|
+
"metadata": {
|
|
621
|
+
"ExecuteTime": {
|
|
622
|
+
"end_time": "2025-01-23T09:36:29.455450Z",
|
|
623
|
+
"start_time": "2025-01-23T09:36:23.550380Z"
|
|
624
|
+
}
|
|
625
|
+
},
|
|
500
626
|
"outputs": [],
|
|
501
627
|
"source": [
|
|
502
628
|
"job.fit()"
|
|
@@ -514,7 +640,12 @@
|
|
|
514
640
|
"cell_type": "code",
|
|
515
641
|
"execution_count": null,
|
|
516
642
|
"id": "050c6bd9",
|
|
517
|
-
"metadata": {
|
|
643
|
+
"metadata": {
|
|
644
|
+
"ExecuteTime": {
|
|
645
|
+
"end_time": "2025-01-23T09:36:30.975635Z",
|
|
646
|
+
"start_time": "2025-01-23T09:36:30.971687Z"
|
|
647
|
+
}
|
|
648
|
+
},
|
|
518
649
|
"outputs": [],
|
|
519
650
|
"source": [
|
|
520
651
|
"job.show_free_parameters()"
|
|
@@ -532,7 +663,12 @@
|
|
|
532
663
|
"cell_type": "code",
|
|
533
664
|
"execution_count": null,
|
|
534
665
|
"id": "131e47e6",
|
|
535
|
-
"metadata": {
|
|
666
|
+
"metadata": {
|
|
667
|
+
"ExecuteTime": {
|
|
668
|
+
"end_time": "2025-01-23T09:36:32.693558Z",
|
|
669
|
+
"start_time": "2025-01-23T09:36:32.458104Z"
|
|
670
|
+
}
|
|
671
|
+
},
|
|
536
672
|
"outputs": [],
|
|
537
673
|
"source": [
|
|
538
674
|
"job.show_analysis_chart()"
|
|
@@ -550,7 +686,12 @@
|
|
|
550
686
|
"cell_type": "code",
|
|
551
687
|
"execution_count": null,
|
|
552
688
|
"id": "21c37665",
|
|
553
|
-
"metadata": {
|
|
689
|
+
"metadata": {
|
|
690
|
+
"ExecuteTime": {
|
|
691
|
+
"end_time": "2025-01-23T09:36:34.541278Z",
|
|
692
|
+
"start_time": "2025-01-23T09:36:34.538036Z"
|
|
693
|
+
}
|
|
694
|
+
},
|
|
554
695
|
"outputs": [],
|
|
555
696
|
"source": [
|
|
556
697
|
"for background_point in pattern_params.backgrounds[0]:\n",
|
|
@@ -569,7 +710,12 @@
|
|
|
569
710
|
"cell_type": "code",
|
|
570
711
|
"execution_count": null,
|
|
571
712
|
"id": "9ad2de56",
|
|
572
|
-
"metadata": {
|
|
713
|
+
"metadata": {
|
|
714
|
+
"ExecuteTime": {
|
|
715
|
+
"end_time": "2025-01-23T09:36:36.029938Z",
|
|
716
|
+
"start_time": "2025-01-23T09:36:36.025177Z"
|
|
717
|
+
}
|
|
718
|
+
},
|
|
573
719
|
"outputs": [],
|
|
574
720
|
"source": [
|
|
575
721
|
"job.show_free_parameters()"
|
|
@@ -587,7 +733,12 @@
|
|
|
587
733
|
"cell_type": "code",
|
|
588
734
|
"execution_count": null,
|
|
589
735
|
"id": "5f71d9a9",
|
|
590
|
-
"metadata": {
|
|
736
|
+
"metadata": {
|
|
737
|
+
"ExecuteTime": {
|
|
738
|
+
"end_time": "2025-01-23T09:36:41.747019Z",
|
|
739
|
+
"start_time": "2025-01-23T09:36:37.380768Z"
|
|
740
|
+
}
|
|
741
|
+
},
|
|
591
742
|
"outputs": [],
|
|
592
743
|
"source": [
|
|
593
744
|
"job.fit()"
|
|
@@ -605,7 +756,12 @@
|
|
|
605
756
|
"cell_type": "code",
|
|
606
757
|
"execution_count": null,
|
|
607
758
|
"id": "be12cf69",
|
|
608
|
-
"metadata": {
|
|
759
|
+
"metadata": {
|
|
760
|
+
"ExecuteTime": {
|
|
761
|
+
"end_time": "2025-01-23T09:36:41.757332Z",
|
|
762
|
+
"start_time": "2025-01-23T09:36:41.753025Z"
|
|
763
|
+
}
|
|
764
|
+
},
|
|
609
765
|
"outputs": [],
|
|
610
766
|
"source": [
|
|
611
767
|
"job.show_free_parameters()"
|
|
@@ -623,7 +779,12 @@
|
|
|
623
779
|
"cell_type": "code",
|
|
624
780
|
"execution_count": null,
|
|
625
781
|
"id": "6288fbc7",
|
|
626
|
-
"metadata": {
|
|
782
|
+
"metadata": {
|
|
783
|
+
"ExecuteTime": {
|
|
784
|
+
"end_time": "2025-01-23T09:36:42.069945Z",
|
|
785
|
+
"start_time": "2025-01-23T09:36:41.830912Z"
|
|
786
|
+
}
|
|
787
|
+
},
|
|
627
788
|
"outputs": [],
|
|
628
789
|
"source": [
|
|
629
790
|
"job.show_analysis_chart()"
|
|
@@ -641,7 +802,12 @@
|
|
|
641
802
|
"cell_type": "code",
|
|
642
803
|
"execution_count": null,
|
|
643
804
|
"id": "8e94c526",
|
|
644
|
-
"metadata": {
|
|
805
|
+
"metadata": {
|
|
806
|
+
"ExecuteTime": {
|
|
807
|
+
"end_time": "2025-01-23T09:36:42.133001Z",
|
|
808
|
+
"start_time": "2025-01-23T09:36:42.130652Z"
|
|
809
|
+
}
|
|
810
|
+
},
|
|
645
811
|
"outputs": [],
|
|
646
812
|
"source": [
|
|
647
813
|
"experiment_params.sigma0.free = True\n",
|
|
@@ -661,7 +827,12 @@
|
|
|
661
827
|
"cell_type": "code",
|
|
662
828
|
"execution_count": null,
|
|
663
829
|
"id": "0c2e839b",
|
|
664
|
-
"metadata": {
|
|
830
|
+
"metadata": {
|
|
831
|
+
"ExecuteTime": {
|
|
832
|
+
"end_time": "2025-01-23T09:36:43.229251Z",
|
|
833
|
+
"start_time": "2025-01-23T09:36:43.226632Z"
|
|
834
|
+
}
|
|
835
|
+
},
|
|
665
836
|
"outputs": [],
|
|
666
837
|
"source": [
|
|
667
838
|
"for background_point in pattern_params.backgrounds[0]:\n",
|
|
@@ -680,7 +851,12 @@
|
|
|
680
851
|
"cell_type": "code",
|
|
681
852
|
"execution_count": null,
|
|
682
853
|
"id": "8ec068a3",
|
|
683
|
-
"metadata": {
|
|
854
|
+
"metadata": {
|
|
855
|
+
"ExecuteTime": {
|
|
856
|
+
"end_time": "2025-01-23T09:36:44.678178Z",
|
|
857
|
+
"start_time": "2025-01-23T09:36:44.673718Z"
|
|
858
|
+
}
|
|
859
|
+
},
|
|
684
860
|
"outputs": [],
|
|
685
861
|
"source": [
|
|
686
862
|
"job.show_free_parameters()"
|
|
@@ -698,7 +874,12 @@
|
|
|
698
874
|
"cell_type": "code",
|
|
699
875
|
"execution_count": null,
|
|
700
876
|
"id": "7ea43a58",
|
|
701
|
-
"metadata": {
|
|
877
|
+
"metadata": {
|
|
878
|
+
"ExecuteTime": {
|
|
879
|
+
"end_time": "2025-01-23T09:36:56.746074Z",
|
|
880
|
+
"start_time": "2025-01-23T09:36:46.229223Z"
|
|
881
|
+
}
|
|
882
|
+
},
|
|
702
883
|
"outputs": [],
|
|
703
884
|
"source": [
|
|
704
885
|
"job.fit()"
|
|
@@ -716,7 +897,12 @@
|
|
|
716
897
|
"cell_type": "code",
|
|
717
898
|
"execution_count": null,
|
|
718
899
|
"id": "c00fcbbe",
|
|
719
|
-
"metadata": {
|
|
900
|
+
"metadata": {
|
|
901
|
+
"ExecuteTime": {
|
|
902
|
+
"end_time": "2025-01-23T09:36:58.409307Z",
|
|
903
|
+
"start_time": "2025-01-23T09:36:58.405507Z"
|
|
904
|
+
}
|
|
905
|
+
},
|
|
720
906
|
"outputs": [],
|
|
721
907
|
"source": [
|
|
722
908
|
"job.show_free_parameters()"
|
|
@@ -734,7 +920,12 @@
|
|
|
734
920
|
"cell_type": "code",
|
|
735
921
|
"execution_count": null,
|
|
736
922
|
"id": "efb3b460",
|
|
737
|
-
"metadata": {
|
|
923
|
+
"metadata": {
|
|
924
|
+
"ExecuteTime": {
|
|
925
|
+
"end_time": "2025-01-23T09:37:00.179282Z",
|
|
926
|
+
"start_time": "2025-01-23T09:36:59.937539Z"
|
|
927
|
+
}
|
|
928
|
+
},
|
|
738
929
|
"outputs": [],
|
|
739
930
|
"source": [
|
|
740
931
|
"job.show_analysis_chart()"
|
|
@@ -746,6 +937,18 @@
|
|
|
746
937
|
"display_name": "Python 3 (ipykernel)",
|
|
747
938
|
"language": "python",
|
|
748
939
|
"name": "python3"
|
|
940
|
+
},
|
|
941
|
+
"language_info": {
|
|
942
|
+
"codemirror_mode": {
|
|
943
|
+
"name": "ipython",
|
|
944
|
+
"version": 3
|
|
945
|
+
},
|
|
946
|
+
"file_extension": ".py",
|
|
947
|
+
"mimetype": "text/x-python",
|
|
948
|
+
"name": "python",
|
|
949
|
+
"nbconvert_exporter": "python",
|
|
950
|
+
"pygments_lexer": "ipython3",
|
|
951
|
+
"version": "3.12.0"
|
|
749
952
|
}
|
|
750
953
|
},
|
|
751
954
|
"nbformat": 4,
|
{easydiffraction-0.2.1 → easydiffraction-0.3.0}/src/easydiffraction/calculators/cryspy/calculator.py
RENAMED
|
@@ -12,8 +12,10 @@ from typing import Tuple
|
|
|
12
12
|
|
|
13
13
|
import cryspy
|
|
14
14
|
import numpy as np
|
|
15
|
+
from cryspy.A_functions_base.function_2_space_group import get_default_it_coordinate_system_code_by_it_number
|
|
15
16
|
from cryspy.procedure_rhochi.rhochi_by_dictionary import rhochi_calc_chi_sq_by_dictionary
|
|
16
17
|
from easyscience import global_object as borg
|
|
18
|
+
from gemmi import find_spacegroup_by_name
|
|
17
19
|
|
|
18
20
|
from easydiffraction.calculators.cryspy.parser import calcObjAndDictToEdExperiments
|
|
19
21
|
from easydiffraction.calculators.cryspy.parser import cifV2ToV1
|
|
@@ -114,6 +116,8 @@ class Cryspy:
|
|
|
114
116
|
self._first_experiment_name = ''
|
|
115
117
|
self.exp_obj = None
|
|
116
118
|
self.chisq = None
|
|
119
|
+
self.name_hm_alt = ''
|
|
120
|
+
self.it_code = ''
|
|
117
121
|
self.excluded_points = []
|
|
118
122
|
self._cryspyData = Data() # {phase_name: CryspyPhase, exp_name: CryspyExperiment}
|
|
119
123
|
self._cryspyObject = self._cryspyData._cryspyObj
|
|
@@ -151,6 +155,9 @@ class Cryspy:
|
|
|
151
155
|
self.type = model_type
|
|
152
156
|
self.model = cls(**model)
|
|
153
157
|
|
|
158
|
+
def is_tof(self) -> bool:
|
|
159
|
+
return self.model.PREFIX.lower() == 'tof'
|
|
160
|
+
|
|
154
161
|
def createPhase(self, crystal_name: str, key: str = 'phase') -> str:
|
|
155
162
|
phase = cryspy.Phase(label=crystal_name, scale=1, igsize=0)
|
|
156
163
|
self.storage[key] = phase
|
|
@@ -215,7 +222,18 @@ class Cryspy:
|
|
|
215
222
|
cell = self.storage[cell_name]
|
|
216
223
|
crystal.cell = cell
|
|
217
224
|
|
|
218
|
-
def createSpaceGroup(self, key: str = 'spacegroup', name_hm_alt: str = '
|
|
225
|
+
def createSpaceGroup(self, key: str = 'spacegroup', name_hm_alt: str = '', it_code: Optional[str] = '') -> str:
|
|
226
|
+
self.name_hm_alt = name_hm_alt or self.name_hm_alt or 'P 1'
|
|
227
|
+
name_hm_alt = self.name_hm_alt
|
|
228
|
+
|
|
229
|
+
if not it_code:
|
|
230
|
+
sg = find_spacegroup_by_name(name_hm_alt)
|
|
231
|
+
self.it_code = get_default_it_coordinate_system_code_by_it_number(sg.number)
|
|
232
|
+
it_code = it_code or self.it_code
|
|
233
|
+
|
|
234
|
+
if it_code:
|
|
235
|
+
name_hm_alt += ':' + it_code
|
|
236
|
+
|
|
219
237
|
sg_split = name_hm_alt.split(':')
|
|
220
238
|
opts = {'name_hm_alt': sg_split[0]}
|
|
221
239
|
if len(sg_split) > 1:
|
|
@@ -258,6 +276,13 @@ class Cryspy:
|
|
|
258
276
|
break
|
|
259
277
|
sg_key = self.createSpaceGroup(key=sg_key, **kwargs)
|
|
260
278
|
self.assignSpaceGroup_toCrystal(sg_key, previous_key)
|
|
279
|
+
# here, the CIF has the new group, so reload
|
|
280
|
+
if not self.current_crystal:
|
|
281
|
+
return
|
|
282
|
+
if 'it_code' in kwargs:
|
|
283
|
+
cif = self.cif_str
|
|
284
|
+
self.updateModelCif(cif)
|
|
285
|
+
pass
|
|
261
286
|
|
|
262
287
|
def createAtom(self, atom_name: str, **kwargs) -> str:
|
|
263
288
|
atom = cryspy.AtomSite(**kwargs)
|