fix another bug in submit-grid-jobs

1 files changed, 7 insertions, 3 deletions

diff --git a/utils/submit-grid-jobs b/utils/submit-grid-jobs
index 748f952..06ddae9 100755
--- a/utils/submit-grid-jobs
+++ b/utils/submit-grid-jobs
@@ -15,7 +15,10 @@
 # this program. If not, see <https://www.gnu.org/licenses/>.
 
 from __future__ import print_function, division
-import yaml
+try:
+    from yaml import full_load as load
+except ImportError:
+    from yaml import load
 import string
 from os.path import split, splitext, join, abspath
 import uuid
@@ -74,7 +77,7 @@ def submit_job(filename, run, gtid, dir, dqxx_dir, min_nhit, max_particles):
 
     # set up the arguments for the template
     executable = join(dir,"fit")
-    args = [filename,"-o",output,"--gtid",gtid,"--min-nhit",min_nhit,"--max-particles",max_particles]
+    args = [tail,"-o",output,"--gtid",gtid,"--min-nhit",min_nhit,"--max-particles",max_particles]
     transfer_input_files = ",".join([filename,join(dqxx_dir,"DQXX_%010i.dat" % run)] + [join(dir,filename) for filename in INPUT_FILES])
     transfer_output_files = ",".join([output])
 
@@ -126,7 +129,8 @@ if __name__ == '__main__':
             output = check_output([join(args.dir,"zdab-cat"),"--skip-second-event",filename])
         else:
             output = check_output([join(args.dir,"zdab-cat"),filename])
-        data = yaml.load(output)
+
+        data = load(output)
 
         filename = abspath(filename)