Louis BECQUEY

fixed function name issue

...@@ -2478,14 +2478,14 @@ def gmm_hrna(): ...@@ -2478,14 +2478,14 @@ def gmm_hrna():
2478 os.makedirs(runDir + "/results/figures/HiRE-RNA/distances/", exist_ok=True) 2478 os.makedirs(runDir + "/results/figures/HiRE-RNA/distances/", exist_ok=True)
2479 os.chdir(runDir + "/results/figures/HiRE-RNA/distances/") 2479 os.chdir(runDir + "/results/figures/HiRE-RNA/distances/")
2480 2480
2481 - GMM_histo_toric(lastc4p_p_o5p, "C4'-P-O5'", toric=True) 2481 + GMM_histo(lastc4p_p_o5p, "C4'-P-O5'", toric=True)
2482 - GMM_histo_toric(lastc1p_lastc4p_p, "C1'-C4'-P", toric=True) 2482 + GMM_histo(lastc1p_lastc4p_p, "C1'-C4'-P", toric=True)
2483 - GMM_histo_toric(lastc5p_lastc4p_p, "C5'-C4'-P", toric=True) 2483 + GMM_histo(lastc5p_lastc4p_p, "C5'-C4'-P", toric=True)
2484 - GMM_histo_toric(p_o5p_c5p, "P-O5'-C5'", toric=True) 2484 + GMM_histo(p_o5p_c5p, "P-O5'-C5'", toric=True)
2485 - GMM_histo_toric(o5p_c5p_c4p, "O5'-C5'-C4'", toric=True) 2485 + GMM_histo(o5p_c5p_c4p, "O5'-C5'-C4'", toric=True)
2486 - GMM_histo_toric(c5p_c4p_c1p, "C5'-C4'-C1'", toric=True) 2486 + GMM_histo(c5p_c4p_c1p, "C5'-C4'-C1'", toric=True)
2487 - GMM_histo_toric(c4p_c1p_b1, "C4'-C1'-B1", toric=True) 2487 + GMM_histo(c4p_c1p_b1, "C4'-C1'-B1", toric=True)
2488 - GMM_histo_toric(c1p_b1_b2, "C1'-B1-B2", toric=True) 2488 + GMM_histo(c1p_b1_b2, "C1'-B1-B2", toric=True)
2489 2489
2490 GMM_histo(lastc4p_p_o5p, "C4'-P-O5'", toric=True, hist=False, couleur='lightcoral') 2490 GMM_histo(lastc4p_p_o5p, "C4'-P-O5'", toric=True, hist=False, couleur='lightcoral')
2491 GMM_histo(lastc1p_lastc4p_p, "C1'-C4'-P", toric=True, hist=False, couleur='limegreen') 2491 GMM_histo(lastc1p_lastc4p_p, "C1'-C4'-P", toric=True, hist=False, couleur='limegreen')
...@@ -2517,14 +2517,14 @@ def gmm_hrna(): ...@@ -2517,14 +2517,14 @@ def gmm_hrna():
2517 os.makedirs(runDir + "/results/figures/HiRE-RNA/torsions/", exist_ok=True) 2517 os.makedirs(runDir + "/results/figures/HiRE-RNA/torsions/", exist_ok=True)
2518 os.chdir(runDir + "/results/figures/HiRE-RNA/torsions/") 2518 os.chdir(runDir + "/results/figures/HiRE-RNA/torsions/")
2519 2519
2520 - GMM_histo_toric(p_o5_c5_c4, "P-O5'-C5'-C4'", toric=True) 2520 + GMM_histo(p_o5_c5_c4, "P-O5'-C5'-C4'", toric=True)
2521 - GMM_histo_toric(o5_c5_c4_c1, "O5'-C5'-C4'-C1'", toric=True) 2521 + GMM_histo(o5_c5_c4_c1, "O5'-C5'-C4'-C1'", toric=True)
2522 - GMM_histo_toric(c5_c4_c1_b1, "C5'-C4'-C1'-B1", toric=True) 2522 + GMM_histo(c5_c4_c1_b1, "C5'-C4'-C1'-B1", toric=True)
2523 - GMM_histo_toric(c4_c1_b1_b2, "C4'-C1'-B1-B2", toric=True) 2523 + GMM_histo(c4_c1_b1_b2, "C4'-C1'-B1-B2", toric=True)
2524 - GMM_histo_toric(o5_c5_c4_psuiv, "O5'-C5'-C4'-P°", toric=True) 2524 + GMM_histo(o5_c5_c4_psuiv, "O5'-C5'-C4'-P°", toric=True)
2525 - GMM_histo_toric(c5_c4_psuiv_o5suiv, "C5'-C4'-P°-O5'°", toric=True) 2525 + GMM_histo(c5_c4_psuiv_o5suiv, "C5'-C4'-P°-O5'°", toric=True)
2526 - GMM_histo_toric(c4_psuiv_o5suiv_c5suiv, "C4'-P°-O5'°-C5'°", toric=True) 2526 + GMM_histo(c4_psuiv_o5suiv_c5suiv, "C4'-P°-O5'°-C5'°", toric=True)
2527 - GMM_histo_toric(c1_c4_psuiv_o5suiv, "C1'-C4'-P°-O5'°", toric=True) 2527 + GMM_histo(c1_c4_psuiv_o5suiv, "C1'-C4'-P°-O5'°", toric=True)
2528 2528
2529 GMM_histo(p_o5_c5_c4, "P-O5'-C5'-C4'", toric=True, hist=False, couleur='darkred') 2529 GMM_histo(p_o5_c5_c4, "P-O5'-C5'-C4'", toric=True, hist=False, couleur='darkred')
2530 GMM_histo(o5_c5_c4_c1, "O5'-C5'-C4'-C1'", toric=True, hist=False, couleur='chocolate') 2530 GMM_histo(o5_c5_c4_c1, "O5'-C5'-C4'-C1'", toric=True, hist=False, couleur='chocolate')
...@@ -2976,7 +2976,7 @@ if __name__ == "__main__": ...@@ -2976,7 +2976,7 @@ if __name__ == "__main__":
2976 2976
2977 #exit() 2977 #exit()
2978 2978
2979 - process_jobs(joblist) 2979 + # process_jobs(joblist)
2980 2980
2981 # Now process the memory-heavy tasks family by family 2981 # Now process the memory-heavy tasks family by family
2982 if DO_AVG_DISTANCE_MATRIX: 2982 if DO_AVG_DISTANCE_MATRIX:
...@@ -2992,11 +2992,11 @@ if __name__ == "__main__": ...@@ -2992,11 +2992,11 @@ if __name__ == "__main__":
2992 2992
2993 # finish the work after the parallel portions 2993 # finish the work after the parallel portions
2994 2994
2995 - per_chain_stats() # per chain base frequencies en basepair types 2995 + # per_chain_stats() # per chain base frequencies en basepair types
2996 - seq_idty() # identity matrices from pre-computed .npy matrices 2996 + # seq_idty() # identity matrices from pre-computed .npy matrices
2997 - stats_pairs() 2997 + # stats_pairs()
2998 if n_unmapped_chains: 2998 if n_unmapped_chains:
2999 - general_stats() 2999 + # general_stats()
3000 os.makedirs(runDir+"/results/figures/GMM/", exist_ok=True) 3000 os.makedirs(runDir+"/results/figures/GMM/", exist_ok=True)
3001 os.makedirs(runDir+"/results/geometry/json/", exist_ok=True) 3001 os.makedirs(runDir+"/results/geometry/json/", exist_ok=True)
3002 joblist = [] 3002 joblist = []
...@@ -3020,8 +3020,4 @@ if __name__ == "__main__": ...@@ -3020,8 +3020,4 @@ if __name__ == "__main__":
3020 joblist.append(Job(function=gmm_wadley, args=())) 3020 joblist.append(Job(function=gmm_wadley, args=()))
3021 if len(joblist): 3021 if len(joblist):
3022 process_jobs(joblist) 3022 process_jobs(joblist)
3023 -
3024 -
3025 -
3026 -
3027 3023
...\ No newline at end of file ...\ No newline at end of file
......