Skip to content

Commit

Permalink
Merge pull request #117 from StingraySoftware/prepare_release
Browse files Browse the repository at this point in the history
Prepare for release
  • Loading branch information
matteobachetti authored May 31, 2021
2 parents a2aa8e2 + cef9145 commit 4e2b900
Show file tree
Hide file tree
Showing 16 changed files with 129 additions and 897 deletions.
2 changes: 1 addition & 1 deletion docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ HENDRICS 6.0
~~~~~~~~~~~~

+ Much Improved mission support
+ Lots of performance improvements
+ Lots of performance improvements with large datasets
+ Improved simulation and upper limit determination for Z searches
+ Improved candidate searching in Z searches
+ Lots of documentation fixes
Expand Down
3 changes: 2 additions & 1 deletion docs/scripts/cli.rst
Original file line number Diff line number Diff line change
Expand Up @@ -473,7 +473,7 @@ HENfspec

usage: HENfspec [-h] [-b BINTIME] [-r REBIN] [-f FFTLEN] [-k KIND]
[--norm NORM] [--noclobber] [-o OUTROOT] [--back BACK]
[--save-dyn] [--ignore-instr] [--save-all]
[--save-dyn] [--ignore-instr] [--save-all] [--test]
[--loglevel LOGLEVEL] [--debug]
files [files ...]

Expand Down Expand Up @@ -505,6 +505,7 @@ HENfspec
--ignore-instr Ignore instrument names in channels
--save-all Save all information contained in spectra, including
single pdss and light curves.
--test Only to be used in testing
--loglevel LOGLEVEL use given logging level (one between INFO, WARNING,
ERROR, CRITICAL, DEBUG; default:WARNING)
--debug set DEBUG logging level
Expand Down
21 changes: 3 additions & 18 deletions hendrics/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,8 @@

import stingray
import warnings

warnings.filterwarnings("ignore", message=".*Errorbars on cross.*")
from .compat import (
_MonkeyPatchedEventList,
filter_for_deadtime,
get_deadtime_mask,
read_mission_info,
_case_insensitive_search_in_list,
get_key_from_mission_info,
)

from .compat import (
prange,
Expand All @@ -46,15 +39,7 @@
float64,
int32,
int64,
_MonkeyPatchedEventList,
)

try:
e = stingray.events.EventList(time=[1, 2, 3])
e.energy = None
e.apply_mask([True, True, False])
except (TypeError, AttributeError):
stingray.events.EventList = _MonkeyPatchedEventList
stingray.filters.filter_for_deadtime = filter_for_deadtime
stingray.filters.get_deadtime_mask = get_deadtime_mask
stingray.io.read_mission_info = read_mission_info
stingray.io.get_key_from_mission_info = get_key_from_mission_info
stingray.events.EventList = _MonkeyPatchedEventList
9 changes: 1 addition & 8 deletions hendrics/compat/__init__.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,3 @@
from .compatibility import (
_MonkeyPatchedEventList,
filter_for_deadtime,
get_deadtime_mask,
read_mission_info,
_case_insensitive_search_in_list,
get_key_from_mission_info,
)
from .compatibility import (
prange,
array_take,
Expand All @@ -16,4 +8,5 @@
float64,
int32,
int64,
_MonkeyPatchedEventList,
)
Loading

0 comments on commit 4e2b900

Please sign in to comment.