Skip to content

Commit 6994931

Browse files
committed
more helpful printing, extract the ERR-ANALYSIS section of an entry
1 parent 4d041c7 commit 6994931

File tree

2 files changed

+21
-8
lines changed

2 files changed

+21
-8
lines changed

src/exfor_tools/curate.py

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ def query(self, **kwargs):
173173
print("\n========================================================")
174174
print(f"Succesfully parsed {len(entries.keys())} entries")
175175
print(f"Failed to parse {len(failed_parses.keys())} entries:")
176-
print_failed_parses(failed_parses)
176+
#print_failed_parses(failed_parses)
177177
print("\n========================================================")
178178

179179
return entries, failed_parses
@@ -310,14 +310,21 @@ def number_of_data_pts(self):
310310
n_data_pts = {}
311311
n_measurements = {}
312312
for quantity, entries in self.data.items():
313-
n_measurements[quantity] = np.sum(
314-
[len(entry.measurements) for entry_id, entry in entries.entries.items()]
313+
n_measurements[quantity] = int(
314+
np.sum(
315+
[
316+
len(entry.measurements)
317+
for entry_id, entry in entries.entries.items()
318+
]
319+
)
315320
)
316-
n_data_pts[quantity] = np.sum(
317-
[
318-
np.sum([m.rows for m in entry.measurements])
319-
for entry_id, entry in entries.entries.items()
320-
]
321+
n_data_pts[quantity] = int(
322+
np.sum(
323+
[
324+
np.sum([m.rows for m in entry.measurements])
325+
for entry_id, entry in entries.entries.items()
326+
]
327+
)
321328
)
322329

323330
return n_data_pts, n_measurements
@@ -376,3 +383,5 @@ def print_failed_parses(failed_parses):
376383
for k, v in failed_parses.items():
377384
print(f"Entry: {k}")
378385
print(v.failed_parses[k][0], " : ", v.failed_parses[k][1])
386+
print(v.err_analysis)
387+
print(v.subentry_err_analysis[v.failed_parses[k][0]])

src/exfor_tools/exfor_tools.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1022,6 +1022,10 @@ def __init__(
10221022
common = common_subentry["COMMON"]
10231023
self.common_labels = common.labels
10241024

1025+
self.subentry_err_analysis = {}
1026+
for subentry in subentry_ids:
1027+
self.subentry_err_analysis[subentry] = extract_err_analysis(entry_data[subentry])
1028+
10251029
entry_datasets = entry_data.getDataSets()
10261030
self.subentries = [key[1] for key in entry_datasets.keys()]
10271031
self.measurements = []

0 commit comments

Comments
 (0)