Changeset 1816 for branches

Timestamp:

08/02/10 14:37:57 (14 years ago)

Author:

Malte Marquarding

Message:

added setScanrate. some more logging. added setFlagrow

File:

• branches/newfiller/src/PKSFiller.cpp (modified) (9 diffs)

branches/newfiller/src/PKSFiller.cpp

@@ -20 +20 @@
 #include <casa/Arrays/ArrayLogical.h>
 #include <casa/Utilities/Regex.h>
-
+#include <casa/Logging/LogIO.h>
 
 #include <measures/Measures/MDirection.h>
@@ -60 +60 @@
 bool PKSFiller::open( const std::string& filename)
 {
-  /*
-  if (table_.null())  {
-    table_ = new Scantable();
-  }
-  */
-
   Bool haveBase, haveSpectra;
 
@@ -92 +86 @@
     throw(AipsError("No spectral data in file."));
   }
-  LogIO os;
+
+  LogIO os( LogOrigin( "PKSFiller", "open()", WHERE ) ) ;
   nBeam_ = beams.nelements();
   nIF_ = ifs.nelements();
@@ -120 +115 @@
     throw(AipsError("Failed to get header."));
   }
+  os << "Found " << header.antennaname << " data." << LogIO::POST;
   if ((header.obstype).matches("*SW*")) {
     // need robust way here - probably read ahead of next timestamp
@@ -129 +125 @@
   }
   // Determine Telescope and set brightness unit
-
   Bool throwIt = False;
   Instrument inst = STAttr::convertInstrument(header.antennaname, throwIt);
@@ -209 +204 @@
 {
   int status = 0;
+  LogIO os( LogOrigin( "PKSFiller", "fill()", WHERE ) ) ;
 
 /**
@@ -262 +258 @@
     Vector<Double> sratedbl(pksrec.scanRate.nelements());
     convertArray(sratedbl, pksrec.scanRate);
-    //setScanRate(sratedbl);
+    setScanRate(sratedbl);
 
     Regex rx(getReferenceRegex());
@@ -297 +293 @@
                  pksrec.refFreq, pksrec.freqInc);
 
+    // Note: this is only one value for all polarisations!
+    setFlagrow(pksrec.flagrow);
     // Turn the (nchan,npol) matrix and possible complex xPol vector
     // into 2-4 rows in the scantable
@@ -315 +313 @@
       commitRow();
     }
-    /*
-    RecordFieldPtr< uInt > flagrowCol(rec, "FLAGROW");
-    *flagrowCol = pksrec.flagrow;
-    */
     if ( haveXPol_[0] ) {
       // no tsys given for xpol, so emulate it