From 3bff8d54ea8351132e09960417559eafb38e93f8 Mon Sep 17 00:00:00 2001
From: Bo Zhang <bozhang@nao.cas.cn>
Date: Fri, 17 Dec 2021 23:19:14 +0800
Subject: [PATCH] separate data package

---
 csst/common/data/__init__.py         |  2 ++
 csst/common/{ => data}/data.py       |  2 +-
 csst/{msc => common/data}/mscdata.py | 14 ++++++++++++--
 csst/common/factory.py               |  4 ++--
 4 files changed, 17 insertions(+), 5 deletions(-)
 create mode 100644 csst/common/data/__init__.py
 rename csst/common/{ => data}/data.py (98%)
 rename csst/{msc => common/data}/mscdata.py (92%)

diff --git a/csst/common/data/__init__.py b/csst/common/data/__init__.py
new file mode 100644
index 0000000..6f24a9f
--- /dev/null
+++ b/csst/common/data/__init__.py
@@ -0,0 +1,2 @@
+from .data import CsstData
+from .mscdata import CsstMscData, CsstMscImgData
diff --git a/csst/common/data.py b/csst/common/data/data.py
similarity index 98%
rename from csst/common/data.py
rename to csst/common/data/data.py
index ba604c0..8b314b7 100644
--- a/csst/common/data.py
+++ b/csst/common/data/data.py
@@ -3,7 +3,7 @@ from collections import OrderedDict
 import astropy.io.fits as fits
 from astropy.io.fits import HDUList, PrimaryHDU
 
-from .CsstException import CsstException
+from ..CsstException import CsstException
 
 
 INSTRUMENT_LIST = ["MSC", ]
diff --git a/csst/msc/mscdata.py b/csst/common/data/mscdata.py
similarity index 92%
rename from csst/msc/mscdata.py
rename to csst/common/data/mscdata.py
index 8cdcccd..58b88a0 100644
--- a/csst/msc/mscdata.py
+++ b/csst/common/data/mscdata.py
@@ -2,7 +2,7 @@ from collections import OrderedDict
 import astropy.io.fits as fits
 from astropy.io.fits import HDUList, PrimaryHDU, ImageHDU
 from astropy.io.fits.header import Header
-from ..common.data import CsstData
+from csst.common.data import CsstData
 
 
 class CsstMscData(CsstData):
@@ -13,12 +13,22 @@ class CsstMscData(CsstData):
         super(CsstData, self).__init__(primaryHDU, imgHDU, **kwargs)
         self._l1hdr_global = primaryHDU.header.copy()
         #         self._l1hdr_global['SIMPLE']  =  'T' #/ conforms to FITS standard
-        #         self._l1hdr_global['NAXIS']  =  0
+        #         self._l1hdr_global['NAXIS']  =  0kkjk
         self._l1data['sci'] = ImageHDU()
         self._l1data['weight'] = ImageHDU()
         self._l1data['flag'] = ImageHDU()
 
     def set_flat(self, flatimg):
+        """
+
+        Parameters
+        ----------
+        flatimg
+
+        Returns
+        -------
+
+        """
         self._auxdata['flat'] = flatimg
 
     def set_bias(self, biasimg):
diff --git a/csst/common/factory.py b/csst/common/factory.py
index c108d2b..725d2c8 100644
--- a/csst/common/factory.py
+++ b/csst/common/factory.py
@@ -1,7 +1,7 @@
 from astropy.io import fits
 
-from .data import INSTRUMENT_LIST
-from ..msc.mscdata import CsstMscImgData
+from .data.data import INSTRUMENT_LIST
+from csst.common.data.mscdata import CsstMscImgData
 
 
 class CsstDataFactory:
-- 
GitLab