Skip to content

Commit f35ddc2

Browse files
committed
Revert some changes
1 parent cf4fbfc commit f35ddc2

3 files changed

Lines changed: 8 additions & 8 deletions

File tree

easyInterface/Diffraction/DataClasses/DataObj/Experiment.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -201,12 +201,12 @@ def __init__(self, x: list, y_obs: list, sy_obs: list, y_obs_up: Union[list, Non
201201
:param sy_obs_down: Polarised DOWN intensity error. None if non-polarised
202202
"""
203203
# 1d polarised powder diffraction data
204-
if y_obs_up is not None and sy_obs_up is not None and y_obs_down is not None and sy_obs_down is not None:
205-
super().__init__(x=x, y_obs=y_obs, sy_obs=sy_obs, y_obs_up=y_obs_up, sy_obs_up=sy_obs_up,
206-
y_obs_down=y_obs_down, sy_obs_down=sy_obs_down)
207-
# 1d unpolarised powder diffraction data
208-
else:
209-
super().__init__(x=x, y_obs=y_obs, sy_obs=sy_obs)
204+
# if y_obs_up is not None and sy_obs_up is not None and y_obs_down is not None and sy_obs_down is not None:
205+
super().__init__(x=x, y_obs=y_obs, sy_obs=sy_obs, y_obs_up=y_obs_up, sy_obs_up=sy_obs_up,
206+
y_obs_down=y_obs_down, sy_obs_down=sy_obs_down)
207+
# # 1d unpolarised powder diffraction data
208+
# else:
209+
# super().__init__(x=x, y_obs=y_obs, sy_obs=sy_obs)
210210

211211
@property
212212
def isPolarised(self) -> bool:

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
git+git://github.com/ikibalin/cryspy.git@transition-to-version-0.2#egg=cryspy-develop
22
dictdiffer
33
asteval
4-
pyaml
4+
pyyaml

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
'cryspy>=0.2.0',
1919
'dictdiffer',
2020
'asteval',
21-
'pyaml'
21+
'pyyaml'
2222
],
2323

2424
classifiers=[

0 commit comments

Comments
 (0)