Skip to content

Commit f55f9ef

Browse files
committed
chore: deprecate scatterFactoringTableByType method
1 parent cb27d55 commit f55f9ef

3 files changed

Lines changed: 29 additions & 2 deletions

File tree

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
**Added:**
2+
3+
* Added new api call for `scatteringfactortable` from `diffpy.srreal`
4+
5+
**Changed:**
6+
7+
* <news item>
8+
9+
**Deprecated:**
10+
11+
* <news item>
12+
13+
**Removed:**
14+
15+
* Removed the use of `scatterFactoringTableByType` method from `diffpy.srreal`
16+
17+
**Fixed:**
18+
19+
* <news item>
20+
21+
**Security:**
22+
23+
* <news item>

src/diffpy/srfit/pdf/basepdfgenerator.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
from diffpy.srfit.fitbase import ProfileGenerator
2727
from diffpy.srfit.fitbase.parameter import ParameterAdapter
2828
from diffpy.srfit.structure import struToParameterSet
29+
from diffpy.srreal.srreal_ext import SFTNeutron
2930

3031
# FIXME - Parameter creation will have to be smarter once deeper calculator
3132
# configuration is enabled.
@@ -190,7 +191,8 @@ def setScatteringType(self, stype="X"):
190191
191192
Raises ValueError for unknown scattering type.
192193
"""
193-
self._calc.setScatteringFactorTableByType(stype)
194+
self._calc.scatteringfactortable = SFTNeutron()
195+
self._calc.scatteringfactortable.createByType(stype)
194196
# update the meta dictionary only if there was no exception
195197
self.meta["stype"] = self.getScatteringType()
196198
return

tests/test_pdf.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424

2525
from diffpy.srfit.exceptions import SrFitError
2626
from diffpy.srfit.pdf import PDFContribution, PDFGenerator, PDFParser
27+
from diffpy.srreal.srreal_ext import SFTNeutron
2728

2829
# ----------------------------------------------------------------------------
2930

@@ -186,7 +187,8 @@ def testGenerator(diffpy_srreal_available, datafile):
186187
calc.rmin = r[0]
187188
calc.rmax = r[-1] + 0.5 * calc.rstep
188189
calc.qmax = qmax
189-
calc.setScatteringFactorTableByType("N")
190+
calc.scatteringfactortable = SFTNeutron()
191+
calc.scatteringfactortable.createByType("N")
190192
calc.eval(stru)
191193
yref = calc.pdf
192194

0 commit comments

Comments
 (0)