Issue 108 (#109)

* fixes #108, possibly * fixes #108 Co-authored-by: Oleg Smirnov <[email protected]> Co-authored-by: Benna Hugo <[email protected]>
ratt-ru · Jun 8, 2022 · 39cfbc0 · 39cfbc0
1 parent 80e46f6
commit 39cfbc0
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 deletions.
diff --git a/Pyxides/im/__init__.py b/Pyxides/im/__init__.py
@@ -55,10 +55,10 @@
 velocity = False 
 no_weight_fov = False
 
-# import wsclean
-# import lwimager
-# import casa
-# import moresane
+from . import wsclean
+from . import lwimager
+from . import casa
+from . import moresane
 
 def make_image (*args,**kw):
   imager = kw.get('imager', IMAGER).lower();

diff --git a/Pyxides/im/casa.py b/Pyxides/im/casa.py
@@ -4,7 +4,7 @@
 import im
 import subprocess
 import tempfile
-import  argo
+from . import  argo
 import pyrap.images as Images
 
 # register ourselves with Pyxis and define the superglobals

diff --git a/Pyxides/im/lwimager.py b/Pyxides/im/lwimager.py
@@ -5,7 +5,7 @@
 import os
 import subprocess
 from astropy.io import fits as pyfits
-from im import argo
+from . import argo
 
 import ms
 import std

diff --git a/Pyxides/im/moresane.py b/Pyxides/im/moresane.py
@@ -5,7 +5,7 @@
 import sys
 import numpy
 import math
-import argo
+from . import argo
 import im
 # Standard options
 gain = 0.1

diff --git a/Pyxides/imager.py b/Pyxides/imager.py
@@ -1,5 +1,5 @@
 from Pyxis.ModSupport import *
-
+from Pyxides import im
 register_pyxis_module(superglobals="MS LSM DESTDIR");
 v.define("LSM","lsm.lsm.html","""current local sky model""");
 
@@ -89,7 +89,8 @@ def make_image (msname="$MS",column="$COLUMN",imager='$IMAGER',
     makedir('$DESTDIR')
     if imager in ['lwimager','wsclean']:
         __import__('im.%s'%imager.lower());
-        call_imager = eval( 'im.%s.make_image'%(imager.lower()) )
+        call_imager = getattr(getattr(im, imager.lower()), "make_image")
+#        call_imager = eval( 'im.%s.make_image'%(imager.lower()) )
     else: 
 
         abort('Uknown imager: $imager')