Skip to content

Commit

Permalink
Merge branch 'PEC_pix_minmax_order'
Browse files Browse the repository at this point in the history
  • Loading branch information
CCampJr committed Mar 25, 2022
2 parents 5c15117 + 68077cb commit 9a89c20
Show file tree
Hide file tree
Showing 129 changed files with 1,795 additions and 841 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ This document records all notable changes to
This project adheres to `PEP 440 -- Version Identification
and Dependency Specification <https://www.python.org/dev/peps/pep-0440/>`_.

0.4.2 (22-03-24)
----------------
- Changes to Phase Error Correction UI and some quality of life improvements

0.4.1 (22-03-24)
----------------
- The UI for Phase Error Correction now incorporates the wavenumber-increased parameter of 0.4 release
Expand Down
2 changes: 1 addition & 1 deletion crikit/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@
* Charles H. Camp Jr. <charles.camp@nist.gov>
"""

__version__ = '0.4.1'
__version__ = '0.4.2'
27 changes: 13 additions & 14 deletions crikit/ui/dialog_ploteffect.py
Original file line number Diff line number Diff line change
Expand Up @@ -338,15 +338,14 @@ def fcn(self, data_in):
# if winPlotEffect is not None:
# print(winPlotEffect.parameters)
#
## # ALS
# from crikit.ui.widget_ALS import widgetALS as _widgetALS
# # ALS
from crikit.ui.widget_ALS import widgetALS as _widgetALS

# rng = _np.arange(*_find_nearest(WN, [500, 3800])[1])
# plugin = _widgetALS(x=WN, rng=rng)
# winPlotEffect = DialogPlotEffect.dialogPlotEffect(CARS, x=WN,
# plugin=plugin)
# if winPlotEffect is not None:
# print(winPlotEffect.parameters)
plugin = _widgetALS(x=WN)
winPlotEffect = DialogPlotEffect.dialogPlotEffect(CARS, x=WN,
plugin=plugin)
if winPlotEffect is not None:
print(winPlotEffect.parameters)
#
# # ArPLS
# from crikit.ui.widget_ArPLS import widgetArPLS as _widgetArPLS
Expand Down Expand Up @@ -374,12 +373,12 @@ def fcn(self, data_in):
# print(winPlotEffect.parameters)
#
# KK
from crikit.ui.widget_KK import (widgetKK as _widgetKK)
plugin = _widgetKK()
winPlotEffect = DialogPlotEffect.dialogPlotEffect([NRB,CARS], x=WN,
plugin=plugin)
if winPlotEffect is not None:
print(winPlotEffect.parameters)
# from crikit.ui.widget_KK import (widgetKK as _widgetKK)
# plugin = _widgetKK()
# winPlotEffect = DialogPlotEffect.dialogPlotEffect([NRB,CARS], x=WN,
# plugin=plugin)
# if winPlotEffect is not None:
# print(winPlotEffect.parameters)

# # Calibrate
# from crikit.ui.widget_Calibrate import (widgetCalibrate as
Expand Down
Loading

0 comments on commit 9a89c20

Please sign in to comment.