Aglaé TABOT

little corrections

...@@ -1745,7 +1745,7 @@ def conversion_angles(bdd): ...@@ -1745,7 +1745,7 @@ def conversion_angles(bdd):
1745 elif np.pi < nt[i] <= 2*np.pi : #if value of the angle between pi and 2pi, negative 1745 elif np.pi < nt[i] <= 2*np.pi : #if value of the angle between pi and 2pi, negative
1746 angle=((180/np.pi)*nt[i])-360 1746 angle=((180/np.pi)*nt[i])-360
1747 else : 1747 else :
1748 - angle=nt[i] # dans le cas ou certains angles seraient en degres -> supprimer? 1748 + angle=nt[i] # some angles already in degrees
1749 angles_deg.append(angle) 1749 angles_deg.append(angle)
1750 angles_torsion.append(angles_deg) 1750 angles_torsion.append(angles_deg)
1751 return angles_torsion 1751 return angles_torsion
...@@ -2387,7 +2387,7 @@ def graph_angles_torsion(): ...@@ -2387,7 +2387,7 @@ def graph_angles_torsion():
2387 epsilon=[] 2387 epsilon=[]
2388 zeta=[] 2388 zeta=[]
2389 chi = [] 2389 chi = []
2390 - for angles_deg in conversion_angles("/home/atabot/RNANet.db") : #chemin à modifier 2390 + for angles_deg in conversion_angles(runDir +"/results/RNANet.db") : #chemin à modifier
2391 alpha.append(angles_deg[2]) 2391 alpha.append(angles_deg[2])
2392 beta.append(angles_deg[3]) 2392 beta.append(angles_deg[3])
2393 gamma.append(angles_deg[4]) 2393 gamma.append(angles_deg[4])
...@@ -3096,12 +3096,12 @@ if __name__ == "__main__": ...@@ -3096,12 +3096,12 @@ if __name__ == "__main__":
3096 joblist.append(Job(function=to_id_matrix, args=(f,))) # updates the database 3096 joblist.append(Job(function=to_id_matrix, args=(f,))) # updates the database
3097 3097
3098 f_prec=os.listdir(path_to_3D_data + "rna_only")[0] 3098 f_prec=os.listdir(path_to_3D_data + "rna_only")[0]
3099 - for f in os.listdir(path_to_3D_data + "rna_only")[:100]: 3099 + for f in os.listdir(path_to_3D_data + "rna_only"):
3100 joblist.append(Job(function=dist_atoms, args=(f,))) 3100 joblist.append(Job(function=dist_atoms, args=(f,)))
3101 3101
3102 if DO_HIRE_RNA_MEASURES: 3102 if DO_HIRE_RNA_MEASURES:
3103 f_prec=os.listdir(path_to_3D_data + "rna_only")[0] 3103 f_prec=os.listdir(path_to_3D_data + "rna_only")[0]
3104 - for f in os.listdir(path_to_3D_data + "rna_only")[:100]: 3104 + for f in os.listdir(path_to_3D_data + "rna_only"):
3105 joblist.append(Job(function=dist_atoms_hire_RNA, args=(f,))) 3105 joblist.append(Job(function=dist_atoms_hire_RNA, args=(f,)))
3106 joblist.append(Job(function=angles_torsion_hire_RNA, args=(f,))) 3106 joblist.append(Job(function=angles_torsion_hire_RNA, args=(f,)))
3107 joblist.append(Job(function=angles_plans_hire_RNA, args=(f,))) 3107 joblist.append(Job(function=angles_plans_hire_RNA, args=(f,)))
...@@ -3109,7 +3109,7 @@ if __name__ == "__main__": ...@@ -3109,7 +3109,7 @@ if __name__ == "__main__":
3109 ''' 3109 '''
3110 Basepairs 3110 Basepairs
3111 ''' 3111 '''
3112 - ld=os.listdir(path_to_3D_data +'datapoints')[:1000] 3112 + ld=os.listdir(path_to_3D_data +'datapoints')
3113 if '4zdo_1_E' in ld : 3113 if '4zdo_1_E' in ld :
3114 ld.remove('4zdo_1_E')#cas particuliers 3114 ld.remove('4zdo_1_E')#cas particuliers
3115 if '4zdp_1_E' in ld : 3115 if '4zdp_1_E' in ld :
......