Skip to content

Fixed an issue where plot_pfss()-method would crash with reference_lo… #95

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Christian-Palmroos wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fixed an issue where plot_pfss()-method would crash with reference_lo… #95

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions solarmach/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1446,17 +1446,17 @@ def plot_pfss(self,
lon_sep_angles = np.append(lon_sep_angles, lon_sep)
lat_sep_angles = np.append(lat_sep_angles, lat_sep)

if self.reference_long:
if self.reference_long is not None:
ref_earth_sep_lon = earth_footpoint[0] - self.reference_long if earth_footpoint[0] - self.reference_long < 180 else earth_footpoint[0] - self.reference_long - 360
ref_earth_sep_lat = earth_footpoint[1] - self.reference_lat if self.reference_lat else earth_footpoint[1]
ref_earth_sep_lat = earth_footpoint[1] - self.reference_lat if self.reference_lat is not None else np.nan
lon_sep_angles = np.append(lon_sep_angles, ref_earth_sep_lon)
lat_sep_angles = np.append(lat_sep_angles, ref_earth_sep_lat)

self.pfss_table["Footpoint lon separation to Earth's footpoint lon"] = lon_sep_angles
self.pfss_table["Footpoint lat separation to Earth's footpoint lat"] = lat_sep_angles

# Reference longitude and corresponding parker spiral arm
if self.reference_long:
if self.reference_long is not None:
delta_ref = self.reference_long
if delta_ref < 0.:
delta_ref = delta_ref + 360.
Expand Down Expand Up @@ -1523,7 +1523,9 @@ def plot_pfss(self,
self.reference_long_max = max(varyref_objects_longitudes)

# TODO: IMPROVE!
# The following is a rather severe if-statement because it renders situations with a real londitudinal spread of bigger than 180° unusable. Unfortunately, there is no better solution as of now.
# The following is a rather severe if-statement because it renders situations
# with a real londitudinal spread of bigger than 180° unusable.
# Unfortunately, there is no better solution as of now.
if self.reference_long_max-self.reference_long_min > 180:
varyref_objects_longitudes2 = []
for lon in varyref_objects_longitudes:
Expand Down Expand Up @@ -1789,7 +1791,7 @@ def legend_arrow(width, height, **_):
cb_ax.set_ylabel('Heliographic latitude [deg]', fontsize=16) # 20

# Add footpoints, magnetic polarities and the reach of reference_long flux tube to PFSS_table
if self.reference_long:
if self.reference_long is not None:
photospheric_footpoints.append(self.reference_long)
fieldline_polarities.append(ref_objects[0].polarity)
self.pfss_table["Reference flux tube lon range"] = [np.nan if i<len(self.body_dict) else (self.reference_long_min, self.reference_long_max) for i in range(len(self.body_dict)+1)]
Expand All @@ -1802,7 +1804,7 @@ def legend_arrow(width, height, **_):

# Update solar wind speed to the reference point
if reference_vsw:
self.pfss_table.loc[self.pfss_table["Spacecraft/Body"]=="Reference_point", "Vsw"] = reference_vsw
self.pfss_table.loc[self.pfss_table["Spacecraft/Body"]=="Reference Point", "Vsw"] = reference_vsw

if outfile != '':
plt.savefig(outfile, bbox_inches="tight")
Expand Down