Changeset 1410 for trunk/src

Timestamp:

01/31/08 15:15:02 (17 years ago)

Author:

Malte Marquarding

Message:

Mark C added brightness unit to PKSreader/writer

Location:

trunk/src

Files:

• STFiller.cpp (modified) (3 diffs)
• STWriter.cpp (modified) (1 diff)

trunk/src/STFiller.cpp

@@ -5 +5 @@
 //
 //
-// Author: Malte Marquarding <asap@atnf.csiro.au>, (C) 2006
+// Author: Malte Marquarding <asap@atnf.csiro.au>, (C) 2006-2007
 //
 // Copyright: See COPYING file that comes with this distribution
@@ -113 +113 @@
   header_->npol = max(npols);
   header_->nbeam = nBeam_;
-
+  
   Int status = reader_->getHeader(header_->observer, header_->project,
                                   header_->antennaname, header_->antennaposition,
-                                  header_->obstype,header_->equinox,
+                                  header_->obstype,
+                                  header_->fluxunit,
+                                  header_->equinox,
                                   header_->freqref,
                                   header_->utc, header_->reffreq,
@@ -140 +142 @@
   Bool throwIt = False;
   Instrument inst = STAttr::convertInstrument(header_->antennaname, throwIt);
-  header_->fluxunit = "Jy";
+
   if (inst==ATMOPRA || inst==TIDBINBILLA) {
-     header_->fluxunit = "K";
+    header_->fluxunit = "K";
+  } else {
+    // downcase for use with Quanta
+    if (header_->fluxunit == "JY") {
+      header_->fluxunit = "Jy";
+    }
   }
   STAttr stattr;

trunk/src/STWriter.cpp

@@ -139 +139 @@
   Int status;
   status = writer_->create(String(filename), hdr.observer, hdr.project,
-                               hdr.antennaname, hdr.antennaposition,
-                               hdr.obstype, hdr.equinox, hdr.freqref,
-                               nChan, nPol, havexpol, False);
+                           hdr.antennaname, hdr.antennaposition,
+                           hdr.obstype, hdr.fluxunit,
+                           hdr.equinox, hdr.freqref,
+                           nChan, nPol, havexpol, False);
   if ( status ) {
     throw(AipsError("Failed to create output file"));