-
Notifications
You must be signed in to change notification settings - Fork 37
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
Scada interface #318
Merged
JoranAngevaare
merged 12 commits into
AxFoundation:master
from
WenzDaniel:scada_interface
Oct 23, 2020
Merged
Scada interface #318
Changes from all commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
25a6e7c
Added endtime to absolute time range.
WenzDaniel f664e78
Fix for no time range selection
WenzDaniel adaeef0
Some PEP8 stuff.
WenzDaniel 820e203
Fixed selection bug
WenzDaniel 268c2eb
Merge remote-tracking branch 'upstream/master' into scada_interface
WenzDaniel 5df8855
Merge branch 'scada_interface' of https://github.com/WenzDaniel/strax…
WenzDaniel 5d986b6
Fixed problem with absolute time range.
WenzDaniel 4cabb19
Merge branch 'master' into scada_interface
JoranAngevaare d6d0254
Merge branch 'master' into scada_interface
JoranAngevaare 49c0674
Update mongo.py
JoranAngevaare 025ba49
Corrected raise message
WenzDaniel a4c04c1
Merge branch 'scada_interface' of https://github.com/WenzDaniel/strax…
WenzDaniel File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@WenzDaniel , could you make
full_range
a bool and update the Runtime error?As in :
full_range=False # as kwarg
full_range==False # in selection comparison
and
" time_range, seconds_range, time_within or full_range" # in the Runtime error
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think a bool is cleaner for an option but it's not too relevant
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I corrected the raise message. About the other thing, first I thought so too. But I think Jelle did this intentionally to allow arrays as input. Otherwise things like
if np.array([start, stop]) :
would give an ambiguity error and one would have to change it in something like:
if np.any(selection) :