Changeset 2263 for branches/parallel/src/FillerWrapper.h

Timestamp:

08/04/11 15:42:43 (13 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: No

Ready for Test: No

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...

Tuning NROFiller.
Filler is about 6 times faster than before (~660sec->~110sec).

File:

• branches/parallel/src/FillerWrapper.h (modified) (2 diffs)

branches/parallel/src/FillerWrapper.h

@@ -45 +45 @@
       throw(AipsError("File does not exist"));
     }
-    filler_ = new PKSFiller(stable_);
-    if (filler_->open(filename, rec)) {
-      //    if (filler_->open(filename)) {
-      attached_ = true;
-      return;
+    int fileType = dataType( filename ) ;
+    if ( fileType == 0 ) {
+      filler_ = new PKSFiller(stable_);
+      if (filler_->open(filename, rec)) {
+        attached_ = true;
+        return;
+      }
     }
-    filler_ = new NROFiller(stable_);
-    if (filler_->open(filename, rec)) {
-      //    if (filler_->open(filename)) {
-      attached_ = true;
-      return;
+    else if ( fileType == 1 ) {
+      filler_ = new NROFiller(stable_);
+      if (filler_->open(filename, rec)) {
+        attached_ = true;
+        return;
+      }
     }
     filler_ = 0;
@@ -81 +84 @@
 private:
 
+  int dataType( const std::string &filename ) {
+    int ret = -1 ;
+    int pks = 0 ;
+    int nro = 1 ;
+    casa::File file( filename ) ;
+    if ( file.isDirectory() )
+      ret = pks ;
+    else if ( file.isReadable() ) {
+      FILE *f = fopen( filename.c_str(), "r") ;
+      char buf[8] ;
+      fread( buf, 6, 1, f ) ;
+      fclose( f ) ;
+      buf[7]='\0' ;
+      // NRO data has two types:
+      //  1) specific binary data for OTF observation
+      //  2) (pseudo-)FITS data that doesn't have primary HDU
+      // So, one can distinguish NRO and non-NRO data by examining 
+      // first keyword name.
+      if ( casa::String( buf ) == "SIMPLE" ) {
+        ret = pks ;
+      }
+      else {
+        ret = nro ;
+      }
+    }
+    return ret ;
+  }
+
   FillerWrapper();
   FillerWrapper(const FillerWrapper&);