Changeset 2237 for trunk/src/MSFiller.h

Timestamp:

07/20/11 15:20:39 (13 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: No

Ready for Test: Yes

Interface Changes: No

What Interface Changed: Please list interface changes

Test Programs: List test programs

Put in Release Notes: Yes/No?

Module(s): Module Names change impacts.

Description: Describe your changes here...

Refactoring MSFiller::fill() to detect bottle neck of the process.
There are no changes effectively.

File:

• trunk/src/MSFiller.h (modified) (2 diffs)

trunk/src/MSFiller.h

@@ -91 +91 @@
   // get direction for DIRECTION, AZIMUTH, and ELEVATION columns
   casa::uInt getDirection( casa::uInt idx, casa::Vector<casa::Double> &dir, casa::Vector<casa::Double> &srate, casa::String &ref, casa::MSPointing &tab, casa::Double t ) ;
+  casa::uInt getDirection( casa::uInt idx, casa::Vector<casa::Double> &dir, casa::Vector<casa::Double> &azel, casa::Vector<casa::Double> &srate, casa::MSPointing &tab, casa::MEpoch &t, casa::MPosition &antpos ) ;
+  void getSourceDirection( casa::Vector<casa::Double> &dir, casa::Vector<casa::Double> &azel, casa::Vector<casa::Double> &srate, casa::MEpoch &t, casa::MPosition &antpos, casa::Vector<casa::MDirection> &srcdir ) ;
 
   // create key for TCAL table
@@ -103 +105 @@
   // get frequency frame
   std::string getFrame() ;
-  
+
+  // reshape SPECTRA and FLAGTRA
+  void reshapeSpectraAndFlagtra( casa::Cube<casa::Float> &sp, 
+                                 casa::Cube<casa::Bool> &fl,
+                                 casa::Table &tab,
+                                 casa::Int &npol,
+                                 casa::Int &nchan,
+                                 casa::Int &nrow,
+                                 casa::Vector<casa::Int> &corrtype ) ;
+  
+  // initialize header
+  void initHeader( STHeader &header ) ;
+
+  // get value from table column using object pool
+  casa::String asString( casa::String name,
+                         casa::uInt idx,
+                         casa::Table tab, 
+                         boost::object_pool<casa::ROTableColumn> *pool ) ;
+  casa::Bool asBool( casa::String name,
+                     casa::uInt idx,
+                     casa::Table &tab, 
+                     boost::object_pool<casa::ROTableColumn> *pool ) ;
+  casa::Int asInt( casa::String name,
+                   casa::uInt idx,
+                   casa::Table &tab, 
+                   boost::object_pool<casa::ROTableColumn> *pool ) ;
+  casa::uInt asuInt( casa::String name,
+                     casa::uInt idx,
+                     casa::Table &tab, 
+                     boost::object_pool<casa::ROTableColumn> *pool ) ;
+  casa::Float asFloat( casa::String name,
+                       casa::uInt idx,
+                       casa::Table &tab, 
+                       boost::object_pool<casa::ROTableColumn> *pool ) ;
+  casa::Double asDouble( casa::String name,
+                         casa::uInt idx,
+                         casa::Table &tab, 
+                         boost::object_pool<casa::ROTableColumn> *pool ) ;
+
+  void sourceInfo( casa::Int sourceId,
+                   casa::Int spwId,
+                   casa::String &name, 
+                   casa::MDirection &direction,
+                   casa::Vector<casa::Double> &properMotion,
+                   casa::Vector<casa::Double> &restFreqs,
+                   casa::Vector<casa::String> &transitions,
+                   casa::Vector<casa::Double> &sysVels,
+                   boost::object_pool<casa::ROTableColumn> *pool ) ;
+
+  void spectralSetup( casa::Int spwId,
+                      casa::MEpoch &me,
+                      casa::MPosition &mp,
+                      casa::MDirection &md,
+                      casa::Double &refpix,
+                      casa::Double &refval,
+                      casa::Double &increment,
+                      casa::Int &nchan,
+                      casa::String &freqref,
+                      casa::Double &reffreq,
+                      casa::Double &bandwidth,
+                      boost::object_pool<casa::ROTableColumn> *pool ) ;
+
   casa::CountedPtr<Scantable> table_ ;
   casa::MeasurementSet mstable_ ;