noe/pipeline
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

black without mortimer

Browse Source
This commit is contained in:
Noe Brucy
2022-11-28 18:01:18 +01:00
parent 7548ef7e0a
commit fa396178c6
14 changed files with 371 additions and 304 deletions
Download Patch File Download Diff File Expand all files Collapse all files
galturb/galaxy.py
+5 -6
View File
@@ -9,7 +9,7 @@ def get_gas_dm_stars(pp):
# Load arrays
try:
pp.load_parts(keys=["pos", "vel", "mass", "epoch"])
except:
except KeyError:
pp.load_parts(keys=["pos", "vel", "mass"])
pp.load_cells(keys=["pos", "vel", "dx", "rho"])
@@ -249,10 +249,9 @@ def load_wrapper(pp, fun):
def allinone(pp, redo=False):
def fun(pp):
return analyse_disk(pp), analyse_rings(pp, [4, 5, 6, 7, 8])
try:
assert(not redo)
assert not redo
sectors = pd.read_csv("{pp.run}/disk_{pp.run}_{pp.num}.csv")
disk = pd.read_csv(f"{pp.run}/disk_{pp.run}_{pp.num}.csv")
@@ -260,7 +259,7 @@ def allinone(pp, redo=False):
res = load_wrapper(pp, fun)
disk = pd.DataFrame({key: [res[0][key]] for key in res[0]})
sectors = pd.DataFrame({key: res[1][key] for key in res[1]})
sectors.to_csv(f"{pp.run}/sectors_{pp.run}_{pp.num}.csv")
disk.to_csv(f"{pp.run}/disk_{pp.run}_{pp.num}.csv")
sectors.to_csv(f"{pp.run}/sectors_{pp.run}_{pp.num}.csv")
disk.to_csv(f"{pp.run}/disk_{pp.run}_{pp.num}.csv")
return disk, sectors
galturb/sectors_extraction.py
+5 -6
View File
@@ -9,7 +9,7 @@ def get_gas_dm_stars(pp):
# Load arrays
try:
pp.load_parts(keys=["pos", "vel", "mass", "epoch"])
except:
except KeyError:
pp.load_parts(keys=["pos", "vel", "mass"])
pp.load_cells(keys=["pos", "vel", "dx", "rho"])
@@ -249,10 +249,9 @@ def load_wrapper(pp, fun):
def allinone(pp, redo=False):
def fun(pp):
return analyse_disk(pp), analyse_rings(pp, [4, 5, 6, 7, 8])
try:
assert(not redo)
assert not redo
sectors = pd.read_csv("{pp.run}/disk_{pp.run}_{pp.num}.csv")
disk = pd.read_csv(f"{pp.run}/disk_{pp.run}_{pp.num}.csv")
@@ -260,7 +259,7 @@ def allinone(pp, redo=False):
res = load_wrapper(pp, fun)
disk = pd.DataFrame({key: [res[0][key]] for key in res[0]})
sectors = pd.DataFrame({key: res[1][key] for key in res[1]})
sectors.to_csv(f"{pp.run}/sectors_{pp.run}_{pp.num}.csv")
disk.to_csv(f"{pp.run}/disk_{pp.run}_{pp.num}.csv")
sectors.to_csv(f"{pp.run}/sectors_{pp.run}_{pp.num}.csv")
disk.to_csv(f"{pp.run}/disk_{pp.run}_{pp.num}.csv")
return disk, sectors