changed time bin shifting code

i4Ds · Dec 9, 2021 · d5d30f9 · d5d30f9
1 parent 59d260c
commit d5d30f9
Show file tree

Hide file tree

Showing 73 changed files with 217 additions and 103 deletions.
diff --git a/LICENSE.md b/LICENSE.md
diff --git a/README.md b/README.md
diff --git a/docs/Makefile b/docs/Makefile
diff --git a/docs/build/doctrees/environment.pickle b/docs/build/doctrees/environment.pickle
diff --git a/docs/build/doctrees/index.doctree b/docs/build/doctrees/index.doctree
diff --git a/docs/build/doctrees/modules.doctree b/docs/build/doctrees/modules.doctree
diff --git a/docs/build/doctrees/stixdcpy.doctree b/docs/build/doctrees/stixdcpy.doctree
diff --git a/docs/build/html/.buildinfo b/docs/build/html/.buildinfo
diff --git a/docs/build/html/_sources/index.rst.txt b/docs/build/html/_sources/index.rst.txt
diff --git a/docs/build/html/_sources/modules.rst.txt b/docs/build/html/_sources/modules.rst.txt
diff --git a/docs/build/html/_sources/stixdcpy.rst.txt b/docs/build/html/_sources/stixdcpy.rst.txt
diff --git a/docs/build/html/_static/alabaster.css b/docs/build/html/_static/alabaster.css
diff --git a/docs/build/html/_static/basic.css b/docs/build/html/_static/basic.css
diff --git a/docs/build/html/_static/custom.css b/docs/build/html/_static/custom.css
diff --git a/docs/build/html/_static/doctools.js b/docs/build/html/_static/doctools.js
diff --git a/docs/build/html/_static/documentation_options.js b/docs/build/html/_static/documentation_options.js
diff --git a/docs/build/html/_static/file.png b/docs/build/html/_static/file.png
diff --git a/docs/build/html/_static/jquery-3.5.1.js b/docs/build/html/_static/jquery-3.5.1.js
diff --git a/docs/build/html/_static/jquery.js b/docs/build/html/_static/jquery.js
diff --git a/docs/build/html/_static/language_data.js b/docs/build/html/_static/language_data.js
diff --git a/docs/build/html/_static/minus.png b/docs/build/html/_static/minus.png
diff --git a/docs/build/html/_static/plus.png b/docs/build/html/_static/plus.png
diff --git a/docs/build/html/_static/pygments.css b/docs/build/html/_static/pygments.css
diff --git a/docs/build/html/_static/searchtools.js b/docs/build/html/_static/searchtools.js
diff --git a/docs/build/html/_static/underscore-1.13.1.js b/docs/build/html/_static/underscore-1.13.1.js
diff --git a/docs/build/html/_static/underscore.js b/docs/build/html/_static/underscore.js
diff --git a/docs/build/html/genindex.html b/docs/build/html/genindex.html
diff --git a/docs/build/html/index.html b/docs/build/html/index.html
diff --git a/docs/build/html/modules.html b/docs/build/html/modules.html
diff --git a/docs/build/html/objects.inv b/docs/build/html/objects.inv
diff --git a/docs/build/html/py-modindex.html b/docs/build/html/py-modindex.html
diff --git a/docs/build/html/search.html b/docs/build/html/search.html
diff --git a/docs/build/html/searchindex.js b/docs/build/html/searchindex.js
diff --git a/docs/build/html/stixdcpy.html b/docs/build/html/stixdcpy.html
diff --git a/docs/make.bat b/docs/make.bat
diff --git a/docs/source/conf.py b/docs/source/conf.py
diff --git a/docs/source/index.rst b/docs/source/index.rst
diff --git a/docs/source/modules.rst b/docs/source/modules.rst
diff --git a/docs/source/stixdcpy.rst b/docs/source/stixdcpy.rst
diff --git a/examples/.ipynb_checkpoints/stixdcpy tutorial-checkpoint.ipynb b/examples/.ipynb_checkpoints/stixdcpy tutorial-checkpoint.ipynb
diff --git a/examples/.ipynb_checkpoints/tests-checkpoint.ipynb b/examples/.ipynb_checkpoints/tests-checkpoint.ipynb
diff --git a/examples/stixdcpy tutorial.ipynb b/examples/stixdcpy tutorial.ipynb
@@ -5966,7 +5966,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.5"
+   "version": "3.9.7"
   }
  },
  "nbformat": 4,

