Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion doc/examples/KFe2As2-00838_twotheta.chi
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# SrXplanar configration #
# SrXplanar configuration #
[Experiment]
addmask = edgemask
integrationspace = twotheta
Expand Down
2 changes: 1 addition & 1 deletion src/diffpy/confutils/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@
##############################################################################

# package version
from diffpy.srxplanar.version import __version__
from diffpy.srxplanar.version import __version__ # noqa: F401

# End of file
11 changes: 6 additions & 5 deletions src/diffpy/srxplanar/mask.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ class Mask(object):
"""Provide methods for mask generation, including:

static mask: tif mask, npy mask
dymanic mask: masking dark pixels, bright pixels
dynamic mask: masking dark pixels, bright pixels
"""

xdimension = _configPropertyR("xdimension")
Expand Down Expand Up @@ -105,8 +105,9 @@ def dynamicMask(
"""Create a dynamic mask according to image array. This mask
changes for different images.

:param pic: 2d array, image array to be processed :parma dymask:
2d array, mask array used in average mask calculation
:param pic: 2d array, image array to be processed
:param dymask: 2d array, mask array used in average mask
calculation
:param brightpixelmask: pixels with much lower intensity compare
to adjacent pixels will be masked
:param darkpixelmask: pixels with much higher intensity compare
Expand Down Expand Up @@ -257,8 +258,8 @@ def flipImage(self, pic):
def saveMask(self, filename, pic=None, addmask=None):
"""Generate a mask according to the addmask and pic. save it to
.npy. 1 stands for masked pixel the mask has same order as the
pic, which means if the pic is flipped, the mask is fliped (when
pic is loaded though loadimage, it is flipped)
pic, which means if the pic is flipped, the mask is flipped
(when pic is loaded though loadimage, it is flipped)

:param filename: str, filename of mask file to be save
:param pic: 2d array, image array
Expand Down
2 changes: 1 addition & 1 deletion src/diffpy/srxplanar/saveresults.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ def save(self, rv):
:param rv: dict, result include integrated diffration intensity
the rv['chi'] should be a 2d array with shape (2,len of
intensity) or (3, len of intensity) file name is generated
according to orginal file name and savedirectory
according to original file name and savedirectory
"""
rv = self.saveChi(rv["chi"], rv["filename"])
if self.gsasoutput:
Expand Down
2 changes: 1 addition & 1 deletion src/diffpy/srxplanar/selfcalibrate.py
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@ def selfCalibrate(
list of str: eg. ['x', 'y', 'xy'] -> refine x, then y, then xy
:param cropedges: list of int or str
if list of int, it will be passed to srx instance and used as cropedges
if 'auto', the cropedges of srx instance will be set automaticly ,
if 'auto', the cropedges of srx instance will be set automatically ,
if 'x'('y'), then a slice along x(y) axis will be used
if 'box', then a box around the center will be used
if 'all', then use all pixels
Expand Down