Changeset 1819 for trunk/src/STFiller.h

Timestamp:

08/02/10 17:28:20 (14 years ago)

Author:

Kana Sugimoto

Message:

New Development: No

JIRA Issue: No (merge alma branch to trunk)

Ready for Test: Yes

Interface Changes: No

Test Programs: regressions may work

Module(s): all single dish modules

Description:

Merged all changes in alma (r1386:1818) and newfiller (r1774:1818) branch.

Location:

trunk/src

Files:

• . (modified) (1 prop)
• STFiller.h (modified) (5 diffs)

trunk/src/STFiller.h

@@ -27 +27 @@
 
 class PKSreader;
+class NROReader;
 
 namespace asap {
@@ -61 +62 @@
     */
   explicit STFiller( const std::string& filename, int whichIF=-1,
-                  int whichBeam=-1 );
+                     int whichBeam=-1 );
 
   /**
@@ -75 +76 @@
    * @exception AipsError Creation of PKSreader failed
    */
-  void open( const std::string& filename, int whichIF=-1, int whichBeam=-1 );
+  void open( const std::string& filename, const std::string& antenna, int whichIF=-1, int whichBeam=-1, casa::Bool getPt=casa::False );
 
   /**
@@ -93 +94 @@
   casa::CountedPtr<Scantable> getTable() const { return table_;}
 
+  /**
+   * For NRO data
+   *
+   * 2008/11/11 Takeshi Nakazato
+   *
+   * openNRO  : NRO version of open(), which performs to open file and 
+   *            read header data.
+   *  
+   * readNRO  : NRO version of read(), which performs to read scan 
+   *            records.
+   *
+   * fileCheck: Identify a type (NRO data or not) of filename_.
+   **/
+  void openNRO( int whichIF=-1, int whichBeam=-1 ) ;
+  int readNRO() ;
+  casa::Bool fileCheck() ;
+
   void setReferenceExpr(const std::string& rx) { refRx_ = rx; }
 
@@ -105 +123 @@
   casa::Vector<casa::Bool> haveXPol_;
   casa::String refRx_;
+  NROReader *nreader_ ;
+  casa::Bool isNRO_ ;
 };