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.

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

Use cheta not Ska.engarchive #135

Merged
merged 1 commit into from
Nov 29, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions models/acisfp/calc_model.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"""

import xija
import Ska.engarchive.fetch_eng as fetch_eng
from Ska.Matplotlib import plot_cxctime
from cheta import fetch_eng
from ska_matplotlib import plot_cxctime

start = '2012:001'
stop = '2012:005'
Expand Down
4 changes: 2 additions & 2 deletions xija/model.py
Original file line number Diff line number Diff line change
Expand Up @@ -366,12 +366,12 @@ def fetch(self, msid, attr="vals", method="linear"):
datestop = DateTime(self.tstop + tpad).date
logger.info("Fetching msid: %s over %s to %s" % (msid, datestart, datestop))
try:
import Ska.engarchive.fetch_sci as fetch
import cheta.fetch_sci as fetch

tlm = fetch.MSID(msid, datestart, datestop, stat="5min")
tlm.filter_bad_times()
except ImportError:
raise ValueError("Ska.engarchive.fetch not available")
raise ValueError("cheta.fetch not available")
if tlm.times[0] > self.tstart or tlm.times[-1] < self.tstop:
raise ValueError(
"Fetched telemetry does not span model start and "
Expand Down