From ea82af2cd507fe532dc263cc81a5caad15ab96e3 Mon Sep 17 00:00:00 2001
From: Florez Ospina Juan Felipe <juan.florez-ospina@psi.ch>
Date: Thu, 10 Oct 2024 14:27:50 +0200
Subject: [PATCH] Cleaned up import statements and comment out path append
 operations

---
 instruments/readers/acsm_tofware_reader.py | 14 ++++++--------
 instruments/readers/filereader_registry.py |  6 +++---
 instruments/readers/flag_reader.py         | 11 +++++++----
 instruments/readers/g5505_text_reader.py   | 12 ++++++------
 instruments/readers/xps_ibw_reader.py      |  3 ---
 5 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/instruments/readers/acsm_tofware_reader.py b/instruments/readers/acsm_tofware_reader.py
index 93d1fc7..b56019b 100644
--- a/instruments/readers/acsm_tofware_reader.py
+++ b/instruments/readers/acsm_tofware_reader.py
@@ -1,17 +1,15 @@
 import sys
 import os
-root_dir = os.path.abspath(os.curdir)
-sys.path.append(root_dir)
-
 import pandas as pd
 import collections
-
-import utils.g5505_utils as utils
-#import src.metadata_review_lib as metadata
-#from src.metadata_review_lib import parse_attribute
-
 import yaml
 
+#root_dir = os.path.abspath(os.curdir)
+#sys.path.append(root_dir)
+import utils.g5505_utils as utils
+
+
+
 
 def read_acsm_files_as_dict(filename: str, instruments_dir: str = None, work_with_copy: bool = True):
     # If instruments_dir is not provided, use the default path relative to the module directory
diff --git a/instruments/readers/filereader_registry.py b/instruments/readers/filereader_registry.py
index d5fde91..b620831 100644
--- a/instruments/readers/filereader_registry.py
+++ b/instruments/readers/filereader_registry.py
@@ -1,7 +1,7 @@
-import sys
 import os
-root_dir = os.path.abspath(os.curdir)
-sys.path.append(root_dir)
+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
diff --git a/instruments/readers/flag_reader.py b/instruments/readers/flag_reader.py
index 35df85e..cbcebaf 100644
--- a/instruments/readers/flag_reader.py
+++ b/instruments/readers/flag_reader.py
@@ -1,11 +1,14 @@
 import os
-import sys
+import json
+
 #root_dir = os.path.abspath(os.curdir)
 #sys.path.append(root_dir)
+#print(__file__)
 
-import json
-import dima.utils.g5505_utils as utils
+#from instruments.readers import set_dima_path as configpath
+#configpath.set_dima_path()
 
+from utils import g5505_utils
 
 
 def read_jsonflag_as_dict(path_to_file):
@@ -27,7 +30,7 @@ def read_jsonflag_as_dict(path_to_file):
 
     dataset = {}
     dataset['name'] = 'data_table'#_numerical_variables'
-    dataset['data'] = utils.convert_attrdict_to_np_structured_array(flag) #df_numerical_attrs.to_numpy()
+    dataset['data'] = g5505_utils.convert_attrdict_to_np_structured_array(flag) #df_numerical_attrs.to_numpy()
     dataset['shape'] = dataset['data'].shape
     dataset['dtype'] = type(dataset['data'])  
 
diff --git a/instruments/readers/g5505_text_reader.py b/instruments/readers/g5505_text_reader.py
index be9144d..c4eab07 100644
--- a/instruments/readers/g5505_text_reader.py
+++ b/instruments/readers/g5505_text_reader.py
@@ -1,16 +1,16 @@
 import sys
 import os
+import pandas as pd
+import collections
+import yaml
+
+# Import project modules
 root_dir = os.path.abspath(os.curdir)
 sys.path.append(root_dir)
 
-import pandas as pd
-import collections
-
 import utils.g5505_utils as utils
-#import src.metadata_review_lib as metadata
-#from src.metadata_review_lib import parse_attribute
 
-import yaml
+
 
 
 def read_txt_files_as_dict(filename: str, instruments_dir: str = None, work_with_copy: bool = True):
diff --git a/instruments/readers/xps_ibw_reader.py b/instruments/readers/xps_ibw_reader.py
index 846fd11..d73531e 100644
--- a/instruments/readers/xps_ibw_reader.py
+++ b/instruments/readers/xps_ibw_reader.py
@@ -1,7 +1,4 @@
 import os
-import numpy as np
-import pandas as pd
-import collections
 from igor2.binarywave import load as loadibw
 
 def read_xps_ibw_file_as_dict(filename):