diff --git a/src/newly_unbound.py b/src/newly_unbound.py index dfd919b..45ca605 100644 --- a/src/newly_unbound.py +++ b/src/newly_unbound.py @@ -91,7 +91,11 @@ def unbound_mech_kipp(dumpfile_list): #Plot declaration ax = plt.gca() - ax.plot(ph_data['time']*yr, np.log10(ph_data['sep. 1'])) + + #Finds the total separation columns in the separation .ev file and plots them. + for columnName in ph_data.keys(): + if(columnName[0:5] == "sep. "): + ax.plot(ph_data['time']*yr, np.log10(ph_data[columnName])) #Histogram format nbins = min([int(len(dump_list)/1.05),500]) diff --git a/src/utils/rdumpfiles.py b/src/utils/rdumpfiles.py index 88aec92..9de891e 100644 --- a/src/utils/rdumpfiles.py +++ b/src/utils/rdumpfiles.py @@ -2,7 +2,6 @@ # -*- coding: utf-8 -*- import os -from pandas import unique def read_dumpfiles(files_prefix='binary_', path='./',evy_files=-1): ''' @@ -28,7 +27,8 @@ def read_dumpfiles(files_prefix='binary_', path='./',evy_files=-1): openlist = open('listfiles.txt') list_dumpfiles = openlist.read().splitlines() list_dumpfiles = [namefile.rstrip('.divv') for namefile in list_dumpfiles] - list_dumpfiles = list(unique(list_dumpfiles)) + list_dumpfiles = list(set(list_dumpfiles)) + list_dumpfiles.sort() openlist.close() os.system('rm listfiles.txt') if (evy_files == -1) or (evy_files == None): @@ -36,4 +36,4 @@ def read_dumpfiles(files_prefix='binary_', path='./',evy_files=-1): elif evy_files > 0: return list_dumpfiles[::evy_files] else: - print("Invalid option for evy_files.") \ No newline at end of file + print("Invalid option for evy_files.")