Changeset 1320

Timestamp:

03/02/07 11:02:27 (17 years ago)

Author:

mar637

Message:

merge from trunk, to get most recent bug fixes

Location:

branches/Release2.1.2

Files:

• plugins (copied) (copied from trunk/plugins)
• python/__init__.py (modified) (3 diffs)
• python/asapplotter.py (modified) (1 diff)
• src/RowAccumulator.cpp (modified) (4 diffs)
• src/STLineFinder.cpp (modified) (8 diffs)
• src/STMath.cpp (modified) (3 diffs)

branches/Release2.1.2/python/__init__.py

@@ -22 +22 @@
     if os.path.exists(os.environ["ASAPDATA"]):
         asapdata = os.environ["ASAPDATA"]
-os.environ["AIPSPATH"] = "%s %s somwhere" % ( asapdata, plf)
+if not os.environ.has_key("AIPSPATH"):
+    os.environ["AIPSPATH"] = "%s %s somwhere" % ( asapdata, plf)
 # set up user space
 userdir = os.environ["HOME"]+"/.asap"
@@ -254 +255 @@
 
 def _n_bools(n, val):
-    return [ val for i in xrange(n) ] 
+    return [ val for i in xrange(n) ]
 
 def _is_sequence_or_number(param, ptype=int):
@@ -348 +349 @@
 if rcParams['useplotter']:
     try:
-        from  asapplotter import asapplotter
-        gui = os.environ.has_key('DISPLAY') and rcParams['plotter.gui']
-        if gui:
-            import pylab as xyplotter
-            plotter = asapplotter(gui)
-            del gui
+    from  asapplotter import asapplotter
+    gui = os.environ.has_key('DISPLAY') and rcParams['plotter.gui']
+    if gui:
+        import pylab as xyplotter
+        plotter = asapplotter(gui)
+        del gui
     except ImportError:
-        print "Matplotlib not installed. No plotting available"
+    print "Matplotlib not installed. No plotting available"
 
 __date__ = '$Date$'.split()[1]
-__version__  = '2.1.3'
+__version__  = '2.1.2'
 
 def is_ipython():

branches/Release2.1.2/python/asapplotter.py

@@ -1 +1 @@
 from asap import rcParams, print_log, selector
 import matplotlib.axes
-import sre
+import re
 
 class asapplotter:

branches/Release2.1.2/src/RowAccumulator.cpp

@@ -13 +13 @@
 
 #include <casa/Arrays/MaskArrMath.h>
+#include <casa/Arrays/MaskArrLogi.h>
 #include <casa/Arrays/ArrayMath.h>
+#include <casa/Arrays/ArrayLogical.h>
 #include "RowAccumulator.h"
 
@@ -40 +42 @@
   if (!initialized_) {
     Vector<Float> dummy(v.nelements(), 0.0);
-    spectrum_.setData(dummy, Vector<Bool>(m.nelements(), True));
-    n_.setData(Vector<Float>(v.nelements(), 0.0), m);
-    weightSum_.setData(Vector<Float>(v.nelements(), 0.0), m);
+    Vector<Bool> dummymsk(m.nelements(), True);
+    spectrum_.setData(dummy, dummymsk);
+    n_.setData(Vector<Float>(v.nelements(), 0.0), dummymsk);
+    weightSum_.setData(Vector<Float>(v.nelements(), 0.0), dummymsk);
     tsysSum_.resize(tsys.nelements()); tsysSum_=0.0;
   }
@@ -48 +51 @@
   Float totalweight = 1.0;
   totalweight *= addTsys(tsys);
-  totalweight *= addInterval(interval);
-  addTime(time);
+  // only add these if not everything masked
+  if ( !allEQ(m, False) ) {
+    totalweight *= addInterval(interval);
+    addTime(time);
+  }
   addSpectrum(v, m, totalweight);
   initialized_ = True;
@@ -134 +140 @@
 casa::Vector< casa::Float > asap::RowAccumulator::getTsys( ) const
 {
-  // @fixme this assummes tsys.nelements() == 1
+  // @fixme this assumes tsys.nelements() == 1
   return tsysSum_/max(n_);
 }

branches/Release2.1.2/src/STLineFinder.cpp

@@ -50 +50 @@
 //
 // RunningBox -    a running box calculator. This class implements
