|
20 | 20 |
|
21 | 21 | import numpy |
22 | 22 |
|
23 | | -import diffpy.utils.parsers as parsers |
| 23 | +from diffpy.utils.parsers.loaddata import loadData |
| 24 | +from diffpy.utils.parsers.serialization import deserialize_data |
24 | 25 |
|
25 | 26 |
|
26 | 27 | def estimateScale(y_morph_in, y_target_in): |
@@ -117,7 +118,7 @@ def readPDF(fname): |
117 | 118 | Arrays read from data. |
118 | 119 | """ |
119 | 120 |
|
120 | | - rv = parsers.loaddata.loadData(fname, unpack=True) |
| 121 | + rv = loadData(fname, unpack=True) |
121 | 122 | if len(rv) >= 2: |
122 | 123 | return rv[:2] |
123 | 124 | return (None, None) |
@@ -145,7 +146,7 @@ def deserialize(serial_file): |
145 | 146 | dict |
146 | 147 | Data read from serial file. |
147 | 148 | """ |
148 | | - return parsers.serialization.deserialize_data(serial_file) |
| 149 | + return deserialize_data(serial_file) |
149 | 150 |
|
150 | 151 |
|
151 | 152 | def case_insensitive_dictionary_search(key: str, dictionary: dict): |
@@ -199,11 +200,11 @@ def field_sort(filepaths: list, field, reverse=False, serfile=None, get_field_va |
199 | 200 | files_field_values = [] |
200 | 201 | if serfile is None: |
201 | 202 | for path in filepaths: |
202 | | - fhd = parsers.loaddata.loadData(path, headers=True) |
| 203 | + fhd = loadData(path, headers=True) |
203 | 204 | files_field_values.append([path, case_insensitive_dictionary_search(field, fhd)]) |
204 | 205 | else: |
205 | 206 | # deserialize the serial file |
206 | | - des_dict = parsers.serialization.deserialize_data(serfile) |
| 207 | + des_dict = deserialize_data(serfile) |
207 | 208 |
|
208 | 209 | # get names of each file to search the serial file |
209 | 210 | import pathlib |
|
0 commit comments