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

Add code to support and test computed MSIDs #191

Merged
merged 19 commits into from
Apr 9, 2020
Merged

Add code to support and test computed MSIDs #191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
b4cd2c8
Add code to support and test computed MSIDs
taldcroft Mar 13, 2020
95aab7b
Much-improved implementation and API
taldcroft Mar 15, 2020
3d1b2c2
Change built-in MUPS valve temp comp name
taldcroft Mar 15, 2020
3e48f2d
More tidy
taldcroft Mar 15, 2020
e9a662b
Flake8 fixes
taldcroft Mar 15, 2020
0c16991
Add Comp_KadiCommandState and docs
taldcroft Mar 16, 2020
e9aa79b
Use tstart, tstop instead of start, stop
taldcroft Mar 16, 2020
09732cd
Support 5min, daily stats for computed MSIDs
taldcroft Mar 17, 2020
988b513
Add temperature unit to MUPS valve comp msid
taldcroft Apr 6, 2020
e345554
Remove orphaned MsidStub class (what was it?)
taldcroft Apr 6, 2020
773e66a
Remove unneccesary msid_attrs and extra_msid_attrs class attributes
taldcroft Apr 7, 2020
3fe7e8f
Add some docs
taldcroft Apr 7, 2020
41912a1
Fix flake8 oddity
taldcroft Apr 7, 2020
1862975
Add more docs
taldcroft Apr 8, 2020
570a79c
Fix indentation
taldcroft Apr 8, 2020
b5dec23
Even more docs
taldcroft Apr 8, 2020
2114701
Remove unused functions
taldcroft Apr 8, 2020
81a9bd3
Add support for units
taldcroft Apr 9, 2020
77cff94
Fix flake8
taldcroft Apr 9, 2020
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: 3 additions & 1 deletion Ska/engarchive/derived/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# Licensed under a 3-clause BSD style license - see LICENSE.rst

from Chandra.Time import DateTime
from .. import fetch, fetch_eng
import Ska.Numpy
import numpy as np
from .. import cache
Expand Down Expand Up @@ -35,6 +34,8 @@ def calc(self, data):
raise NotImplementedError

def fetch(self, start, stop):
from .. import fetch

unit_system = fetch.get_units() # cache current units and restore after fetch
fetch.set_units(self.unit_system)
dataset = fetch.MSIDset(self.rootparams, start, stop)
Expand Down Expand Up @@ -89,6 +90,7 @@ def fetch(self, start, stop):
return dataset

def __call__(self, start, stop):
from .. import fetch_eng
dataset = fetch_eng.MSIDset(self.rootparams, start, stop, filter_bad=True)

# Translate state codes "ON" and "OFF" to 1 and 0, respectively.
Expand Down
Loading