Skip to content

Commit

Permalink
Update SHMpp_hvmin.py
Browse files Browse the repository at this point in the history
  • Loading branch information
mccabech authored Sep 22, 2018
1 parent 3864e1e commit 9cff25b
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions SHMpp_hvmin.py
Original file line number Diff line number Diff line change
Expand Up @@ -157,14 +157,14 @@ def vE(Day,v0):
##########################################
# Round component
# Calculate the h(vmin) integral for fR(v)
# output table of vmin [km/s] and h(vmin) [s/km]
# output table of vmin [km/s] and h(vmin) [km/s]
#########################################

#weight function is exp(-(x2+y2+z2))
#integral performed in the galactic frame

print("Calculating hvmin for Round component")
print("vmin [km/s],","h(vmin) [s/km]")
print("vmin [km/s],","h(vmin) [km/s]")

ve = vE(Day,v0)

Expand Down Expand Up @@ -213,14 +213,14 @@ def vE(Day,v0):
##########################################
# Sausage component
# Calculate the h(vmin) integral for fS(v)
# output table of vmin [km/s] and h(vmin) [s/km]
# output table of vmin [km/s] and h(vmin) [km/s]
#########################################

#weight function is exp(-(x2+y2+z2))
#integral performed in the galactic frame

print("Calculating hvmin for Sausage component")
print("vmin [km/s],","h(vmin) [s/km]")
print("vmin [km/s],","h(vmin) [km/s]")

ve = vE(Day,v0)

Expand Down Expand Up @@ -264,7 +264,7 @@ def vE(Day,v0):

##########################################
# Combine round and Sausage components for SHM++
# output table of vmin [km/s] and h(vmin) [s/km]
# output table of vmin [km/s] and h(vmin) [km/s]
#########################################

print("Calculating hvmin for SHM++ ( with eta=",eta,")")
Expand All @@ -278,5 +278,5 @@ def vE(Day,v0):
plot(Lvx, LhvminSHMpp,"k", label='SHM++ with eta='+str(eta))
legend(loc='upper right')
xlabel("vmin [km/s]")
ylabel("h(vmin) [s/km]")
ylabel("h(vmin) [km/s]")
show()

0 comments on commit 9cff25b

Please sign in to comment.