Commit 3d1ad752 authored by Markus Gaug's avatar Markus Gaug
Browse files

conflicts resolved

parents 31f4f71a 58b5dbe6
Pipeline #6918 failed with stages
in 0 seconds
......@@ -161,6 +161,8 @@ class AtmosphericProfiles():
"log_mass_overburden" : 1,
}
with open(filename) as file:
entry_json = json.load(file)
......@@ -949,7 +951,6 @@ class AtmosphericProfiles():
for i, h_i in enumerate(h):
hlo_c = lo + H0
h_c = h_i + H0
if h_c < self.OVERLAP_TRANSITION:
ans[i] = (
self.eval_overlap(date, h_c) - 2 / costheta * Rayleigh.LIDAR_ratio_mol * beta_mol_0
......@@ -1013,4 +1014,4 @@ class AtmosphericProfiles():
print(data.to_markdown())
print("Model info")
print(self.entry_data[date]["models"])
np.set_printoptions(**oldoptions)
\ No newline at end of file
np.set_printoptions(**oldoptions)
......@@ -121,7 +121,7 @@ class Rayleigh():
self.calculate_sigma()
# calculate beta in units of km^-1 (Tomasi eq. 2)
self.beta = 1e5*N*self.sigma
self.beta = N.to(1/u.km**3) * self.sigma.to(u.km**2)
return self.beta
def calculate_n(self):
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment