diff --git a/viloca/b2w.py b/viloca/b2w.py index d3f4e40..0341bf7 100644 --- a/viloca/b2w.py +++ b/viloca/b2w.py @@ -737,6 +737,8 @@ def build_windows(alignment_file: str, tiling_strategy: TilingStrategy, reference_filename=reference_filename, threads=max_proc #1 ) + # print this message since pysam print confusing error message with the functions above. + print("Index file was created successfully.") #reffile = pysam.FastaFile(reference_filename) --> we need to read it in each child processo #counter = 0 #--> counter is now coputed initially for all windows reference_name = tiling_strategy.get_reference_name() diff --git a/viloca/local_haplotype_inference/learn_error_params/run_dpm_mfa.py b/viloca/local_haplotype_inference/learn_error_params/run_dpm_mfa.py index ffdb8a9..eabb610 100644 --- a/viloca/local_haplotype_inference/learn_error_params/run_dpm_mfa.py +++ b/viloca/local_haplotype_inference/learn_error_params/run_dpm_mfa.py @@ -11,7 +11,7 @@ from . import cavi logging.basicConfig( - filename="viloca_inference.log", encoding="utf-8", level=logging.INFO + filename="viloca.log", encoding="utf-8", level=logging.INFO ) diff --git a/viloca/local_haplotype_inference/use_quality_scores/run_dpm_mfa.py b/viloca/local_haplotype_inference/use_quality_scores/run_dpm_mfa.py index b62a84f..58ff5b4 100644 --- a/viloca/local_haplotype_inference/use_quality_scores/run_dpm_mfa.py +++ b/viloca/local_haplotype_inference/use_quality_scores/run_dpm_mfa.py @@ -13,7 +13,7 @@ from . import cavi logging.basicConfig( - filename="viloca_inference.log", encoding="utf-8", level=logging.INFO + filename="viloca.log", encoding="utf-8", level=logging.INFO ) diff --git a/viloca/shotgun.py b/viloca/shotgun.py index 95618f2..e14533d 100644 --- a/viloca/shotgun.py +++ b/viloca/shotgun.py @@ -521,7 +521,7 @@ def main(args): logging.debug("[shotgun] All processes completed successfully.") # prepare directories - for sd_name in ['debug', 'sampling', 'freq', 'support', + for sd_name in ['debug', 'haplotypes', 'corrected', 'raw_reads', 'inference']: try: os.mkdir(sd_name) @@ -555,9 +555,8 @@ def main(args): move_files_into_dir("debug", glob.glob("./w*dbg")) move_files_into_dir("sampling", glob.glob("./w*smp")) move_files_into_dir("corrected", glob.glob("./w*reads-cor.fas")) - move_files_into_dir("support", glob.glob("./w*reads-support.fas")) - move_files_into_dir("freq", glob.glob("./w*reads-freq.csv")) - move_files_into_dir("sampling", glob.glob("./w*smp")) + move_files_into_dir("haplotypes", glob.glob("./w*reads-support.fas")) + #move_files_into_dir("sampling", glob.glob("./w*smp")) raw_reads_files = glob.glob('./w*reads.fas') + glob.glob('./w*ref.fas') + glob.glob('./w*qualities.npy') move_files_into_dir("raw_reads", raw_reads_files) inference_files = glob.glob("./w*best_run.txt") + glob.glob("./w*history_run*.csv") + glob.glob("./w*results*.pkl") @@ -684,3 +683,5 @@ def main(args): shutil.move(snv_file, 'snv/') logging.info('shotgun run ends') + logging.info('VILOCA terminated') + print("VILOCA terminated successfully.")