Skip to content

Commit c1cb935

Browse files
committed
Merge branch 'develop'
2 parents eb5f6aa + 6a5cce5 commit c1cb935

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

docs/source/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
author = 'Peter Crowther and Christopher Daniel'
2323

2424
# The full version, including alpha/beta/rc tags
25-
release = '1.2.0'
25+
release = '1.2.1'
2626

2727

2828
# -- General configuration ---------------------------------------------------

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
setup(
77
name='xrdfit',
8-
version='1.2.0',
8+
version='1.2.1',
99
description='Automated fitting of XRD peaks using Pseudo-Voight fits',
1010
author='Peter Crowther, Christopher Daniel',
1111
long_description=long_description,

xrdfit/spectrum_fitting.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ def __init__(self, file_path: str, first_cake_angle: int = 90, delimiter="\t",
279279
self.num_evaluations = {}
280280
self.fit_time = {}
281281

282-
self.spectral_data = pd.read_table(file_path, delimiter=delimiter).to_numpy()
282+
self.spectral_data = pd.read_table(file_path, delimiter=delimiter, header=None).to_numpy()
283283

284284
def __str__(self):
285285
return f"FitSpectrum with {self.num_cakes} cakes. " \

0 commit comments

Comments
 (0)