diff --git a/examples/test_science.py b/examples/test_science.py
diff --git a/examples/tests.ipynb b/examples/tests.ipynb
diff --git a/requirements.txt b/requirements.txt
diff --git a/setup.py b/setup.py
diff --git a/stixdcpy/Makefile b/stixdcpy/Makefile
diff --git a/stixdcpy/__init__.py b/stixdcpy/__init__.py
diff --git a/stixdcpy/__pycache__/__init__.cpython-39.pyc b/stixdcpy/__pycache__/__init__.cpython-39.pyc
diff --git a/stixdcpy/__pycache__/ancillarydata.cpython-39.pyc b/stixdcpy/__pycache__/ancillarydata.cpython-39.pyc
diff --git a/stixdcpy/__pycache__/energylut.cpython-39.pyc b/stixdcpy/__pycache__/energylut.cpython-39.pyc
diff --git a/stixdcpy/__pycache__/housekeeping.cpython-39.pyc b/stixdcpy/__pycache__/housekeeping.cpython-39.pyc
diff --git a/stixdcpy/__pycache__/io.cpython-39.pyc b/stixdcpy/__pycache__/io.cpython-39.pyc
diff --git a/stixdcpy/__pycache__/net.cpython-39.pyc b/stixdcpy/__pycache__/net.cpython-39.pyc
diff --git a/stixdcpy/__pycache__/quicklook.cpython-39.pyc b/stixdcpy/__pycache__/quicklook.cpython-39.pyc
diff --git a/stixdcpy/__pycache__/sci_l1_corrections.cpython-39.pyc b/stixdcpy/__pycache__/sci_l1_corrections.cpython-39.pyc
diff --git a/stixdcpy/__pycache__/sciencedata.cpython-39.pyc b/stixdcpy/__pycache__/sciencedata.cpython-39.pyc
diff --git a/stixdcpy/__pycache__/time.cpython-39.pyc b/stixdcpy/__pycache__/time.cpython-39.pyc
diff --git a/stixdcpy/ancillary.py b/stixdcpy/ancillary.py
diff --git a/stixdcpy/archived/net.py b/stixdcpy/archived/net.py
diff --git a/stixdcpy/energylut.py b/stixdcpy/energylut.py
diff --git a/stixdcpy/housekeeping.py b/stixdcpy/housekeeping.py
diff --git a/stixdcpy/io.py b/stixdcpy/io.py
diff --git a/stixdcpy/logger.py b/stixdcpy/logger.py
diff --git a/stixdcpy/make.bat b/stixdcpy/make.bat
diff --git a/stixdcpy/net.py b/stixdcpy/net.py
@@ -8,6 +8,7 @@
 import hashlib
 import pprint
 from pathlib import Path, PurePath
+from dateutil import parser as dtparser
 
 import requests
 from astropy.io import fits
@@ -16,10 +17,10 @@
 DOWNLOAD_PATH = Path.cwd() / 'downloads'
 DOWNLOAD_PATH.mkdir(parents=False, exist_ok=True)
 HOST = 'https://pub023.cs.technik.fhnw.ch'
-
 # HOST='http://localhost:5000'
 URLS_POST = {
     'LC': f'{HOST}/api/request/ql/lightcurves',
+    'HK': f'{HOST}/request/packets/hk/tw',
     'ELUT': f'{HOST}/api/request/eluts',
     'EPHEMERIS': f'{HOST}/api/request/ephemeris',
     'SCIENCE': f'{HOST}/api/request/science-data/id',
@@ -226,7 +227,21 @@ def fetch_light_curves(begin_utc: str, end_utc: str, ltc: bool):
         }
         url = URLS_POST['LC']
         return JSONRequest.post(url, form)
-
+    @staticmethod
+    def fetch_housekeeping(begin_utc: str, end_utc: str ):
+        if not begin_utc.endswith('Z'):
+            begin_utc+='Z'
+        if not end_utc.endswith('Z'):
+            end_utc+='Z'
+        start_unix=dtparser.parse(begin_utc).timestamp()
+        end_unix=dtparser.parse(end_utc).timestamp()
+        duration=int(end_unix)-int(start_unix)
+        form = {
+            'start_unix': start_unix,
+            'duration': duration,
+        }
+        url = URLS_POST['HK']
+        return JSONRequest.post(url, form)
     def fetch_onboard_and_true_eluts(utc):
         form = {
             'utc': utc

diff --git a/stixdcpy/quicklook.py b/stixdcpy/quicklook.py
@@ -22,7 +22,10 @@ def __init__(self):
 
 class LightCurves(QuickLook):
     def __init__(self, data):
-        self.data = data
+        if 'error' not in data:
+            self.data = data
+        else:
+            self.data = None
 
     @classmethod
     def fetch(cls, start_utc: str, end_utc: str, ltc=False):