diff options
| -rw-r--r-- | src/zdab-cat.c | 1 | ||||
| -rwxr-xr-x | utils/cat-grid-jobs | 7 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/zdab-cat.c b/src/zdab-cat.c index 3178626..c7f7a96 100644 --- a/src/zdab-cat.c +++ b/src/zdab-cat.c @@ -108,7 +108,6 @@ int main(int argc, char **argv) if (fout) { fprintf(fout, "git_sha1: %s\n", GitSHA1()); fprintf(fout, "git_dirty: %s\n", GitDirty()); - fprintf(fout, "data:\n"); } if (load_pmt_info()) { diff --git a/utils/cat-grid-jobs b/utils/cat-grid-jobs index c5eee11..5f22ee8 100755 --- a/utils/cat-grid-jobs +++ b/utils/cat-grid-jobs @@ -83,8 +83,11 @@ if __name__ == '__main__': total_events = 0 events_with_fit = 0 + doc = {'data': []} + for data in yaml.load_all(popen.stdout,Loader=Loader): if 'ev' not in data: + doc.update(data) continue for ev in data['ev']: @@ -97,6 +100,8 @@ if __name__ == '__main__': total_events += 1 + doc['data'].append(data) + popen.wait() # Print out number of fit results that were added. Hopefully, this will @@ -104,4 +109,4 @@ if __name__ == '__main__': # mismatching zdab and fit results print("added %i/%i fit results to a total of %i events" % (events_with_fit, len(fit_results), total_events),file=sys.stderr) - print(yaml.dump(data,default_flow_style=False)) + print(yaml.dump(doc,default_flow_style=False)) |