Skip to content
Snippets Groups Projects
Commit fc84405d authored by Peter Steinbach's avatar Peter Steinbach
Browse files

correct naming of output log depending on rule name

parent 47d1e253
No related branches found
No related tags found
No related merge requests found
...@@ -11,17 +11,14 @@ configfile: "tomancak_czi.json" ...@@ -11,17 +11,14 @@ configfile: "tomancak_czi.json"
padding_format = "{0:0"+str(padding_of_file_id(int(config["common"]["ntimepoints"])))+"d}" padding_format = "{0:0"+str(padding_of_file_id(int(config["common"]["ntimepoints"])))+"d}"
ds_format = "-"+padding_format+"-00.h5" ds_format = "-"+padding_format+"-00.h5"
# problematic needs padding of file_id # problematic needs padding of file_id
datasets = [ str(config["common"]["hdf5_xml_filename"].strip('\"')+(ds_format.format(item))) for item in range(int(config["common"]["ntimepoints"])) ] datasets = [ str(config["common"]["hdf5_xml_filename"].strip('\"')+(ds_format.format(item))) for item in range(int(config["common"]["ntimepoints"])) ]
xml_merge_in = produce_xml_merge_job_files(datasets) xml_merge_in = produce_xml_merge_job_files(datasets)
rule done: rule done:
#input: [ ds+"_fusion" for ds in datasets ]
#input: [ ds + "_" + config["common"]["fusion_switch"] for ds in datasets ]
#input: config["hdf5_output"]["output_xml"] + ".xml"
input: [ ds + "_output_hdf5" for ds in datasets ] input: [ ds + "_output_hdf5" for ds in datasets ]
#input: config["hdf5_output"]["output_xml"].strip('\"') + ".xml"
rule resave_prepared: rule resave_prepared:
input: expand("{dataset}.{suffix}",dataset=[ config["common"]["hdf5_xml_filename"] ], suffix=["xml","h5"]) input: expand("{dataset}.{suffix}",dataset=[ config["common"]["hdf5_xml_filename"] ], suffix=["xml","h5"])
...@@ -377,7 +374,7 @@ rule deconvolution: ...@@ -377,7 +374,7 @@ rule deconvolution:
rule define_output: rule define_output:
input: [ item + "_" + config["common"]["fusion_switch"] for item in datasets ], glob.glob('TP*') input: [ item + "_" + config["common"]["fusion_switch"] for item in datasets ], glob.glob('TP*')
output: config["hdf5_output"]["output_xml"].strip('\"') + ".xml" output: config["hdf5_output"]["output_xml"].strip('\"') + ".xml"
log: "define_xml_tif.log" log: "define_output.log"
run: run:
cmd_string = produce_string( cmd_string = produce_string(
"""{fiji-prefix} {fiji-app} \ """{fiji-prefix} {fiji-app} \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment