Changeset 2831 for trunk

Timestamp:

07/31/13 19:18:39 (11 years ago)

Author:

Kana Sugimoto

Message:

New Development: No

JIRA Issue: No

Ready for Test: Yes

Interface Changes: Yes

What Interface Changed: Renamed function names which previously didn't properly express the nature of functions.

Test Programs:

Put in Release Notes: No

Module(s):

Description:

Renamed function names after the discussion with Wataru.
New names:

• python_Scantable::_is_all_chan_flagged (was: _getflagtrafast)
• ScantableWrapper::isAllChannelsFlagged (was: getFlagtraFast)
• Scantable::isAllChannelsFlagged (was: getFlagtraFast)

Also, isAllChannelsFlagged checks FLAGROW value.

Location:

trunk/src

Files:

• Scantable.cpp (modified) (1 diff)
• Scantable.h (modified) (1 diff)
• ScantableWrapper.h (modified) (1 diff)
• python_Scantable.cpp (modified) (1 diff)

trunk/src/Scantable.cpp

@@ -2485 +2485 @@
 }
 
-bool Scantable::getFlagtraFast(uInt whichrow)
-{
+bool Scantable::isAllChannelsFlagged(uInt whichrow)
+{
+  uInt rflag;
+  flagrowCol_.get(whichrow, rflag);
+  if (rflag > 0)
+    return true;
   uChar flag;
   Vector<uChar> flags;

trunk/src/Scantable.h

@@ -521 +521 @@
   void regridSpecChannel( double dnu, int nchan=-1 ) ;
 
-  bool getFlagtraFast(casa::uInt whichrow);
+  bool isAllChannelsFlagged(casa::uInt whichrow);
 
   std::vector<std::string> applyBaselineTable(const std::string& bltable, 

trunk/src/ScantableWrapper.h

@@ -327 +327 @@
   { return table_->formatPiecewiseBaselineParams(ranges, params, fixed, rms, -1, masklist, whichrow, verbose, csvformat); }
 
-  bool getFlagtraFast(int whichrow=0) const
-  { return table_->getFlagtraFast(casa::uInt(whichrow)); }
+  bool isAllChannelsFlagged(int whichrow=0) const
+  { return table_->isAllChannelsFlagged(casa::uInt(whichrow)); }
 
   std::vector<float> execFFT(int whichrow, const std::vector<bool>& mask, bool getRealImag=false, bool getAmplitudeOnly=false)

trunk/src/python_Scantable.cpp

@@ -162 +162 @@
     .def("format_blparams_row", &ScantableWrapper::formatBaselineParams)
     .def("format_piecewise_blparams_row", &ScantableWrapper::formatPiecewiseBaselineParams)
-    .def("_getflagtrafast", &ScantableWrapper::getFlagtraFast,
+    .def("_is_all_chan_flagged", &ScantableWrapper::isAllChannelsFlagged,
          (boost::python::arg("whichrow")=0) )
     .def("_fft", &ScantableWrapper::execFFT)