diff options
| -rwxr-xr-x | utils/cat-grid-jobs | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/utils/cat-grid-jobs b/utils/cat-grid-jobs index 8cbdac3..8f53be1 100755 --- a/utils/cat-grid-jobs +++ b/utils/cat-grid-jobs @@ -59,9 +59,14 @@ def cat_grid_jobs(conn, output_dir, zdab_dir=None): root, ext = splitext(tail) # First, find all hdf5 result files - fit_results = c.execute("SELECT submit_file FROM state WHERE state = 'SUCCESS' AND filename = ? AND uuid = ?", (filename, uuid)).fetchall() - fit_results = [fit_result_filename[0] for fit_result_filename in fit_results] - fit_results = ['%s.hdf5' % splitext(fit_result_filename)[0] for fit_result_filename in fit_results] + fit_results = [] + for row in c.execute("SELECT gtid, particle_id FROM state WHERE state = 'SUCCESS' AND filename = ? AND uuid = ?", (filename, uuid)).fetchall(): + # all output files are prefixed with FILENAME_GTID_UUID + prefix = "%s_%08i_%i_%s" % (root,row['gtid'],row['particle_id'],uuid) + new_dir = "%s_%s" % (root,uuid) + # Note: We assume here that the output directory is the same as the + # directory where the fit results are stored. + fit_results.append(join(output_dir, new_dir, "%s.hdf5" % prefix)) if len(fit_results) == 0: log.verbose("No fit results found for %s (%s)" % (tail, uuid)) @@ -199,5 +204,7 @@ if __name__ == '__main__': conn = sqlite3.connect(args.db) + conn.row_factory = sqlite3.Row + cat_grid_jobs(conn, args.output_dir, args.zdab_dir) conn.close() |