Change import statements with try except to enable explicit import of submodules from import to avoid conflicts with parent project.

instruments/readers/acsm_tofware_reader.py

@@ -6,7 +6,10 @@ import yaml
 
 #root_dir = os.path.abspath(os.curdir)
 #sys.path.append(root_dir)
-import utils.g5505_utils as utils
+try:
+    from dima.utils import g5505_utils as utils
+except ModuleNotFoundError:
+    import utils.g5505_utils as utils
 
 
 

instruments/readers/filereader_registry.py

@@ -3,9 +3,13 @@ import sys
 #root_dir = os.path.abspath(os.curdir)
 #sys.path.append(root_dir)
 
-from instruments.readers.xps_ibw_reader import read_xps_ibw_file_as_dict
-from instruments.readers.g5505_text_reader import read_txt_files_as_dict
-
+try:
+    from dima.instruments.readers.xps_ibw_reader import read_xps_ibw_file_as_dict
+    from dima.instruments.readers.g5505_text_reader import read_txt_files_as_dict
+    
+except ModuleNotFoundError:
+    from instruments.readers.xps_ibw_reader import read_xps_ibw_file_as_dict
+    from instruments.readers.g5505_text_reader import read_txt_files_as_dict
 
 file_extensions = ['.ibw','.txt','.dat','.h5','.TXT','.csv','.pkl','.json','.yaml']
 

instruments/readers/flag_reader.py

@@ -8,7 +8,10 @@ import json
 #from instruments.readers import set_dima_path as configpath
 #configpath.set_dima_path()
 
-from utils import g5505_utils
+try:
+    from dima.utils import g5505_utils as utils
+except ModuleNotFoundError:
+    import utils.g5505_utils as utils
 
 
 def read_jsonflag_as_dict(path_to_file):