Changeset 44

Timestamp:

Jun 10, 2014 10:44:37 AM (10 years ago)

Author:

JohnLightfoot

Message:

some bug fixes

File:

• trunk/fts.py (modified) (3 diffs)

trunk/fts.py

@@ -11 +11 @@
     def __init__(self, parameters):
         self.parameters = parameters
-
-        print parameters['substages']['FTSpectrograph'].keys()
 
         # read params from FTSpectrograph sheet
@@ -34 +32 @@
         self.result['delta_wn'] = delta_wn = wnmin / specres
         self.result['delta_opd'] = 1.0 / (2.0 * wnmax * 100.0)
-        self.result['ftsnsample'] = nsample = np.ceil(wnmax / delta_wn)
+        # number of unaliased spectral points
+        nspec = int(np.ceil(wnmax / delta_wn)) + 1
+        # ftsnsample symmetric about 0 opd
+        self.result['ftsnsample'] = ftsnsample = 2 * (nspec - 1)
         self.result['opd_max'] = 1.0 / (2.0 * delta_wn)
 
-        # spectral points sampled by FTS (wn=wavenumber[cm-1]
-        # lambda=wavelength[m])
-        i = np.arange(int(nsample))
-        fts_wn = wnmax * i / float(nsample-1)
-        # crop the spectrum below wnmin. This does not seem to be done
-        # in the matlab version.
-        fts_wn = fts_wn[fts_wn > wnmin]
-        fts_lambda = 1.0 / (fts_wn * 100.0)
+        # unaliased spectral points sampled by FTS (wn=wavenumber[cm-1]
+        i = np.arange(nspec)
+        fts_wn = wnmax * i / float(nspec-1)
+
+        # wn axis truncated at wnmin
+        fts_wn_truncated = fts_wn[fts_wn >= wnmin]
 
         self.result['fts_wn'] = fts_wn
-        self.result['fts_lambda'] = fts_lambda
-
-        print 'more to add in FTSDrive'
+        self.result['fts_wn_truncated'] = fts_wn_truncated
 
     def run(self):
@@ -71 +68 @@
           delta_wn=self.result['delta_wn'],
           delta_opd=self.result['delta_opd'],
-          nsample=self.result['nsample'],
+          nsample=self.result['ftsnsample'],
           opd_max=self.result['opd_max'])