diff options
| author | Aaron LI <aly@aaronly.me> | 2017-08-12 21:27:17 +0800 |
|---|---|---|
| committer | Aaron LI <aly@aaronly.me> | 2017-08-12 21:27:17 +0800 |
| commit | 33ff42254e4da928f0cac38eb3f10f976e9c8d83 (patch) | |
| tree | 88f47061303407a924805a009ff9de85f36c55f8 /fg21sim/extragalactic/clusters | |
| parent | ba6ba5a5d716c7cc160679c46dd0a2146014335f (diff) | |
| download | fg21sim-33ff42254e4da928f0cac38eb3f10f976e9c8d83.tar.bz2 | |
clusters/main.py: Inherent cluster catalog info to halos data
Also rename "frequencies" to "frequency"
Signed-off-by: Aaron LI <aly@aaronly.me>
Diffstat (limited to 'fg21sim/extragalactic/clusters')
| -rw-r--r-- | fg21sim/extragalactic/clusters/main.py | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/fg21sim/extragalactic/clusters/main.py b/fg21sim/extragalactic/clusters/main.py index 6095f72..959e877 100644 --- a/fg21sim/extragalactic/clusters/main.py +++ b/fg21sim/extragalactic/clusters/main.py @@ -261,6 +261,10 @@ class GalaxyClusters: data = { "z0": halo.z_obs, "M0": halo.M_obs, # [Msun] + "lon": row.lon, # [deg] longitude + "lat": row.lat, # [deg] longitude + "felong": row.felong, # Fraction of elongation + "rotation": row.rotation, # [deg] ellipse rotation angle "z_merger": halo.z_merger, "M_main": halo.M_main, # [Msun] "M_sub": halo.M_sub, # [Msun] @@ -271,7 +275,7 @@ class GalaxyClusters: "volume": halo.volume, # [kpc^3] "B": halo.magnetic_field, # [uG] "n_e": n_e, # [cm^-3] - "frequencies": self.frequencies, # [MHz] + "frequency": self.frequencies, # [MHz] "emissivity": emissivity, # [erg/s/cm^3/Hz] "power": power, # [W/Hz] "flux": flux, # [Jy] @@ -282,9 +286,10 @@ class GalaxyClusters: # logger.info("Converting halos data to be a Pandas DataFrame ...") # Ignore the ``gamma`` and ``n_e`` items - keys = ["z0", "M0", "z_merger", "M_main", "M_sub", - "time_crossing", "radius", "angular_radius", "volume", - "B", "frequencies", "emissivity", "power", "flux", "Tb_mean"] + keys = ["z0", "M0", "lon", "lat", "felong", "rotation", + "z_merger", "M_main", "M_sub", "time_crossing", + "radius", "angular_radius", "volume", "B", "frequency", + "emissivity", "power", "flux", "Tb_mean"] self.halos_df = dictlist_to_dataframe(self.halos, keys=keys) logger.info("Done halos data conversion.") |