Changeset 46

Timestamp:

Sep 19, 2014 4:52:35 PM (10 years ago)

Author:

JohnLightfoot

Message:

almost working

File:

• trunk/fiins.py (modified) (4 diffs)

trunk/fiins.py

@@ -5 +5 @@
 
 import beamsgenerator
-import doublefourier
+import cleanimage
+import dirtyimage
 import fts
 import loadparameters
-import pointingerrors
+import observe
 import renderer
 import skygenerator
 import uvmapgenerator
+import uvspectra
 
 
@@ -36 +38 @@
         self.result['loadparameters'] = obs_specification
 
-        # generate UV map
-        uvmapgen = uvmapgenerator.UVMapGenerator(parameters=obs_specification)
-        self.result['uvmapgenerator'] = uvmapgen.run()
-
         # generate information on the FTS 
         ftsd = fts.FTS(parameters=obs_specification)
@@ -45 +43 @@
         print ftsd
 
+        # generate UV map and observation framework
+        uvmapgen = uvmapgenerator.UVMapGenerator(parameters=obs_specification,
+          previous_results=self.result)
+        self.result['uvmapgenerator'] = uvmapgen.run()
+        print uvmapgen
+
         # generate primary beams
         beamsgen = beamsgenerator.BeamsGenerator(
           previous_results=self.result)
         self.result['beamsgenerator'] = beamsgen.run()
-
-        # pointing errors
-        pointingerrs = pointingerrors.PointingErrors(
-          parameters=obs_specification)
-        self.result['pointingerrors'] = pointingerrs.run()
 
         # construct sky
@@ -61 +60 @@
 
         # calculate interferograms
-        doublef = doublefourier.DoubleFourier(parameters=obs_specification,
+        obs = observe.Observe(parameters=obs_specification,
           previous_results=self.result, job_server=self.job_server)
-        self.result['doublefourier'] = doublef.run()  
+        self.result['observe'] = obs.run()  
+
+        # recover spectra from interferograms
+        uvspec = uvspectra.UVspectra(previous_results=self.result,
+          job_server=self.job_server)
+        self.result['uvspectra'] = uvspec.run()  
+
+        # construct dirty image
+        dirty = dirtyimage.DirtyImage(previous_results=self.result,
+          job_server=self.job_server)
+        self.result['dirtyimage'] = dirty.run()  
+
+        # construct clean image
+        clean = cleanimage.CleanImage(previous_results=self.result,
+          job_server=self.job_server)
+        self.result['cleanimage'] = clean.run()  
 
         # construct html description of result