Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
f03cec7
pdf calculator + experiment + instr parameters
rozyczko Apr 12, 2025
0007dee
added test and files
rozyczko Apr 12, 2025
a59c0ee
fix variable name
rozyczko Apr 12, 2025
2c417dc
added bokeh to enable PDF charts
rozyczko Apr 14, 2025
040bf2c
add diffpy deps
rozyczko Apr 14, 2025
3159461
renamed the example file
rozyczko Apr 15, 2025
9457a19
pdffit2 is now available in binary distros on pypi!
rozyczko Apr 15, 2025
0af13b5
Moves plotting functionality into a dedicated module
AndrewSazonov Apr 23, 2025
3ed2c24
Adds checks for the existence of attributes in summary before printing
AndrewSazonov Apr 23, 2025
1da3fad
Sets default uncertainty to 0.05 for PDF data
AndrewSazonov Apr 23, 2025
ae1b97b
Refactors the pdffit calculator to improve code clarity
AndrewSazonov Apr 23, 2025
4414f7e
Adds NaCl example for single PDF fit
AndrewSazonov Apr 23, 2025
b2f6fb2
Adds SrFe2As2 example for single PDF fit (Fitting is not working)
AndrewSazonov Apr 23, 2025
7dab79a
Renames diffraction_type to scattering_type, as more commonly used
AndrewSazonov Apr 24, 2025
10b9ea9
np.Inf -> np.inf in numpy2
rozyczko Apr 24, 2025
a0bbf50
Ensures peak broadening parameters are only printed if they exist
AndrewSazonov Apr 25, 2025
21ddf6c
Moves PDF-related parameters from Instrument to Peak
AndrewSazonov Apr 25, 2025
c4ad867
Merge remote-tracking branch 'origin/pdf' into pdf
AndrewSazonov Apr 25, 2025
8f388bd
Fixes all examples to follow new API. Adds PDF functional test
AndrewSazonov Apr 25, 2025
b635b28
Refactors the PDF fitting example and calculator. Adds qmax
AndrewSazonov Apr 25, 2025
f21fb21
Fixes another PDF example
AndrewSazonov Apr 25, 2025
8a862c9
Removes old ADPs setting logic as ADPs are taken from CIF
AndrewSazonov Apr 28, 2025
4b18a37
Reduces default error value for PDF experiments
AndrewSazonov Apr 28, 2025
5e87361
Updates NaCl example and test
AndrewSazonov Apr 28, 2025
b79e192
Removes `add_attribute` method as it is no longer needed
AndrewSazonov Apr 28, 2025
fd549a0
Adds TODO for CIF conversion module
AndrewSazonov Apr 28, 2025
2f06002
Merge branch 'develop' into pdf
AndrewSazonov Apr 28, 2025
fd02c69
Fixes unit tests
AndrewSazonov Apr 28, 2025
4697b93
added two (nonworking) neutron examples - Al2O3 and Ni.
rozyczko Apr 29, 2025
09741a3
Added conda installation for libcblas on windows (#55)
rozyczko Apr 29, 2025
c7298ec
Updates PDF fitting example for Nickel and adds to tests
AndrewSazonov Apr 29, 2025
56755ef
Adds another PDF example from NOMAD
AndrewSazonov Apr 29, 2025
c0709a1
Modifies Ni example
AndrewSazonov Apr 29, 2025
d9fbade
Cleans up PDFFit calculator
AndrewSazonov Apr 30, 2025
d153043
Removes PDF from the instrument.py as not needed
AndrewSazonov Apr 30, 2025
921fcf4
Refactors experiment to be adapted for Bragg and Total scattering
AndrewSazonov Apr 30, 2025
0bd0d95
Checks that experiment object has instrument attribute
AndrewSazonov Apr 30, 2025
dd27a34
Temporary remove type hint due to circular dependency
AndrewSazonov Apr 30, 2025
49a760c
Update functional tests
AndrewSazonov Apr 30, 2025
597eee9
Updates the single fit example
AndrewSazonov Apr 30, 2025
87fa68a
Updates the PDF single fit example
AndrewSazonov Apr 30, 2025
d941c2a
Checks if experiment object has instrument attribute
AndrewSazonov Apr 30, 2025
176f992
Refactors to support beam_mode='time-of-flight' for PDF
AndrewSazonov Apr 30, 2025
0481a6d
Removed the Al2O3 example for now
AndrewSazonov Apr 30, 2025
5b518fc
Minor fixes
AndrewSazonov Apr 30, 2025
f2dbb6d
Implements experiment specific axes labels
AndrewSazonov Apr 30, 2025
eca4608
Adds default_sy variable
AndrewSazonov Apr 30, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions .github/workflows/ci-testing.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,19 @@ jobs:
shell: bash
run: python -m pip install --upgrade pip

- name: Setup conda
uses: s-weigand/setup-conda@v1
if: runner.os == 'Windows'
with:
update-conda: true
python-version: ${{ matrix.python-version }}
conda-channels: conda-forge

- name: Install libcblas for pdffit on Windows
shell: bash
if: runner.os == 'Windows'
run: conda install -y -c conda-forge libcblas

- name: Install Python dependencies
shell: bash
run: python -m pip install -r requirements.txt
Expand Down
14 changes: 14 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,22 @@ Development playground for the new EasyDiffraction API.
python -c "from pycrysfml import cfml_py_utilities"
```

- Install CBLAS library, required for using the Pair Distribution Function feature.
This step is required only on Windows.
```bash
# Install from the conda-forge channel
conda install libcblas -c conda-forge

# Try to import the module
python -c "import diffpy.pdffit2"
```

## Testing

- Unit tests:
```bash
PYTHONPATH=$(pwd)/src python -m pytest tests/unit_tests/ --color=yes -n auto
```
- Functional tests:
```bash
PYTHONPATH=$(pwd)/src python -m pytest tests/functional_tests/ --color=yes -n auto
Expand Down
Loading