Workflow generation script created workflow in output directory: %s
+Workflow name is: %s
+Workflow generation script run on host: %s
+%s+ """ % (os.getcwd(), args.workflow_name, socket.gethostname(), logdata) + kwds = {'title': 'Workflow Generation Log', + 'caption': "Log of the workflow script %s" % sys.argv[0], + 'cmd': ' '.join(sys.argv), } + save_fig_with_metadata(log_str, log_file_html.storage_path, **kwds) + + args_to_output = [sys.argv[0]] + for arg in sys.argv[1:]: + if arg.startswith('--'): + # This is an option, add tab + args_to_output.append(' ' + arg) + else: + # This is a parameter, add two tabs + args_to_output.append(' ' + arg) + + gen_str = '
' + ' \\\n'.join(args_to_output) + '' + kwds = {'title': 'Workflow Generation Command', + 'caption': "Command used to generate the workflow.", + 'cmd': ' '.join(sys.argv), } + save_fig_with_metadata(gen_str, gen_file_html.storage_path, **kwds) + layout.single_layout(rdir['workflow'], ([dashboard_file, gen_file_html, log_file_html])) + sys.exit(0) + + # setup sngl trigger distribution fitting jobs -# 'statfiles' is list of files used in calculating statistic +# 'statfiles' is list of files used in calculating coinc statistic # 'dqfiles' is the subset of files containing data quality information statfiles = [] @@ -454,8 +523,7 @@ for insp_file in full_insps: wf.setup_single_det_minifollowups\ (workflow, insp_file, hdfbank, insp_files_seg_file, data_analysed_name, trig_generated_name, 'daxes', currdir, - statfiles=wf.FileList(statfiles), - fg_file=censored_veto, fg_name='closed_box', + veto_file=censored_veto, veto_segment_name='closed_box', tags=insp_file.tags + [subsec]) ##################### COINC FULL_DATA plots ################################### @@ -572,14 +640,13 @@ splitbank_files_inj = wf.setup_splittable_workflow(workflow, [hdfbank], # setup the injection files inj_files_base, inj_tags = wf.setup_injection_workflow(workflow, output_dir="inj_files") - -inj_files = [] -for inj_file, tag in zip(inj_files_base, inj_tags): - inj_files.append(wf.inj_to_hdf(workflow, inj_file, 'inj_files', [tag])) +#load the files from the injection workflow +inj_files = inj_files_base inj_coincs = wf.FileList() found_inj_dict ={} + insps_dict = {} files_for_combined_injfind = [] diff --git a/pycbc/workflow/injection.py b/pycbc/workflow/injection.py index 6c91cc180ef..3c1406725d6 100644 --- a/pycbc/workflow/injection.py +++ b/pycbc/workflow/injection.py @@ -147,9 +147,11 @@ def cut_distant_injections(workflow, inj_file, out_dir, tags=None): return node.output_files[0] def inj_to_hdf(workflow, inj_file, out_dir, tags=None): - """ Convert injection file to hdf format. - - If the file is already PyCBC HDF format, this will just make a copy. + """ + Convert injection file to hdf format. + If the file has a PyCBC HDF format, + supply requires-format-conversion = FALSE in either [injections] or + [work """ if tags is None: tags = [] @@ -233,7 +235,9 @@ def setup_injection_workflow(workflow, output_dir=None, else: workflow.add_node(node) inj_file = node.output_files[0] - inj_files.append(inj_file) + injfile_hdf = inj_to_hdf(workflow, inj_file, output_dir, curr_tags) + inj_files.append(injfile_hdf) + elif injection_method == "PREGENERATED": file_attrs = { 'ifos': ['HL'], @@ -245,13 +249,22 @@ def setup_injection_workflow(workflow, output_dir=None, "injections-pregenerated-file", curr_tags ) - curr_file = resolve_url_to_file(injection_path, attrs=file_attrs) - inj_files.append(curr_file) + requires_conversion = workflow.cp.get_opt_tags( + "workflow-injections", + "requires-format-conversion", + curr_tags + ) + file = resolve_url_to_file(injection_path, attrs=file_attrs) + if requires_conversion == "TRUE": + logging.info(' Injection file conversion initiated') + injfile_hdf = inj_to_hdf(workflow, file, output_dir, curr_tags) + else: + inj_files.append(file) + else: - err = "Injection method must be one of IN_WORKFLOW, " + err = "Injection method must be one of IN_WORKFLOW." err += "AT_RUNTIME or PREGENERATED. Got %s." % (injection_method) raise ValueError(err) - inj_tags.append(inj_tag) logging.info("Leaving injection module.")