Changeset 1792 for branches/newfiller

Timestamp:

07/30/10 17:49:03 (14 years ago)

Author:

Takeshi Nakazato

Message:

1. Bug fixes on NROFiller.

2. Makefile is updated to compile NROFiller

3. Uncommented the line to create NROFiller in FillerWrapper.h

Location:

branches/newfiller/src

Files:

• FillerWrapper.h (modified) (2 diffs)
• Makefile (modified) (2 diffs)
• NROFiller.cpp (modified) (9 diffs)
• NROFiller.h (modified) (2 diffs)

branches/newfiller/src/FillerWrapper.h

@@ -45 +45 @@
       return;
     }
-//    filler_ = new NROFiller(stable_);
+    filler_ = new NROFiller(stable_);
 //    if (filler_->open(filename, rec)) {
     if (filler_->open(filename)) {
@@ -51 +51 @@
       return;
     }
+    if ( filler_ ) 
+      delete filler_ ;
     filler_ = 0;
     attached_ = false;

branches/newfiller/src/Makefile

@@ -130 +130 @@
              STAtmosphere.o \
              Scantable.o \
+             FillerBase.o \
+             NROFiller.o \
              Templates.o 
 PYOBJECTS := python_Scantable.o \
@@ -144 +146 @@
              python_STAtmosphere.o \
              python_STCoordinate.o \
+             python_Filler.o \
              python_asap.o
 

branches/newfiller/src/NROFiller.cpp

@@ -18 +18 @@
 //
 
-#include "NROFillber.h"
+#include "NROFiller.h"
 #include "STHeader.h"
 #include <atnf/PKSIO/SrcType.h>
@@ -48 +48 @@
 
   // get header information
-  STHeader header() ;
-  if ( reader_->getHeaderInfo( header.nchan,
-                               header.npol,
-                               header.nIF, 
-                               header.nBeam,
-                               header.observer,
-                               header.project,
-                               header.obstype,
-                               header.antennaname,
-                               header.antennaposition,
-                               header.equinox,
-                               header.freqref,
-                               header.reffreq,
-                               header.bandwidth,
-                               header.utc,
-                               header.fluxunit,
-                               header.epoch,
-                               header.poltype ) ) {
+  STHeader hdr ;
+  if ( reader_->getHeaderInfo( hdr.nchan,
+                               hdr.npol,
+                               hdr.nif, 
+                               hdr.nbeam,
+                               hdr.observer,
+                               hdr.project,
+                               hdr.obstype,
+                               hdr.antennaname,
+                               hdr.antennaposition,
+                               hdr.equinox,
+                               hdr.freqref,
+                               hdr.reffreq,
+                               hdr.bandwidth,
+                               hdr.utc,
+                               hdr.fluxunit,
+                               hdr.epoch,
+                               hdr.poltype ) ) {
     status = false ;
     return status ;
@@ -71 +71 @@
 
   // 2010/07/30 TBD: Do we need to set frame here?
-  getTable()->frequencies().setFrame( header->freqref, true ) ;
+  getTable()->frequencies().setFrame( hdr.freqref, true ) ;
   getTable()->frequencies().setFrame( String("LSRK"), false ) ;
 
   // set Header
-  setHeader( header ) ;
+  setHeader( hdr ) ;
 
   return status ;
@@ -84 +84 @@
   // for each row
   uInt nRow = reader_->getRowNum() ;
-  uInt id ;
   vector< vector<double > > freqs ;
   uInt scanno ;
@@ -119 +118 @@
   Int rowCount = 0 ;
 
-  STHeader header = table_->getHeader() ;
+  STHeader header = getTable()->getHeader() ;
   String obsType = header.obstype.substr( 0, 3 ) ;
   for ( Int irow = 0 ; irow < (Int)nRow ; irow++ ) {
     // check scan intent
-    Int scanType = reader_->getScanType( irow ) ;
+    String scanType = reader_->getScanType( irow ) ;
     SrcType::type srcType = SrcType::NOTYPE ;
 
@@ -146 +145 @@
  
     // get scan ifnromation
-    if ( reader_->getScanInfo( i,
+    if ( reader_->getScanInfo( irow,
                                scanno,
                                cycleno,
@@ -178 +177 @@
                                srcdir,
                                scanrate ) ) {
+      throw AipsError( "Failed to read scan record" ) ;
       return ;
     }
+
+    // set IDs and subtable rows
+    // FREQUENCIES subtable row
+    setFrequency( (Double)fqs[0], (Double)fqs[1], (Double)fqs[2] ) ;
+
+    // MOLECULES subtable row
+    setMolecule( restfreq ) ;
+
+    // FOCUS subtable row
+    setFocus( parangle ) ;
+
+    // WEATHER subtable row 
+    setWeather( temperature, pressure, humidity, windvel, winddir ) ;
+
+    // TCAL subtable row
+    // use default since NRO input is calibrated data
+    setTcal() ;
+    
 
     // set row attributes
@@ -189 +207 @@
 
     // SCANNO, CYCLENO, IFNO, POLNO, and BEAMNO
+    uInt ifno = getTable()->frequencies().addEntry( (Double)fqs[0], (Double)fqs[1], (Double)fqs[2] ) ;
     setIndex( scanno, cycleno, ifno, polno, beamno ) ;
 
@@ -212 +231 @@
     setOpacity( opacity ) ;
 
-    // FREQUENCIES subtable row
-    setFrequency( (Double)fqs[0], (Double)fqs[1], (Double)fqs[2] ) ;
-
-    // MOLECULES subtable row
-    setMolecule( restfreq ) ;
-
-    // FOCUS subtable row
-    setFocus( parangle ) ;
-
-    // WEATHER subtable row 
-    setWeather( temperature, pressure, humidity, windvel, windaz ) ;
-
-    // TCAL subtable row
-    // use default since NRO input is calibrated data
-    setTcal() ;
-    
     // finally, commit row
     commitRow() ;

branches/newfiller/src/NROFiller.h

@@ -27 +27 @@
 #define ASAPNROFILLER_H
 
+#include "FillerBase.h"
+
 // STL
 #include <string>
@@ -52 +54 @@
     // pointer to the reader
     NROReader *reader_ ;
-}
+};
 
 
-};
+}
+#endif