cohere-ui 4.2.2__tar.gz → 4.2.4__tar.gz

{cohere_ui-4.2.2 → cohere_ui-4.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cohere_ui
-Version: 4.2.2
+Version: 4.2.4
 Home-page: https://github.com/advancedPhotonSource/cohere/cohere-ui
 Author: Barbara Frosik, Ross Harder
 Author-email: bfrosik@anl.gov

{cohere_ui-4.2.2 → cohere_ui-4.2.4}/cohere_ui/api/common.py

@@ -60,10 +60,10 @@ def get_config_maps(experiment_dir, configs, **kwargs):
         # the configuration file applies to specific beamline and needs to be imported
         beamline = main_config_map.get('beamline', None)
         if beamline is None:
-            raise ValueError(f'cannot import beamlines.{beamline} module, exiting.')
-            # return f'cannot import beamlines.{beamline} module, exiting.', maps, None
+            raise ValueError(f'cannot import cohere_ui.beamlines.{beamline} module, exiting.')
+            # return f'cannot import cohere_ui.beamlines.{beamline} module, exiting.', maps, None
         import importlib
-        beam_ver = importlib.import_module(f'beamlines.{beamline}.beam_verifier')
+        beam_ver = importlib.import_module(f'cohere_ui.beamlines.{beamline}.beam_verifier')
     else:
         beam_ver = None
 

{cohere_ui-4.2.2 → cohere_ui-4.2.4}/cohere_ui/beamline_visualization.py

@@ -51,11 +51,11 @@ def process_dir(config_maps, res_dir_scan):
     config_map = config_maps['config']
     beamline = config_map["beamline"]
     try:
-        instr_module = importlib.import_module(f'beamlines.{beamline}.instrument')
+        instr_module = importlib.import_module(f'cohere_ui.beamlines.{beamline}.instrument')
     except Exception as e:
         print(e)
-        print(f'cannot import beamlines.{beamline}.instrument module.')
-        return (f'cannot import beamlines.{beamline}.instrument module.')
+        print(f'cannot import cohere_ui.beamlines.{beamline}.instrument module.')
+        return (f'cannot import cohere_ui.beamlines.{beamline}.instrument module.')
 
     instr_obj = instr_module.create_instr(config_maps)
     if instr_obj is None:

{cohere_ui-4.2.2 → cohere_ui-4.2.4}/cohere_ui/beamlines/Petra3_P10/beam_tabs.py

@@ -484,7 +484,7 @@ class SubInstrTab():
             msg_window ('cannot parse fio, diffractometer not defined')
             return
 
-        import beamlines.Petra3_P10.diffractometers as diff
+        import cohere_ui.beamlines.Petra3_P10.diffractometers as diff
 
         if diffractometer not in diff.diffs.keys():
             msg_window (f'diffractometer {diffractometer} not defined')

{cohere_ui-4.2.2 → cohere_ui-4.2.4}/cohere_ui/beamlines/aps_1ide/beam_tabs.py

@@ -494,7 +494,7 @@ class SubInstrTab():
             msg_window ('cannot parse spec, vff_eta_offset not defined')
             return
 
-        import beamlines.aps_1ide.diffractometers as diff
+        import cohere_ui.beamlines.aps_1ide.diffractometers as diff
 
         try:
             diff_obj = diff.create_diffractometer(diffractometer, {'specfile':specfile})

{cohere_ui-4.2.2 → cohere_ui-4.2.4}/cohere_ui/beamlines/aps_34idc/beam_tabs.py

@@ -555,7 +555,7 @@ class SubInstrTab():
             msg_window ('cannot parse spec, specfile not defined')
             return
 
-        import beamlines.aps_34idc.diffractometers as diff
+        import cohere_ui.beamlines.aps_34idc.diffractometers as diff
 
         try:
             diff_obj = diff.create_diffractometer(diffractometer, {'specfile' : specfile})

{cohere_ui-4.2.2 → cohere_ui-4.2.4}/cohere_ui/cohere_gui.py

@@ -557,7 +557,7 @@ class Tabs(QTabWidget):
 
 
     def run_prep(self):
-        import beamline_preprocess as prep
+        import cohere_ui.beamline_preprocess as prep
 
         # this line is passing all parameters from command line to prep script. 
         # if there are other parameters, one can add some code here        
@@ -570,7 +570,7 @@ class Tabs(QTabWidget):
 
 
     def run_viz(self):
-        import beamline_visualization as dp
+        import cohere_ui.beamline_visualization as dp
 
         try:
             dp.handle_visualization(self.main_win.experiment_dir, no_verify=self.main_win.no_verify)
@@ -858,7 +858,7 @@ class DataTab(QWidget):
         -------
         nothing
         """
-        import standard_preprocess as run_dt
+        import cohere_ui.standard_preprocess as run_dt
 
         if not self.main_win.is_exp_exists():
             msg_window('the experiment has not been created yet')
@@ -1299,7 +1299,7 @@ class RecTab(QWidget):
         -------
         nothing
         """
-        import run_reconstruction as run_rc
+        import cohere_ui.run_reconstruction as run_rc
 
         if not self.main_win.is_exp_exists():
             msg_window('the experiment has not been created yet')

{cohere_ui-4.2.2 → cohere_ui-4.2.4}/cohere_ui.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cohere_ui
-Version: 4.2.2
+Version: 4.2.4
 Home-page: https://github.com/advancedPhotonSource/cohere/cohere-ui
 Author: Barbara Frosik, Ross Harder
 Author-email: bfrosik@anl.gov

{cohere_ui-4.2.2 → cohere_ui-4.2.4}/setup.py

@@ -5,7 +5,7 @@ setuptools.setup(
       author='Barbara Frosik, Ross Harder',
       author_email='bfrosik@anl.gov',
       url='https://github.com/advancedPhotonSource/cohere/cohere-ui',
-      version='4.2.2',
+      version='4.2.4',
       packages=['cohere_ui', 
                 'cohere_ui.api', 
                 'cohere_ui.beamlines.aps_1ide',