diff --git a/Snakefile b/Snakefile index 2941aee77c90e8fbd1ec6d0bf71ccee056ae6025..26d0cd15302382597d7cc7aa1f5e3e9a5bdb872a 100644 --- a/Snakefile +++ b/Snakefile @@ -465,7 +465,7 @@ rule collectstats: shell: "python {input.colpy} --sample-name {params.sample_name} " \ "--pre-qc-fastq {input.preqc} --post-qc-fastq {input.postq} " \ "--mapped-num {input.mnum} --mapped-basenum {input.mbnum} " \ - "--unique-num {input.unum} --unique-basenum {input.mbnum} " \ + "--unique-num {input.unum} --usable-basenum {input.mbnum} " \ "--female-threshold {params.fthresh} {input.cov} > {output}" rule merge_stats: diff --git a/src/collect_stats.py b/src/collect_stats.py index af845a6f688d8e4c0d5506c0955c7eb64bbaabc7..8115f4ffd88890663f29774e09d5825693e00c6b 100644 --- a/src/collect_stats.py +++ b/src/collect_stats.py @@ -19,12 +19,12 @@ def parse_num_file(path): def determine_gender(covstat, fthresh): """Determine gender from a covstat json """ cv = covstat['stats']['coverage'] - all = cv['_all'] + all = cv['_all']['median'] if 'chrX' in cv: - x = cv['chrX'] + x = cv['chrX']['median'] elif 'X' in cv: - x = cv['X'] + x = cv['X']['median'] else: return "NA" @@ -68,7 +68,7 @@ def determine_gender(covstat, fthresh): required=True, help="Usable basenum") @click.option("--female-threshold", - type=click.INT, + type=click.FLOAT, default=0.6, help="Female threshold of X/all cov") @click.argument("covstats", @@ -107,7 +107,7 @@ def main(sample_name, pre_qc_fastq, post_qc_fastq, mapped_num, mapped_basenum, "covstats": covl } - json.dumps(covl) + print(json.dumps(d)) if __name__ == "__main__":