Skip to content

Commit

Permalink
Merge pull request #95 from SWIFTSIM/tidy_up_scripts
Browse files Browse the repository at this point in the history
  • Loading branch information
JBorrow authored Jul 16, 2021
2 parents a29ee76 + e9beafe commit b6bae96
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 6 deletions.
2 changes: 1 addition & 1 deletion data/GalaxyHIFractions/conversion/convertOh2015.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@

# Write everything
processed = ObservationalData()
print(M_star, M_HI_frac)

processed.associate_x(
M_star, scatter=None, comoving=True, description="Galaxy Stellar Mass"
)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from velociraptor.observations.objects import ObservationalData
from velociraptor.fitting_formulae.smhmr import moster_raw, behroozi_raw
from velociraptor.fitting_formulae.smhmr import moster_raw

import unyt
import numpy as np
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from velociraptor.observations.objects import ObservationalData
from velociraptor.fitting_formulae.smhmr import moster_raw, behroozi_raw
from velociraptor.fitting_formulae.smhmr import moster_raw

import unyt
import numpy as np
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from velociraptor.observations.objects import ObservationalData
from velociraptor.fitting_formulae.smhmr import moster_raw, behroozi_raw
from velociraptor.fitting_formulae.smhmr import moster_raw

import unyt
import numpy as np
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -193,15 +193,13 @@ def moster_2018_ratios(
)

if x_axis_variable == "halo mass":
print("process halo mass")
processed.associate_x(
M_BN98 * unyt.Solar_Mass,
scatter=None,
comoving=True,
description="Halo Mass ($M_{\\rm BN98}$)",
)
elif x_axis_variable == "stellar mass":
print("process stellar mass")
M_star = MstarMhalo * (M_BN98 * unyt.Solar_Mass)
processed.associate_x(
M_star,
Expand Down

0 comments on commit b6bae96

Please sign in to comment.