Skip to content

Commit b36e3d3

Browse files
committed
chore: use Parameters instead of Arguments
1 parent de50055 commit b36e3d3

11 files changed

Lines changed: 45 additions & 45 deletions

File tree

docs/source/extending.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ external program before or after interfacing with SrFit. An example of a
180180
customized Profile is the ``SASProfile`` class in the
181181
``diffpy.srfit.sas.sasprofile`` module:
182182

183-
.. literalinclude:: /../../src/diffpy/srfit/sas/sasprofile.py
183+
.. literalinclude:: ../../src/diffpy/srfit/sas/sasprofile.py
184184
:pyobject: SASProfile
185185

186186
The ``__init__`` method sets the ``xobs``, ``yobs`` and ``dyobs`` attributes of

src/diffpy/srfit/equation/builder.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,8 @@ def makeEquation(
142142
):
143143
"""Make an equation from an equation string.
144144
145-
Arguments
146-
---------
145+
Parameters
146+
----------
147147
eqstr
148148
An equation in string form using standard python
149149
syntax. The equation string can use any function
@@ -308,8 +308,8 @@ def _prepareBuilders(self, eqstr, buildargs, argclass, argkw):
308308
arguments, and creates new arguments if allowed. In the process it
309309
rebuilds the newargs attribute.
310310
311-
Arguments
312-
---------
311+
Parameters
312+
----------
313313
eqstr
314314
An equation in string as specified in the makeEquation
315315
method.
@@ -553,8 +553,8 @@ class ArgumentBuilder(BaseBuilder):
553553
def __init__(self, value=None, name=None, const=False, arg=None):
554554
"""Create an ArgumentBuilder instance, containing a new Argument.
555555
556-
Arguments
557-
---------
556+
Parameters
557+
----------
558558
value
559559
The value of the wrapped Argument (float, default None)
560560
name
@@ -594,8 +594,8 @@ class OperatorBuilder(BaseBuilder):
594594
def __init__(self, name, op=None):
595595
"""Wrap an Operator or a function by name.
596596
597-
Arguments
598-
---------
597+
Parameters
598+
----------
599599
name
600600
The name of the wrapped Operator
601601
op

src/diffpy/srfit/equation/visitors/argfinder.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ class ArgFinder(Visitor):
3636
def __init__(self, getconsts=True):
3737
"""Initialize.
3838
39-
Arguments
40-
---------
39+
Parameters
40+
----------
4141
getconsts
4242
Flag indicating whether to parse constant arguments
4343
(default True).

src/diffpy/srfit/fitbase/fitrecipe.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -254,8 +254,8 @@ def removeParameterSet(self, parset):
254254
def residual(self, p=[]):
255255
"""Calculate the vector residual to be optimized.
256256
257-
Arguments
258-
---------
257+
Parameters
258+
----------
259259
p
260260
The list of current variable values, provided in the same order
261261
as the '_parameters' list. If p is an empty iterable (default),
@@ -305,8 +305,8 @@ def residual(self, p=[]):
305305
def scalarResidual(self, p=[]):
306306
"""Calculate the scalar residual to be optimized.
307307
308-
Arguments
309-
---------
308+
Parameters
309+
----------
310310
p
311311
The list of current variable values, provided in the same order
312312
as the '_parameters' list. If p is an empty iterable (default),

src/diffpy/srfit/fitbase/profile.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,8 @@ def loadParsedData(self, parser):
138138
def setObservedProfile(self, xobs, yobs, dyobs=None):
139139
"""Set the observed profile.
140140
141-
Arguments
142-
---------
141+
Parameters
142+
----------
143143
xobs
144144
Numpy array of the independent variable
145145
yobs
@@ -280,8 +280,8 @@ def _isobs(a):
280280
def setCalculationPoints(self, x):
281281
"""Set the calculation points.
282282
283-
Arguments
284-
---------
283+
Parameters
284+
----------
285285
x
286286
A non-empty numpy array containing the calculation points. If
287287
xobs exists, the bounds of x will be limited to its bounds.
@@ -414,8 +414,8 @@ def _validate(self):
414414
def rebinArray(A, xold, xnew):
415415
"""Rebin the an array by interpolating over the new x range.
416416
417-
Arguments
418-
---------
417+
Parameters
418+
----------
419419
A
420420
Array to interpolate
421421
xold

src/diffpy/srfit/fitbase/profileparser.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@ def parseString(self, patstring):
103103
104104
This wipes out the currently loaded data and selected bank number.
105105
106-
Arguments
107-
---------
106+
Parameters
107+
----------
108108
patstring
109109
A string containing the pattern
110110
@@ -117,8 +117,8 @@ def parseFile(self, filename):
117117
118118
This wipes out the currently loaded data and selected bank number.
119119
120-
Arguments
121-
---------
120+
Parameters
121+
----------
122122
filename
123123
The name of the file to parse
124124
@@ -151,8 +151,8 @@ def selectBank(self, index):
151151
parser is used to parse more data. This uses python list notation, so
152152
index -n returns the nth bank from the end.
153153
154-
Arguments
155-
---------
154+
Parameters
155+
----------
156156
index
157157
index of bank (integer, starting at 0).
158158
@@ -184,8 +184,8 @@ def getData(self, index=None):
184184
parser is used to parse more data. This uses python list notation, so
185185
index -n returns the nth bank from the end.
186186
187-
Arguments
188-
---------
187+
Parameters
188+
----------
189189
index
190190
index of bank (integer, starting at 0, default None). If
191191
index is None then the currently selected bank is used.

src/diffpy/srfit/fitbase/simplerecipe.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,8 @@ def loadParsedData(self, parser):
119119
def setObservedProfile(self, xobs, yobs, dyobs=None):
120120
"""Set the observed profile.
121121
122-
Arguments
123-
---------
122+
Parameters
123+
----------
124124
xobs
125125
Numpy array of the independent variable
126126
yobs
@@ -172,8 +172,8 @@ def setCalculationRange(self, xmin=None, xmax=None, dx=None):
172172
def setCalculationPoints(self, x):
173173
"""Set the calculation points.
174174
175-
Arguments
176-
---------
175+
Parameters
176+
----------
177177
x
178178
A non-empty numpy array containing the calculation points. If
179179
xobs exists, the bounds of x will be limited to its bounds.

src/diffpy/srfit/pdf/pdfparser.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,8 @@ def parseString(self, patstring):
114114
115115
This wipes out the currently loaded data and selected bank number.
116116
117-
Arguments
118-
---------
117+
Parameters
118+
----------
119119
patstring
120120
A string containing the pattern
121121

src/diffpy/srfit/sas/sasparser.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,8 @@ def parseFile(self, filename):
9494
9595
This wipes out the currently loaded data and selected bank number.
9696
97-
Arguments
98-
---------
97+
Parameters
98+
----------
9999
filename
100100
The name of the file to parse
101101
@@ -129,8 +129,8 @@ def parseString(self, patstring):
129129
130130
This wipes out the currently loaded data and selected bank number.
131131
132-
Arguments
133-
---------
132+
Parameters
133+
----------
134134
patstring
135135
A string containing the pattern
136136

src/diffpy/srfit/sas/sasprofile.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,8 @@ def setObservedProfile(self, xobs, yobs, dyobs=None):
9898
9999
This is overloaded to change the value within the datainfo object.
100100
101-
Arguments
102-
---------
101+
Parameters
102+
----------
103103
xobs
104104
Numpy array of the independent variable
105105
yobs

0 commit comments

Comments
 (0)