Skip to content

fix: Replaced deprecated setScatteringFactorTableByType with scatteringfactortable #225

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sbillinge merged 2 commits into from
Oct 13, 2026
Merged

fix: Replaced deprecated setScatteringFactorTableByType with scatteringfactortable #225

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
59a472f
fix: replace deprecated setScatteringFactorTableByType in BasePDFGene…
cadenmyers13 Oct 13, 2026
4572e85
test: remove the setScatteringType tests
cadenmyers13 Oct 13, 2026
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
23 changes: 23 additions & 0 deletions news/replace-sft-by-type.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
**Added:**

* <news item>

**Changed:**

* <news item>

**Deprecated:**

* <news item>

**Removed:**

* <news item>

**Fixed:**

* Set the scattering factor table through the ``scatteringfactortable`` property in ``setScatteringType`` instead of the ``setScatteringFactorTableByType`` method deprecated in diffpy.srreal.

**Security:**

* <news item>
2 changes: 1 addition & 1 deletion src/diffpy/srfit/pdf/basepdfgenerator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ def setScatteringType(self, stype="X"):
ValueError
If stype is not a recognized scattering type.
"""
self._calc.setScatteringFactorTableByType(stype)
self._calc.scatteringfactortable = stype
# update the meta dictionary only if there was no exception
self.meta["stype"] = self.getScatteringType()
return
Expand Down
2 changes: 1 addition & 1 deletion tests/test_pdfgenerator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ def testGenerator(diffpy_srreal_available, datafile):
calc.rmin = r[0]
calc.rmax = r[-1] + 0.5 * calc.rstep
calc.qmax = qmax
calc.setScatteringFactorTableByType("N")
calc.scatteringfactortable = "N"
calc.eval(stru)
yref = calc.pdf

Expand Down
Loading