Make dataobjects subproject refs #219

pyrs/core/nexus_conversion.py

@@ -9,7 +9,8 @@
 import os
 from pyrs.core import workspaces
 from pyrs.core.instrument_geometry import AnglerCameraDetectorGeometry, HidraSetup
-from pyrs.projectfile import HidraConstants, HidraProjectFile, HidraProjectFileMode
+from pyrs.dataobjects import HidraConstants
+from pyrs.projectfile import HidraProjectFile, HidraProjectFileMode
 from pyrs.utilities import checkdatatypes
 
 

pyrs/core/pyrscore.py

@@ -1,9 +1,10 @@
 # This is the core of PyRS serving as the controller of PyRS and hub for all the data
 from pyrs.utilities import checkdatatypes
 from pyrs.core import instrument_geometry
+from pyrs.dataobjects import HidraConstants
 from pyrs.utilities import file_util
 from pyrs.peaks import PeakFitEngineFactory, SupportedPeakProfiles, SupportedBackgroundTypes
-from pyrs.projectfile import HidraConstants, HidraProjectFile, HidraProjectFileMode
+from pyrs.projectfile import HidraProjectFile, HidraProjectFileMode
 from pyrs.core import strain_stress_calculator
 from pyrs.core import reduction_manager
 from pyrs.core import polefigurecalculator

pyrs/core/reduction_manager.py

@@ -7,7 +7,8 @@
 from pyrs.core import mask_util
 from pyrs.core import reduce_hb2b_mtd
 from pyrs.core import reduce_hb2b_pyrs
-from pyrs.projectfile import HidraConstants, HidraProjectFile, HidraProjectFileMode
+from pyrs.dataobjects import HidraConstants
+from pyrs.projectfile import HidraProjectFile, HidraProjectFileMode
 from pyrs.utilities import calibration_file_io
 from pyrs.utilities import checkdatatypes
 

pyrs/core/workspaces.py

@@ -1,7 +1,7 @@
 # Data manager
 import numpy
-from pyrs.dataobjects import SampleLogs
-from pyrs.projectfile import HidraConstants, HidraProjectFile
+from pyrs.dataobjects import HidraConstants, SampleLogs
+from pyrs.projectfile import HidraProjectFile
 from pyrs.utilities import checkdatatypes
 
 

pyrs/dataobjects/__init__.py

@@ -0,0 +1,7 @@
+# flake8: noqa
+from __future__ import (absolute_import, division, print_function)  # python3 compatibility
+
+from .constants import *
+from .sample_logs import *
+
+__all__ = constants.__all__ + sample_logs.__all__

pyrs/dataobjects.py → pyrs/dataobjects/sample_logs.py

@@ -1,6 +1,9 @@
 # extentable version of dict https://treyhunner.com/2019/04/why-you-shouldnt-inherit-from-list-and-dict-in-python/
 from collections import MutableMapping
 import numpy as np
+from pyrs.dataobjects import HidraConstants
+
+__all__ = ['SampleLogs']
 
 
 def _coerce_to_ndarray(value):
@@ -11,7 +14,7 @@ def _coerce_to_ndarray(value):
 
 
 class SampleLogs(MutableMapping):
-    SUBRUN_KEY = 'sub-runs'  # TODO should be pyrs.projectfile.HidraConstants.SUB_RUNS
+    SUBRUN_KEY = HidraConstants.SUB_RUNS
 
     def __init__(self, **kwargs):
         self._data = dict(kwargs)

pyrs/projectfile/__init__.py

@@ -1,8 +1,7 @@
 # flake8: noqa
 from __future__ import (absolute_import, division, print_function)  # python3 compatibility
 
-from .constants import *
 from .file_mode import *
 from .file_object import *
 
-__all__ = constants.__all__ + file_mode.__all__ + file_object.__all__
+__all__ = file_mode.__all__ + file_object.__all__

pyrs/projectfile/file_object.py

@@ -7,8 +7,8 @@
 from pyrs.utilities import checkdatatypes
 from pyrs.core.instrument_geometry import AnglerCameraDetectorGeometry, HidraSetup
 from pyrs.peaks import PeakCollection
-from pyrs.dataobjects import SampleLogs
-from pyrs.projectfile import HidraConstants, HidraProjectFileMode
+from pyrs.dataobjects import HidraConstants, SampleLogs
+from pyrs.projectfile import HidraProjectFileMode
 
 __all__ = ['HidraProjectFile']
 

scripts/preparetest/convert_hzb_data.py

@@ -14,7 +14,8 @@
 import numpy
 import os
 from pyrs.core.instrument_geometry import HidraSetup
-from pyrs.projectfile import HidraConstants, HidraProjectFile, HidraProjectFileMode
+from pyrs.dataobjects import HidraConstants
+from pyrs.projectfile import HidraProjectFile, HidraProjectFileMode
 from pyrs.utilities import file_util
 
 

tests/data/convert_xray_data.py

@@ -7,7 +7,8 @@
 
 Note: most of the methods to parse HZB data are copied from script pyrscalibration.py
 """
-from pyrs.projectfile import HidraConstants, HidraProjectFileMode
+from pyrs.dataobjects import HidraConstants
+from pyrs.projectfile import HidraProjectFileMode
 from pyrs.utilities.rs_project_file import HidraProjectFile
 from pyrs.core.instrument_geometry import HidraSetup
 from skimage import io

tests/integration/test_autoreduction.py

@@ -1,7 +1,7 @@
 import os
 from pyrs.core.nexus_conversion import NeXusConvertingApp
 from pyrs.core.powder_pattern import ReductionApp
-from pyrs.projectfile import HidraConstants
+from pyrs.dataobjects import HidraConstants
 from matplotlib import pyplot as plt
 import pytest
 

tests/unit/test_hidra_project_file.py

@@ -1,7 +1,8 @@
 """
 Test for reading and writing components to HiDRA project file
 """
-from pyrs.projectfile import HidraConstants, HidraProjectFile, HidraProjectFileMode
+from pyrs.dataobjects import HidraConstants
+from pyrs.projectfile import HidraProjectFile, HidraProjectFileMode
 import os
 import numpy as np
 import datetime