removed converter usage

AdvancedPhotonSource · Jan 14, 2022 · 0f014ef · 0f014ef
1 parent 303b353
commit 0f014ef
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 18 deletions.
diff --git a/scripts/cdi_window.py b/scripts/cdi_window.py
@@ -25,7 +25,6 @@
 import cohere.src_py.utilities.utils as ut
 import importlib
 import config_verifier as ver
-import convertconfig as conv
 
 
 def select_file(start_dir):
@@ -365,9 +364,6 @@ def load_main(self, load_dir):
         -------
         nothing
         """
-        # convert configuration files if needed
-        conv.convert(os.path.join(load_dir, 'conf'))
-
         conf = os.path.join(load_dir, 'conf', 'config')
         try:
             conf_map = ut.read_config(conf)

diff --git a/scripts/format_data.py b/scripts/format_data.py
@@ -16,7 +16,7 @@
 import cohere.src_py.utilities.utils as ut
 import config_verifier as ver
 import alien_tools as at
-import convertconfig as conv
+
 
 __author__ = "Barbara Frosik"
 __copyright__ = "Copyright (c) 2016, UChicago Argonne, LLC."
@@ -169,9 +169,6 @@ def data(experiment_dir):
     """
     print ('formating data')
 
-    # convert configuration files if needed
-    conv.convert(os.path.join(experiment_dir, 'conf'))
-
     prep_file = os.path.join(experiment_dir, 'prep', 'prep_data.tif')
     if os.path.isfile(prep_file):
         prep(prep_file, experiment_dir)

diff --git a/scripts/run_disp.py b/scripts/run_disp.py
@@ -30,7 +30,6 @@
 from functools import partial
 from multiprocessing import Pool, cpu_count
 import importlib
-import convertconfig as conv
 
 
 def process_dir(geometry, rampups, crop, res_dir):
@@ -134,9 +133,6 @@ def get_conf_dict(experiment_dir):
         return None
     conf_dir = os.path.join(experiment_dir, 'conf')
 
-    # convert configuration files if needed
-    conv.convert(conf_dir)
-
     conf = os.path.join(conf_dir, 'config_disp')
     # verify configuration file
     if not ver.ver_config_disp(conf):

diff --git a/scripts/run_prep.py b/scripts/run_prep.py
@@ -24,7 +24,6 @@
 import os
 import sys
 import importlib
-import convertconfig as conv
 
 
 def handle_prep(experiment_dir, *args, **kwargs):
@@ -41,8 +40,6 @@ def handle_prep(experiment_dir, *args, **kwargs):
         directory with experiment files
     """
     print ('preaparing data')
-    # convert configuration files if needed
-    conv.convert(os.path.join(experiment_dir, 'conf'))
 
     try:
         main_conf_file = os.path.join(experiment_dir, *("conf", "config"))

diff --git a/scripts/run_rec.py b/scripts/run_rec.py
@@ -30,7 +30,7 @@
 import cohere.src_py.utilities.utils as ut
 import config_verifier as ver
 import time
-import convertconfig as conv
+
 
 MEM_FACTOR = 1500
 ADJUST = 0.0
@@ -164,8 +164,6 @@ def manage_reconstruction(proc, experiment_dir, rec_id=None):
 
     # the rec_id is a postfix added to config_rec configuration file. If defined, use this configuration.
     conf_dir = os.path.join(experiment_dir, 'conf')
-    # convert configuration files if needed
-    conv.convert(conf_dir)
 
     if rec_id is None:
         conf_file = os.path.join(conf_dir, 'config_rec')