Louis BECQUEY / RNANet

Go to a project
Toggle navigation Toggle navigation pinning
Louis Becquey
1eff7ed5 2 parents 82eddfba 4846d49a

Merged Khodor-internship to master + general cmalign options

Expand all
Inline Side-by-side
Showing 2 changed files with 3 additions and 3 deletions
This diff is collapsed. Click to expand it.
...@@ -952,8 +952,8 @@ def par_distance_matrix(filelist, f, label, consider_all_atoms, s): ...@@ -952,8 +952,8 @@ def par_distance_matrix(filelist, f, label, consider_all_atoms, s):
952 else: 952 else:
953 d[i,j] = get_euclidian_distance(coordinates_with_gaps[i], coordinates_with_gaps[j]) 953 d[i,j] = get_euclidian_distance(coordinates_with_gaps[i], coordinates_with_gaps[j])
954 954
955 - if f not in LSU_set and f not in SSU_set: 955 + # if f not in LSU_set and f not in SSU_set:
956 - np.savetxt(runDir + '/results/distance_matrices/' + f + '_'+ label + '/'+ s.id.strip("\'") + '.csv', d, delimiter=",", fmt="%.3f") 956 + np.savetxt(runDir + '/results/distance_matrices/' + f + '_'+ label + '/'+ s.id.strip("\'") + '.csv', d, delimiter=",", fmt="%.3f")
957 return 1-np.isnan(d).astype(int), np.nan_to_num(d), np.nan_to_num(d*d) 957 return 1-np.isnan(d).astype(int), np.nan_to_num(d), np.nan_to_num(d*d)
958 958
959 @trace_unhandled_exceptions 959 @trace_unhandled_exceptions
...@@ -1169,7 +1169,7 @@ if __name__ == "__main__": ...@@ -1169,7 +1169,7 @@ if __name__ == "__main__":
1169 1169
1170 sys.exit() 1170 sys.exit()
1171 elif opt == '--version': 1171 elif opt == '--version':
1172 - print("RNANet statistics 1.3 beta") 1172 + print("RNANet statistics 1.4 beta")
1173 sys.exit() 1173 sys.exit()
1174 elif opt == "-r" or opt == "--resolution": 1174 elif opt == "-r" or opt == "--resolution":
1175 assert float(arg) > 0.0 and float(arg) <= 20.0 1175 assert float(arg) > 0.0 and float(arg) <= 20.0
......