Skip to content

Add eclipse support to the SimZDepSolarHeat class and fix crashes in xija_gui_fit #148

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

Merged
jzuhone merged 2 commits into from
Nov 10, 2025
Merged

Add eclipse support to the SimZDepSolarHeat class and fix crashes in xija_gui_fit #148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2138525
Let members of the SimZDepSolarHeat know about eclipses
jzuhone Sep 23, 2025
434e8d3
Tweaks to xija_gui_fit to make it less prone to crashes and streamlin…
jzuhone Sep 24, 2025
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
6 changes: 6 additions & 0 deletions xija/component/heat/solar.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -570,6 +570,7 @@ def __init__(
pitch_comp="pitch",
simz_comp="sim_z",
dh_heater_comp="dh_heater",
eclipse_comp=None,
P_pitches=None,
P_vals=None,
dP_pitches=None,
Expand All @@ -586,6 +587,7 @@ def __init__(
self.pitch_comp = self.model.get_comp(pitch_comp)
self.simz_comp = self.model.get_comp(simz_comp)
self.dh_heater_comp = self.model.get_comp(dh_heater_comp)
self.eclipse_comp = self.model.get_comp(eclipse_comp)
self.P_pitches = np.array(
[45.0, 55.0, 70.0, 90.0, 150.0] if (P_pitches is None) else P_pitches,
dtype=float,
Expand Down Expand Up @@ -682,6 +684,10 @@ def dvals(self):
# Increase heat power for times when detector housing heater is enabled
self._dvals[self.dh_heater_comp.dvals] += self.dh_heater

# Set power to 0.0 during eclipse (where eclipse_comp.dvals == True)
if self.eclipse_comp is not None:
self._dvals[self.eclipse_comp.dvals] = 0.0

return self._dvals

def plot_solar_heat__pitch(self, fig, ax):
Expand Down
40 changes: 15 additions & 25 deletions xija/gui_fit/plots.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -668,6 +668,7 @@ def __init__(self, plot_name, plots_box):
canvas.setSizePolicy(
QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Fixed
)
self.canvas = canvas

toolbar = NavigationToolbar(canvas, parent=None)
delete_plot_button = QtWidgets.QPushButton("Delete")
Expand Down Expand Up @@ -807,20 +808,19 @@ def update(self, first=False):
if first:
[line.remove() for line in self.ax.get_lines()]
plot_func(fig=self.fig, ax=self.ax)
if self.plot_method.endswith("time"):
self.ax.fmt_xdata = mdates.DateFormatter("%Y:%j:%H:%M:%S")
self.ax.autoscale(enable=False, axis="x")
if first:
if self.plot_method.endswith("time"):
self.show_fills()
if mw.show_radzones:
self.add_annotation("radzones")
if mw.show_line:
self.add_annotation("line")
if mw.show_radzones:
self.add_annotation("radzones")
if mw.show_line:
self.add_annotation("line")
if mw.show_limits:
self.add_annotation("limits")
self.fig.canvas.draw_idle()
self.fig.canvas.flush_events()
if self.plot_method.endswith("time"):
self.ax.fmt_xdata = mdates.DateFormatter("%Y:%j:%H:%M:%S")
self.ax.autoscale(enable=False, axis="x")


class PlotsBox(QtWidgets.QVBoxLayout):
Expand Down Expand Up @@ -864,28 +864,25 @@ def reset_plots(self):

def add_plot_box(self, plot_name):
plot_name = str(plot_name)
self.main_window.cbp.add_plot_button.setCurrentIndex(0)
if plot_name == "Add plot..." or plot_name in self.plot_names:
return
print("Adding plot ", plot_name)
plot_box = PlotBox(plot_name, self)
self.addLayout(plot_box)
plot_box.update(first=True)
self.main_window.cbp.add_plot_button.setCurrentIndex(0)
self.update_plot_boxes()
self.plot_boxes.append(plot_box)
self.plot_names.append(plot_name)

def delete_plot_box(self, plot_name):
for pb in self.plot_boxes:
for i, pb in enumerate(list(self.plot_boxes)):
if pb.plot_name == plot_name:
pb.fig.clear()
self.plot_boxes.pop(i)
self.plot_names.pop(i)
self.removeItem(pb)
clear_layout(pb)
break
self.update()
self.update_plot_boxes()
# This is a hack to get the axes to appear correctly
# on the rest of the plots after deleting one, somehow
# related to clearing the figure above
for pb in self.plot_boxes:
pb.ax.set_xlim()

def update_plots(self, first=False):
mw = self.main_window
Expand Down Expand Up @@ -920,13 +917,6 @@ def remove_ignores(self):
pb.fig.canvas.draw_idle()
self.update_plots()

def update_plot_boxes(self):
self.plot_boxes = []
self.plot_names = []
for plot_box in self.findChildren(PlotBox):
self.plot_boxes.append(plot_box)
self.plot_names.append(plot_box.plot_name)

def update_xline(self):
for pb in self.plot_boxes:
pb.update_xline()
Expand Down