Merge branch 'master' of github.com:4dn-dcic/pairsqc into dev

4dn-dcic · Jul 6, 2017 · f3b94e4 · f3b94e4
2 parents 3b7204d 2408bd1
commit f3b94e4
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/VERSION_HISTORY.md b/VERSION_HISTORY.md
@@ -1,3 1,6 @@
 ### 0.1.2
  * When sample is not specified, 'sample' is used as a placeholder (instead of an empty string).
 
 ### 0.2.0
 * The report can now contain information about multiple samples.
  * `pairsqc.py` now takes sample name as an option (-s). The output files in the output report directory will have the sample name as file prefix.

diff --git a/pairsqc.py b/pairsqc.py
@@ -354,7 354,7 @@ def distance_histogram (pairs_file, chromsize_file, outfilename, cols=cols_pairs
  if args.sample_name:
  sample_name = args.sample_name
  else:
- sample_name = ''
  sample_name = 'sample'
 
  CIS_TRANS_OUT_FILE_PATH = outdir   '/'   sample_name   '.'   CIS_TRANS_OUT_FILE_SUFFIX
  PLOT_TABLE_OUT_FILE_PATH = outdir   '/'   sample_name   '.'   PLOT_TABLE_OUT_FILE_SUFFIX

diff --git a/test_samples/merged_nodup.tab.chrblock_sorted.txt.gz.px2 b/test_samples/merged_nodup.tab.chrblock_sorted.txt.gz.px2