Merge pull request 'Fixed bad-pix files generation' (#1) from amukhin/nuwavdet:master into master

Reviewed-on: #1

MANIFEST.in

@@ -1,2 +1,3 @@
-include nuwavsource/pixpos/*
+include nuwavdet/pixpos/*
-include nuwavsource/badpix_headers/*
+include nuwavdet/badpix_headers/*
+

README.md

@@ -1,10 +1,37 @@
-# nuwavsource
+# nuwavdet
 
-This package is supposed to be used to detect the sources in NuStar observations and generate a mask excluding the signal from the sources of any kind. 
+This pacakge is used to generate region masks separating any focused X-ray flux from background signal in NuSTAR observations.
 
-Additionaly, it generates a table containing:
+## Installation
+This package is to be used with Python 3.x.x
+```python
+pip install git+http://heagit.cosmos.ru/nustar/nuwavdet.git
+```
 
-Useful data about the observation:
+## Main use
+
+To use the package in your project, import it in by writing:
+
+```python
+from nuwavdet import nuwavdet as nw
+```
+
+The main functionality of the pacakge is presented with a single function
+```python
+process(obs_path, thresh)
+```
+Inputs are string with path to the _cl.evt file to use and a tuple of thresholds, e.g.
+```python
+process('D:\\Data\\obs_cl.evt', (3, 2))
+```
+
+Outputs of the function are:
+1. dictionary with some metadata and properties of the observation after mask generation procedure.
+2. region array with mask in DET1 coordinate frame. Note that this mask is for numpy mask application so 1 corresponds to masked pixel and 0 otherwise.
+3. custom bad pixel table with flagged pixels in RAW coordinates. It can be exported as fits file or each separate table can be acessed directly.
+4. array with the sum of wavelet planes used in the processing.
+
+Metadata about the observation file:
 
 1. OBS_ID
 2. Detector
@@ -14,32 +41,16 @@ Useful data about the observation:
 
 Useful algorythm-related data:
 
-6. Average count rate on unmasked area
+6. Average count rate of unmasked area
-7. Portion of unmasked area
+7. Fraction of unmasked area
-8. Specific statistical metric[1] before and after masking the detected sources
+8. Modified Cash-statistic per bin before and after masking the detected sources
-9. Root-mean-square of counts in unmasked area
 
-## Installation
+## Other uses
-This package is to be used with Python 3.x.x
-
-To install tha package write
-
-```bash
-pip install nuwavsource
-```
-
-## Usage
-
-To use the package in your project, import it in by writing
-
-```python
-from nuwavsource import nuwavsource
-```
 
 You can process the cl.evt file by creating an Observation class object:
 
 ```python
-obs = nuwavsource.Observation(path_to_evt_file)
+obs = nw.Observation(path_to_evt_file)
 ```
 
 Additionally, the energy band in KeV to get events from can be passed as an argument. The default value is [3,20].

nuwavdet/__init__.py

@@ -0,0 +1 @@
+name = 'nuwavdet'

nuwavsource/__init__.py

@@ -1 +0,0 @@
-name = 'nuwavsource'

setup.py

@@ -4,14 +4,14 @@ with open("README.md", "r") as fh:
     long_description = fh.read()
 
 setuptools.setup(
-    name="nuwavsource",
+    name="nuwavdet",
-    version="0.0.8",
+    version="0.1.0",
     author="Andrey Mukhin",
     author_email="amukhin@phystech.edu",
     description="A package for source exclusion in NuStar observation data using wavelet decomposition",
     long_description=long_description,
     long_description_content_type="text/markdown",
-    url="https://github.com/Andreyousan/nuwavsource",
+    url="https://github.com/andrey-rrousan/nuwavdet",
     packages=setuptools.find_packages(),
     include_package_data=True,
     classifiers=(