Changeset 1810 for branches/newfiller/src

Timestamp:

08/02/10 11:49:42 (14 years ago)

Author:

Malte Marquarding

Message:

fix nchan handling. pksrec.nchan not implemented in MB reader

File:

• branches/newfiller/src/STFiller.cpp (modified) (18 diffs)

branches/newfiller/src/STFiller.cpp

@@ -82 +82 @@
   close();
 }
-  
+
 void STFiller::open( const std::string& filename, const std::string& antenna, int whichIF, int whichBeam, casa::Bool getPt )
 {
@@ -230 +230 @@
   //For MS, add the location of POINTING of the input MS so one get
   //pointing data from there, if necessary.
-  //Also find nrow in MS 
+  //Also find nrow in MS
   nInDataRow = 0;
   if (format == "MS2") {
-    Path datapath(inName); 
+    Path datapath(inName);
     String ptTabPath = datapath.absoluteName();
     Table inMS(ptTabPath);
@@ -246 +246 @@
   }
   String freqFrame = header_->freqref;
-  //translate frequency reference frame back to 
-  //MS style (as PKSMS2reader converts the original frame 
+  //translate frequency reference frame back to
+  //MS style (as PKSMS2reader converts the original frame
   //in FITS standard style)
   if (freqFrame == "TOPOCENT") {
@@ -282 +282 @@
   int status = 0;
 
-  // 
+  //
   // for NRO data
   //
@@ -326 +326 @@
     }
     fclose( fp ) ;
-  } 
+  }
   while ( status == 0 ) {
     status = reader_->read(pksrec);
@@ -389 +389 @@
     RecordFieldPtr<uInt> ifCol(rec, "IFNO");
     *ifCol = pksrec.IFno-ifOffset_- 1;
-    uInt id;
-    /// @todo this has to change when nchan isn't global anymore
-    //id = table_->frequencies().addEntry(Double(header_->nchan/2),
-    //                                    pksrec.refFreq, pksrec.freqInc);
-    if ( pksrec.nchan == 1 ) {
-      id = table_->frequencies().addEntry(Double(0),
-                                          pksrec.refFreq, pksrec.freqInc);
-    }
-    else {
-      id = table_->frequencies().addEntry(Double(pksrec.nchan/2),
-                                          pksrec.refFreq, pksrec.freqInc);
-    }
+    uInt id = table_->frequencies().addEntry(Double(pksrec.spectra.nrow()/2),
+                                             pksrec.refFreq, pksrec.freqInc);
     RecordFieldPtr<uInt> mfreqidCol(rec, "FREQ_ID");
     *mfreqidCol = id;
@@ -419 +409 @@
 
     RecordFieldPtr<uInt> mfocusidCol(rec, "FOCUS_ID");
-    id = table_->focus().addEntry(pksrec.parAngle, pksrec.focusAxi, 
+    id = table_->focus().addEntry(pksrec.parAngle, pksrec.focusAxi,
                                   pksrec.focusTan, pksrec.focusRot);
     *mfocusidCol = id;
@@ -503 +493 @@
   tm *ttm = localtime( &t0 ) ;
   LogIO os( LogOrigin( "STFiller", "openNRO()", WHERE ) ) ;
-//   cout << "STFiller::openNRO()  Start time = " << t0 
-//        << " (" 
-//        << ttm->tm_year + 1900 << "/" << ttm->tm_mon + 1 << "/" << ttm->tm_mday 
-//        << " " 
-//        << ttm->tm_hour << ":" << ttm->tm_min << ":" << ttm->tm_sec 
+//   cout << "STFiller::openNRO()  Start time = " << t0
+//        << " ("
+//        << ttm->tm_year + 1900 << "/" << ttm->tm_mon + 1 << "/" << ttm->tm_mday
+//        << " "
+//        << ttm->tm_hour << ":" << ttm->tm_min << ":" << ttm->tm_sec
 //        << ")" << endl ;
-  os << "Start time = " << t0 
-     << " (" 
-     << ttm->tm_year + 1900 << "/" << ttm->tm_mon + 1 << "/" << ttm->tm_mday 
-     << " " 
-     << ttm->tm_hour << ":" << ttm->tm_min << ":" << ttm->tm_sec 
+  os << "Start time = " << t0
+     << " ("
+     << ttm->tm_year + 1900 << "/" << ttm->tm_mon + 1 << "/" << ttm->tm_mday
+     << " "
+     << ttm->tm_hour << ":" << ttm->tm_min << ":" << ttm->tm_sec
      << ")" << LogIO::POST ;
 
@@ -551 +541 @@
   if ( whichIF >= 0 ) {
     if ( whichIF >= 0 && whichIF < nIF_ ) {
-      for ( int i = 0 ; i < nIF_ ; i++ ) 
+      for ( int i = 0 ; i < nIF_ ; i++ )
         ifs[i] = False ;
       ifs[whichIF] = True ;
@@ -570 +560 @@
   if (whichBeam>=0) {
     if (whichBeam>=0 && whichBeam<nBeam_) {
-      for ( int i = 0 ; i < nBeam_ ; i++ ) 
+      for ( int i = 0 ; i < nBeam_ ; i++ )
         beams[i] = False ;
       beams[whichBeam] = True;
@@ -595 +585 @@
   time( &t1 ) ;
   ttm = localtime( &t1 ) ;
-//   cout << "STFiller::openNRO()  End time = " << t1 
-//        << " (" 
-//        << ttm->tm_year + 1900 << "/" << ttm->tm_mon + 1 << "/" << ttm->tm_mday 
-//        << " " 
-//        << ttm->tm_hour << ":" << ttm->tm_min << ":" << ttm->tm_sec 
+//   cout << "STFiller::openNRO()  End time = " << t1
+//        << " ("
+//        << ttm->tm_year + 1900 << "/" << ttm->tm_mon + 1 << "/" << ttm->tm_mday
+//        << " "
+//        << ttm->tm_hour << ":" << ttm->tm_min << ":" << ttm->tm_sec
 //        << ")" << endl ;
 //   cout << "STFiller::openNRO()  Elapsed time = " << t1 - t0 << " sec" << endl ;
-  os << "End time = " << t1 
-     << " (" 
-     << ttm->tm_year + 1900 << "/" << ttm->tm_mon + 1 << "/" << ttm->tm_mday 
-     << " " 
-     << ttm->tm_hour << ":" << ttm->tm_min << ":" << ttm->tm_sec 
+  os << "End time = " << t1
+     << " ("
+     << ttm->tm_year + 1900 << "/" << ttm->tm_mon + 1 << "/" << ttm->tm_mday
+     << " "
+     << ttm->tm_hour << ":" << ttm->tm_min << ":" << ttm->tm_sec
      << ")" << endl ;
   os << "Elapsed time = " << t1 - t0 << " sec" << endl ;
@@ -622 +612 @@
   tm *ttm = localtime( &t0 ) ;
   LogIO os( LogOrigin( "STFiller", "readNRO()", WHERE ) ) ;
-//   cout << "STFiller::readNRO()  Start time = " << t0 
-//        << " (" 
-//        << ttm->tm_year + 1900 << "/" << ttm->tm_mon + 1 << "/" << ttm->tm_mday 
-//        << " " 
-//        << ttm->tm_hour << ":" << ttm->tm_min << ":" << ttm->tm_sec 
+//   cout << "STFiller::readNRO()  Start time = " << t0
+//        << " ("
+//        << ttm->tm_year + 1900 << "/" << ttm->tm_mon + 1 << "/" << ttm->tm_mday
+//        << " "
+//        << ttm->tm_hour << ":" << ttm->tm_min << ":" << ttm->tm_sec
 //        << ")" << endl ;
-  os << "Start time = " << t0 
-     << " (" 
-     << ttm->tm_year + 1900 << "/" << ttm->tm_mon + 1 << "/" << ttm->tm_mday 
-     << " " 
-     << ttm->tm_hour << ":" << ttm->tm_min << ":" << ttm->tm_sec 
+  os << "Start time = " << t0
+     << " ("
+     << ttm->tm_year + 1900 << "/" << ttm->tm_mon + 1 << "/" << ttm->tm_mday
+     << " "
+     << ttm->tm_hour << ":" << ttm->tm_min << ":" << ttm->tm_sec
      << ")" << LogIO::POST ;
   //
@@ -692 +682 @@
       srcType = 3 ;
     }
- 
+
     // if srcType is 2 (ZERO scan), ignore scan
-    if ( srcType != 2 && srcType != -1 && srcType != 3 ) { 
+    if ( srcType != 2 && srcType != -1 && srcType != 3 ) {
       TableRow row( table_->table() ) ;
       TableRecord& rec = row.record();
@@ -789 +779 @@
       *srcnCol = srcname ;
       RecordFieldPtr<Int> srctCol(rec, "SRCTYPE") ;
-      *srctCol = srcType ;     
-      RecordFieldPtr<String> fieldnCol(rec, "FIELDNAME"); 
+      *srctCol = srcType ;
+      RecordFieldPtr<String> fieldnCol(rec, "FIELDNAME");
       *fieldnCol = fieldname ;
       RecordFieldPtr< Array<Float> > specCol(rec, "SPECTRA") ;
@@ -820 +810 @@
                                        windvel,
                                        winddir ) ;
-      *mweatheridCol = id ;          
+      *mweatheridCol = id ;
       RecordFieldPtr<Double> svelCol(rec, "SRCVELOCITY") ;
       *svelCol = srcvel ;
@@ -847 +837 @@
   ttm = localtime( &t1 ) ;
 //   cout << "STFiller::readNRO()  Processed " << i << " rows" << endl ;
-//   cout << "STFiller::readNRO()  Added " << i - count << " rows (ignored " 
+//   cout << "STFiller::readNRO()  Added " << i - count << " rows (ignored "
 //        << count << " \"ZERO\" scans)" << endl ;
-//   cout << "STFiller::readNRO()  End time = " << t1 
-//        << " (" 
-//        << ttm->tm_year + 1900 << "/" << ttm->tm_mon + 1 << "/" << ttm->tm_mday 
-//        << " " 
-//        << ttm->tm_hour << ":" << ttm->tm_min << ":" << ttm->tm_sec 
+//   cout << "STFiller::readNRO()  End time = " << t1
+//        << " ("
+//        << ttm->tm_year + 1900 << "/" << ttm->tm_mon + 1 << "/" << ttm->tm_mday
+//        << " "
+//        << ttm->tm_hour << ":" << ttm->tm_min << ":" << ttm->tm_sec
 //        << ")" << endl ;
 //   cout << "STFiller::readNRO()  Elapsed time = " << t1 - t0 << " sec" << endl ;
   os << "Processed " << i << " rows" << endl ;
-  os << "Added " << i - count << " rows (ignored " 
+  os << "Added " << i - count << " rows (ignored "
      << count << " \"ZERO\" scans)" << endl ;
   os.post() ;
-  os << "End time = " << t1 
-     << " (" 
-     << ttm->tm_year + 1900 << "/" << ttm->tm_mon + 1 << "/" << ttm->tm_mday 
-     << " " 
-     << ttm->tm_hour << ":" << ttm->tm_min << ":" << ttm->tm_sec 
+  os << "End time = " << t1
+     << " ("
+     << ttm->tm_year + 1900 << "/" << ttm->tm_mon + 1 << "/" << ttm->tm_mday
+     << " "
+     << ttm->tm_hour << ":" << ttm->tm_min << ":" << ttm->tm_sec
      << ")" << endl ;
   os << "Elapsed time = " << t1 - t0 << " sec" << endl ;
@@ -871 +861 @@
 
   return 0 ;
-} 
+}
 
 Bool STFiller::fileCheck()
@@ -881 +871 @@
   if ( inFile.isDirectory() )
     return bval ;
-  
+
   // if beginning of header data is "RW", return true
-  // otherwise, return false ; 
+  // otherwise, return false ;
   FILE *fp = fopen( filename_.c_str(), "r" ) ;
   char buf[9] ;