diff --git a/python/generate_per_sample_metrics.py b/python/generate_per_sample_metrics.py index a4e57711c..0b821521e 100644 --- a/python/generate_per_sample_metrics.py +++ b/python/generate_per_sample_metrics.py @@ -3,7 +3,7 @@ # # To run: # /humgen/gsa-hpprojects/software/bin/jython2.5.2/jython \ -# -J-classpath $STING_HOME/dist/sam-1.44.794.jar:$STING_HOME/dist/picard-1.44.794.jar:$STING_HOME/dist/picard-private-parts-1859.jar \ +# -J-classpath $STING_HOME/dist/sam-1.47.869.jar:$STING_HOME/dist/picard-1.47.869.jar:$STING_HOME/dist/picard-private-parts-1941.jar \ # $STING_HOME/python/generate_per_sample_metrics.py > # # To add a new metric: @@ -45,7 +45,7 @@ bam_list_filename = sys.argv[1] header = ['sample','HAPLOTYPES_CONFIDENTLY_MATCHING.MIN','HAPLOTYPES_CONFIDENTLY_MATCHING.MAX','HAPLOTYPES_CONFIDENTLY_MATCHING.MEDIAN', 'BAIT_SET','GENOME_SIZE','PCT_SELECTED_BASES','MEAN_TARGET_COVERAGE','ZERO_CVG_TARGETS_PCT','FOLD_80_BASE_PENALTY','PCT_TARGET_BASES_2X', 'PCT_TARGET_BASES_10X','PCT_TARGET_BASES_20X','PCT_TARGET_BASES_30X','HS_LIBRARY_SIZE','PCT_PF_READS_ALIGNED','PF_HQ_ERROR_RATE', - 'MEAN_READ_LENGTH','BAD_CYCLES','STRAND_BALANCE','PCT_CHIMERAS','PCT_ADAPTER','MEDIAN_INSERT_SIZE','TOTAL_SNPS'] + 'PF_INDEL_RATE','MEAN_READ_LENGTH','BAD_CYCLES','STRAND_BALANCE','PCT_CHIMERAS','PCT_ADAPTER','MEDIAN_INSERT_SIZE','TOTAL_SNPS'] data = ['%s'] * len(header) print string.join(header,'\t') @@ -88,6 +88,6 @@ for sample_id,filename in samples.items(): hybrid_selection_metrics.MEAN_TARGET_COVERAGE,hybrid_selection_metrics.ZERO_CVG_TARGETS_PCT,hybrid_selection_metrics.FOLD_80_BASE_PENALTY, hybrid_selection_metrics.PCT_TARGET_BASES_2X,hybrid_selection_metrics.PCT_TARGET_BASES_10X,hybrid_selection_metrics.PCT_TARGET_BASES_20X, hybrid_selection_metrics.PCT_TARGET_BASES_30X,hybrid_selection_metrics.HS_LIBRARY_SIZE,alignment_summary_metrics.PCT_PF_READS_ALIGNED, - alignment_summary_metrics.PF_HQ_ERROR_RATE,alignment_summary_metrics.MEAN_READ_LENGTH,alignment_summary_metrics.BAD_CYCLES, - alignment_summary_metrics.STRAND_BALANCE,alignment_summary_metrics.PCT_CHIMERAS,alignment_summary_metrics.PCT_ADAPTER, - insert_size_metrics.MEDIAN_INSERT_SIZE,dbsnp_matches.TOTAL_SNPS) + alignment_summary_metrics.PF_HQ_ERROR_RATE,alignment_summary_metrics.PF_INDEL_RATE,alignment_summary_metrics.MEAN_READ_LENGTH, + alignment_summary_metrics.BAD_CYCLES,alignment_summary_metrics.STRAND_BALANCE,alignment_summary_metrics.PCT_CHIMERAS, + alignment_summary_metrics.PCT_ADAPTER,insert_size_metrics.MEDIAN_INSERT_SIZE,dbsnp_matches.TOTAL_SNPS) diff --git a/settings/repository/edu.mit.broad/picard-private-parts-1859.jar b/settings/repository/edu.mit.broad/picard-private-parts-1941.jar similarity index 88% rename from settings/repository/edu.mit.broad/picard-private-parts-1859.jar rename to settings/repository/edu.mit.broad/picard-private-parts-1941.jar index 9a92da9ff..760db5cb8 100644 Binary files a/settings/repository/edu.mit.broad/picard-private-parts-1859.jar and b/settings/repository/edu.mit.broad/picard-private-parts-1941.jar differ diff --git a/settings/repository/edu.mit.broad/picard-private-parts-1859.xml b/settings/repository/edu.mit.broad/picard-private-parts-1941.xml similarity index 58% rename from settings/repository/edu.mit.broad/picard-private-parts-1859.xml rename to settings/repository/edu.mit.broad/picard-private-parts-1941.xml index 6c35ccd1c..07d51ae53 100644 --- a/settings/repository/edu.mit.broad/picard-private-parts-1859.xml +++ b/settings/repository/edu.mit.broad/picard-private-parts-1941.xml @@ -1,3 +1,3 @@ - + diff --git a/settings/repository/net.sf/picard-1.44.794.xml b/settings/repository/net.sf/picard-1.44.794.xml deleted file mode 100644 index 3f7a3483c..000000000 --- a/settings/repository/net.sf/picard-1.44.794.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/settings/repository/net.sf/picard-1.44.794.jar b/settings/repository/net.sf/picard-1.47.869.jar similarity index 79% rename from settings/repository/net.sf/picard-1.44.794.jar rename to settings/repository/net.sf/picard-1.47.869.jar index f095ec053..d277fd217 100644 Binary files a/settings/repository/net.sf/picard-1.44.794.jar and b/settings/repository/net.sf/picard-1.47.869.jar differ diff --git a/settings/repository/net.sf/picard-1.47.869.xml b/settings/repository/net.sf/picard-1.47.869.xml new file mode 100644 index 000000000..86d07d4fa --- /dev/null +++ b/settings/repository/net.sf/picard-1.47.869.xml @@ -0,0 +1,3 @@ + + + diff --git a/settings/repository/net.sf/sam-1.44.794.xml b/settings/repository/net.sf/sam-1.44.794.xml deleted file mode 100644 index b29fb49d4..000000000 --- a/settings/repository/net.sf/sam-1.44.794.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/settings/repository/net.sf/sam-1.44.794.jar b/settings/repository/net.sf/sam-1.47.869.jar similarity index 84% rename from settings/repository/net.sf/sam-1.44.794.jar rename to settings/repository/net.sf/sam-1.47.869.jar index 3e4bc5f88..933b9cfd6 100644 Binary files a/settings/repository/net.sf/sam-1.44.794.jar and b/settings/repository/net.sf/sam-1.47.869.jar differ diff --git a/settings/repository/net.sf/sam-1.47.869.xml b/settings/repository/net.sf/sam-1.47.869.xml new file mode 100644 index 000000000..1b76fe2f9 --- /dev/null +++ b/settings/repository/net.sf/sam-1.47.869.xml @@ -0,0 +1,3 @@ + + +