-//                 interations over the specified spectrum and calculates
+//                 iterations over the specified spectrum and calculates
 //                 running box filter statistics.
 //
@@ -399 +399 @@
           if (last_sign && last_sign!=getAboveMeanSign())
               detect=False;
-          }
-          if (detect) {
-              last_sign=getAboveMeanSign();
-              if (is_detected_before)
-                  cur_line.second=running_box->getChannel()+1;
-              else {
-                  is_detected_before=True;
-                  cur_line.first=running_box->getChannel();
-                  cur_line.second=running_box->getChannel()+1;
-              }
-          } else processCurLine(mask);
+       }
+       if (detect) {
+           last_sign=getAboveMeanSign();
+           if (is_detected_before)
+               cur_line.second=running_box->getChannel()+1;
+           else {
+               is_detected_before=True;
+               cur_line.first=running_box->getChannel();
+               cur_line.second=running_box->getChannel()+1;
+           }
+       } else processCurLine(mask);
   }
   catch (const AipsError &ae) {
@@ -426 +426 @@
   try {
        if (is_detected_before) {
-           if (cur_line.second-cur_line.first>min_nchan) {
+           if (cur_line.second-cur_line.first>=min_nchan) {
                // it was a detection. We need to change the list
                Bool add_new_line=False;
@@ -517 +517 @@
            signs[ch]=getAboveMeanSign();
            // os<<ch<<" "<<spectrum[ch]<<" "<<fabs(running_box->aboveMean())<<" "<<
-           //   threshold*offline_variance<<endl;
+           // threshold*offline_variance<<endl;
 
            const Float buf=running_box->aboveMean();
@@ -523 +523 @@
            else if (buf<0) signs[ch]=-1;
            else if (buf==0) signs[ch]=0;
-        //   os<<ch<<" "<<spectrum[ch]<<" "<<running_box->getLinMean()<<" "<<
-          //              threshold*offline_variance<<endl;
+           //os<<ch<<" "<<spectrum[ch]<<" "<<running_box->getLinMean()<<" "<<
+           //             threshold*offline_variance<<endl;
       }
       if (lines.size())
@@ -768 +768 @@
          // nothing new - proceed to the next step of averaging, if any
          // (to search for broad lines)
-         if (avg_factor>avg_limit) break; // averaging up to avg_limit
+         if (avg_factor>=avg_limit) break; // averaging up to avg_limit
                                           // adjacent channels,
                                           // stop after that
@@ -775 +775 @@
          averageAdjacentChannels(temp_mask,avg_factor);
          continue;
-     }
+     } 
      keepStrongestOnly(temp_mask,new_lines,max_box_nchan);
      // update the list (lines) merging intervals, if necessary
@@ -951 +951 @@
 // they will be find again at the next iteration. This approach
 // increases the number of iterations required, but is able to remove
-// the sidelobes likely to occur near strong lines.
+// spurious detections likely to occur near strong lines.
 // Later a better criterion may be implemented, e.g.
 // taking into consideration the brightness of different lines. Now

branches/Release2.1.2/src/STMath.cpp

@@ -167 +167 @@
         Vector<Bool> bflag(flag.shape());
         convertArray(bflag, flag);
+        /*
         if ( allEQ(bflag, True) ) {
-          continue;//don't accumulate
+        continue;//don't accumulate
         }
+        */
         specCol.get(k, spec);
         tsysCol.get(k, tsys);
@@ -904 +906 @@
     scaleByVector(tab,factors, false);
   } else if ( etaap > 0.0) {
-    Instrument inst =
-      STAttr::convertInstrument(tab.keywordSet().asString("AntennaName"), True);
-    STAttr sda;
-    if (d < 0) d = sda.diameter(inst);
+    if (d < 0) {
+      Instrument inst =
+        STAttr::convertInstrument(tab.keywordSet().asString("AntennaName"), 
+                                  True);
+      STAttr sda;
+      d = sda.diameter(inst);
+    }
     jyperk = STAttr::findJyPerK(etaap, d);
     ostringstream oss;
@@ -976 +981 @@
   for ( uInt i=0; i<tab.nrow(); ++i) {
     Float zdist = Float(C::pi_2) - elev(i);
-    Float factor = exp(tau)/cos(zdist);
+    Float factor = exp(tau/cos(zdist));
     MaskedArray<Float> ma = maskedArray(specCol(i), flagCol(i));
     ma *= factor;