Changeset 1518 for branches/alma/src

Timestamp:

02/25/09 16:48:24 (16 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CAS-1043

Ready to Release: No

Interface Changes: No

What Interface Changed: Please list interface changes

Test Programs: asap_init()

s=sd.scantable('NRO_DATA_FILE',False)

Put in Release Notes: No

Module(s): Module Names change impacts.

Description:

Changed to get header informations together using newly defined method
NROReader::getHeaderInfo().

File:

• branches/alma/src/STFiller.cpp (modified) (3 diffs)

branches/alma/src/STFiller.cpp

@@ -455 +455 @@
        << ttm->tm_hour << ":" << ttm->tm_min << ":" << ttm->tm_sec 
        << ")" << endl ;
-  //
-//   if ( nreader_->open() != 0 ) {
-//     throw( AipsError( "Error while opening file "+filename_ ) ) ;
-//   }
-
-  isNRO_ = true ;
-
-  // store data into  NROHeader and NRODataset
-  //if ( nreader_->readHeader() != 0 ) {
-  //throw( AipsError( "Error while reading file "+filename_ ) ) ;
-  //}
-
-  // get header data
-  NROHeader *nheader =  nreader_->getHeader() ;
 
   // fill STHeader
   header_ = new STHeader() ;
 
-  header_->nchan = nheader->getNUMCH() ; 
-  header_->npol = nreader_->getPolarizationNum() ;
-  header_->observer = nheader->getOBSVR() ;
-  header_->project = nheader->getPROJ() ;
-  header_->obstype = nheader->getSWMOD() ;
-  header_->antennaname = nheader->getSITE() ;
-  // TODO: should be investigated antenna position since there are 
-  //       no corresponding information in the header
-  // 2008/11/13 Takeshi Nakazato
-  // 
-  // INFO: tentative antenna posiiton is obtained for NRO 45m from ITRF website
-  // 2008/11/26 Takeshi Nakazato
-  vector<double> pos = nreader_->getAntennaPosition() ;
-  header_->antennaposition = pos ;
-  char *eq = nheader->getEPOCH() ;
-  if ( strncmp( eq, "B1950", 5 ) == 0 )
-    header_->equinox = 1950.0 ;
-  else if ( strncmp( eq, "J2000", 5 ) == 0 ) 
-    header_->equinox = 2000.0 ;
-//   char *vref = nheader->getVREF() ;
-//   if ( strncmp( vref, "LSR", 3 ) == 0 ) {
-//     strcat( vref, "K" ) ;
-//   }
-//   header_->freqref = vref ;
-  nreader_->getData( 0 ) ;
-  header_->reffreq = nreader_->getData()->FREQ0 ;
-  header_->bandwidth = nheader->getBEBW()[0] ;
-  header_->utc = nreader_->getStartTime() ;
-  header_->fluxunit = "K" ;
-  header_->epoch = "UTC" ;  
-  char *poltp = nheader->getPOLTP()[0] ;
-  if ( strcmp( poltp, "" ) == 0 ) 
-    poltp = "None" ;
-  header_->poltype = poltp ;
-  // DEBUG
-  cout << "STFiller::openNRO()  poltype = " << header_->poltype << endl ;
-  //
-
+  if ( nreader_->getHeaderInfo( header_->nchan,
+                                header_->npol,
+                                nIF_,
+                                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 ) ) {
+    cout << "STFiller::openNRO()  Failed to get header information." << endl ;
+    return ;
+  }
+
+  ifOffset_ = 0;
   vector<Bool> ifs = nreader_->getIFs() ;
-  ifOffset_ = 0;
-  nIF_ = ifs.size() ;
   if ( whichIF >= 0 ) {
     if ( whichIF >= 0 && whichIF < nIF_ ) {
@@ -533 +501 @@
   beamOffset_ = 0;
   vector<Bool> beams = nreader_->getBeams() ;
-  nBeam_ = beams.size() ;
   if (whichBeam>=0) {
     if (whichBeam>=0 && whichBeam<nBeam_) {
@@ -550 +517 @@
     }
   }
+
   header_->nbeam = nBeam_ ;
   header_->nif = nIF_ ;