Skip to content

Commit

Permalink
updated plots
Browse files Browse the repository at this point in the history
  • Loading branch information
forero committed May 1, 2018
1 parent 941c6a3 commit 8dc3794
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 26 deletions.
12 changes: 6 additions & 6 deletions code/asphericity_stats.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ def load_experiment(input_path="../data/mstar_selected_summary/vmax_sorted/", n_
i = int(f.split("_")[-3])
if i not in group_id:
group_id.append(i)
print(group_id, len(group_id))
#print(group_id, len(group_id))

n_groups = len(group_id)

Expand Down Expand Up @@ -711,15 +711,15 @@ def plot_shape_obs_sims_normed(simulation, n_sat):
def print_covariance(simulation, n_sat):
def print_ab(a, b, c, d, e, f):
print("{:.2f} \\pm {:.2f} & {:.2f} \\pm {:.2f} & {:.2f} \\pm {:.2f}\\\\".format(a,b,c,d,e,f))
print('simulation {}'.format(simulation))
simulation_name = {'illustris1':'Illustris-1', 'illustris1dark':'Illustris-1-Dark', 'elvis':'ELVIS'}
print()
in_path = "../data/{}_mstar_selected_summary/".format(simulation)
M31_sim_stats, MW_sim_stats = load_experiment(input_path=in_path, n_sat=n_sat)

cov_sim_M31 = jacknife_covariance(M31_sim_stats)
cov_sim_MW = jacknife_covariance(MW_sim_stats)

print('\\subsubsection{M31}')
print('\\subsection{'+'{}'.format(simulation_name[simulation])+', M31, ' + '$N_s={}$'.format(n_sat) + '}')
print('\\[')
print('\\Sigma=')
print('\\begin{bmatrix}')
Expand All @@ -739,7 +739,7 @@ def print_ab(a, b, c, d, e, f):
print('\\end{bmatrix}')
print('\\]')

print('\\subsubsection{MW}')
print('\\subsection{'+'{}'.format(simulation_name[simulation])+', MW, ' + '$N_s={}$'.format(n_sat) + '}')
print('\\[')
print('\\Sigma=')
print('\\begin{bmatrix}')
Expand Down
2 changes: 1 addition & 1 deletion code/data_tables_plots.py
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
asp.plot_shape_obs_sims_normed('elvis', nsat)

if PrintCovarianceTables:
for nsat in range(11,12):
for nsat in range(11,16):
asp.print_covariance('illustris1dark', nsat)
asp.print_covariance('illustris1', nsat)
asp.print_covariance('elvis', nsat)
52 changes: 33 additions & 19 deletions code/plot_physical.ipynb

Large diffs are not rendered by default.

0 comments on commit 8dc3794

Please sign in to comment.