Skip to content
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

Fix random crashes using xija_gui_fit on Linux, change limit names for annotation, use CxoTime #108

Merged
merged 20 commits into from
Apr 1, 2021
Merged

Fix random crashes using xija_gui_fit on Linux, change limit names for annotation, use CxoTime #108

Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
eaf1199
remove useless __future__ import
jzuhone Feb 4, 2021
b79684f
Try to not re-create figures as much
jzuhone Feb 4, 2021
8819feb
Clear the figure when we close
jzuhone Feb 4, 2021
883ccb4
Use cxotime
jzuhone Feb 4, 2021
5fc1e23
We always have acis_taco now
jzuhone Feb 5, 2021
33e72d3
Don't use the private attribute
jzuhone Feb 9, 2021
cc0634f
Return the lines we add in case we want to remove them later
jzuhone Feb 9, 2021
1c3b156
Fix plotting crashes in the histogram
jzuhone Feb 9, 2021
6cacb4d
Remove commented code and make the wait in these places a bit longer
jzuhone Feb 9, 2021
5a82861
F-string
jzuhone Feb 9, 2021
892e643
The limits dict should be a dict of dicts, with a name for each
jzuhone Feb 12, 2021
db4200e
Try to avoid making new matplotlib objects all of the time
jzuhone Feb 12, 2021
31fc92d
Bug fixes
jzuhone Feb 16, 2021
ba98b9b
move annotate_limits to gui_fit since it's the only thing that uses it
jzuhone Feb 16, 2021
d55bda0
pass the fit method here
jzuhone Mar 2, 2021
20fdbad
New limit naming scheme
jzuhone Mar 16, 2021
2f86418
Applying suggestions from Tom
jzuhone Mar 30, 2021
0fb6efb
Make sure the histogram plot has some margin above the peak
jzuhone Mar 30, 2021
b9c3ebd
Add 0-FEPs limit
jzuhone Mar 30, 2021
c16c01e
bug fix
jzuhone Mar 30, 2021
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
51 changes: 28 additions & 23 deletions xija/gui_fit/app.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
from __future__ import print_function

import sys
import os
import ast
Expand All @@ -16,15 +14,11 @@
import logging
import numpy as np

from Chandra.Time import DateTime, ChandraTimeError, \
secs2date
from cxotime import CxoTime

import pyyaks.context as pyc

try:
import acis_taco as taco
except ImportError:
import Chandra.taco as taco
import acis_taco as taco
import xija

from xija.component.base import Node, TelemData
Expand Down Expand Up @@ -67,7 +61,7 @@ def __iter__(self):
@property
def dates(self):
if self._dates is None:
self._dates = secs2date(self.times)
self._dates = CxoTime(self.times).date
return self._dates

def __getitem__(self, item):
Expand Down Expand Up @@ -199,7 +193,7 @@ def save_ascii_table(self):
if box.isChecked():
checked.append(i)
t = Table()
ts = DateTime([self.start_date, self.stop_date]).secs
ts = CxoTime([self.start_date, self.stop_date]).secs
ts[-1] += 1.0 # a buffer to make sure we grab the last point
istart, istop = np.searchsorted(self.ftd.times, ts)
c = Column(self.ftd.dates[istart:istop], name="date", format="{0}")
Expand Down Expand Up @@ -438,7 +432,7 @@ def set_par_attr(self, val):
if msg is not None:
print(msg)
self.slider.update_slider_val(val, self.attr)
self.params_panel.plots_panel.update_plots(redraw=True)
self.params_panel.plots_panel.update_plots()

def __repr__(self):
return getattr(self.par, self.attr).__repr__()
Expand Down Expand Up @@ -721,6 +715,7 @@ def __init__(self, model, fit_worker, model_file):

self.main_left_panel = MainLeftPanel(model, self)
mlp = self.main_left_panel
self.plots_box = self.main_left_panel.plots_box

self.main_right_panel = MainRightPanel(model, mlp.plots_box)

Expand All @@ -744,7 +739,7 @@ def __init__(self, model, fit_worker, model_file):
self.cbp.add_plot_button.activated[str].connect(self.add_plot)
self.cbp.command_entry.returnPressed.connect(self.command_activated)

