Added testing and templates to the imager action

Author: nudomarinero

factor/actions/imager.py

@@ -7,31 +7,42 @@
 from factor.lib.action import action
 from factor.lib.action_lib import makeimagename
 
+from jinja2 import Environment, FileSystemLoader
+import os
+
+
+DIR = os.path.dirname(os.path.abspath(__file__))
+env = Environment(loader=FileSystemLoader(os.path.join(DIR, 'templates')))
+
+
 class imager(action):
     """
-    Implment the imager action
+    Implement the imager action
     """
 
     def __init__(self, op_name, ms, prefix='', niter=None, imsize=None, cell=None, uvrange=None, mask=None, clean=True):
         super(imager, self).__init__(op_name, name = 'imager')
-        self.ms = ms
-        self.prefix = prefix
-        self.niter = niter
-        self.imsize = imsize
-        self.cell = cell
-        self.uvrange = uvrange
-        self.mask = mask
+        self.d = {"ms": ms,
+                  "prefix": prefix,
+                  "niter": niter,
+                  "imsize": imsize,
+                  "cell": cell,
+                  "uvrange": uvrange,
+                  "mask": mask,
+                  "clean": clean, # Do we need this here?
+                  "image": makeimagename(ms, prefix),
+                  }
         self.clean = clean
-        self.image = makeimagename(ms, prefix)
-
+    
+    def _get_command(self):
+        template_imager = env.get_template('imager.tpl')
+        cmd = 'casapy --nologger --log2term -c %s' % template_imager.render(self.d)
+    
     def run(self):
-        # TODO: implement the template
-        template_imager = make_template(ms = self.ms, image = self.image, \
-                                niter = self.niter, imsize = self.imsize, cell = self.cell, uvrange = self.uvrange, mask = self.mask)
-        cmd = 'casapy --nologger --log2term -c %s' % template_imager
-        exec_cmd(cmd)
+        exec_cmd(self.cmd)
 
-        if clean: os.system('rm -rf %s.mask %s.flux %s.psf' % (image, image, image))
+        if clean: 
+            os.system('rm -rf %s.mask %s.flux %s.psf' % (image, image, image))
 
     def get_results(self):
         """

factor/actions/templates/imager.tpl

@@ -0,0 +1 @@
+ 

factor/actions/tests/test_imager.py

@@ -0,0 +1,20 @@
+from __future__ import print_function
+import sys
+import unittest
+import traceback
+import os
+
+# Append the path of the module to the syspath
+sys.path.append(os.path.join('..','..','..'))
+from factor.actions.imager import imager
+
+class TestImager(unittest.TestCase):
+    
+    def setUp(self):
+        self.im = imager("op1", "test_ms")
+    
+    def test_command(self):
+        print(self.im._get_command())
+    
+if __name__ == '__main__':
+    unittest.main()