self.dates = secs2date(self.model.times)
self.dates = CxoTime(self.model.times).date

self.telem_data = {k: v for k, v in self.model.comp.items()
if isinstance(v, TelemData)}
Expand Down Expand Up @@ -939,21 +934,29 @@ def make_histogram(self):

def plot_limits(self, state):
self.show_limits = state == QtCore.Qt.Checked
self.main_left_panel.plots_box.update_plots(redraw=True)
if self.show_limits:
self.plots_box.add_annotations("limits")
else:
self.plots_box.remove_annotations("limits")

def plot_line(self, state):
self.show_line = state == QtCore.Qt.Checked
self.main_left_panel.plots_box.update_plots(redraw=True)
self.main_left_panel.plots_box.update_plots()
if self.show_line:
self.line_data_window = LineDataWindow(self.model, self,
self.main_left_panel.plots_box)
self.plots_box.add_annotations("line")
self.line_data_window.show()
else:
self.plots_box.remove_annotations("line")
self.line_data_window.close()

def plot_radzones(self, state):
self.show_radzones = state == QtCore.Qt.Checked
self.main_left_panel.plots_box.update_plots(redraw=True)
if self.show_radzones:
self.plots_box.add_annotations("radzones")
else:
self.plots_box.remove_annotations("radzones")

def add_plot(self, plotname):
pp = self.main_left_panel.plots_box
Expand All @@ -979,7 +982,7 @@ def fit_monitor(self, *args):
# params table widget.
self.fit_worker.model.parvals = msg['parvals']
self.main_right_panel.params_panel.update()
self.main_left_panel.plots_box.update_plots(redraw=fit_stopped)
self.main_left_panel.plots_box.update_plots()
if self.show_line:
self.line_data_window.update_data()

Expand Down Expand Up @@ -1037,20 +1040,22 @@ def parse_command(self, command):
vals[1] = self.model.datestart
if vals[2] == "*":
vals[2] = self.model.datestop
lim = DateTime(vals[1:]).date
except (IndexError, ChandraTimeError):
lim = CxoTime(vals[1:]).date
except (IndexError, ValueError):
if len(vals) == 3:
print("Invalid input for ignore: {} {}".format(vals[1], vals[2]))
print(f"Invalid input for ignore: {vals[1]} {vals[2]}")
else:
print("Ignore requires two arguments, the start time and the stop time.")
return
t0, t1 = CxoTime(lim).secs
self.plots_box.add_ignore(t0, t1)
self.model.append_mask_times(lim)
elif cmd == "notice":
if len(vals) > 1:
print("Invalid input for notice: {}".format(vals[1:]))
return
self.model.reset_mask_times()
self.main_left_panel.plots_box.update_plots(redraw=True)
self.plots_box.remove_ignores()

def set_title(self):
title_str = gui_config['filename']
Expand Down Expand Up @@ -1099,7 +1104,7 @@ def get_options():
default=15, # Fix this
help="Number of days in fit interval (default=90")
parser.add_argument("--stop",
default=DateTime() - 10, # remove this
default=CxoTime() - 10, # remove this
help="Stop time of fit interval (default=model values)")
parser.add_argument("--maxiter",
default=1000,
Expand Down Expand Up @@ -1148,7 +1153,7 @@ def main():

# Use supplied stop time and days OR use model_spec values if stop not supplied
if opt.stop:
start = DateTime(DateTime(opt.stop).secs - opt.days * 86400).date[:8]
start = CxoTime(CxoTime(opt.stop).secs - opt.days * 86400).date[:8]
stop = opt.stop
else:
start = model_spec['datestart']
Expand Down Expand Up @@ -1187,7 +1192,7 @@ def main():
gui_config['filename'] = os.path.abspath(opt.filename)
gui_config['set_data_vals'] = set_data_vals

fit_worker = FitWorker(model, opt.maxiter)
fit_worker = FitWorker(model, opt.maxiter, method=opt.fit_method)

model.calc()

Expand Down
Loading