Changeset 901

Timestamp:

03/10/06 13:29:22 (18 years ago)

Author:

mar637

Message:

SDContainer -> STHeader

Location:

trunk/src

Files:

• Makefile (modified) (2 diffs)
• SDFITSImageWriter.cc (modified) (2 diffs)
• STFiller.cpp (modified) (2 diffs)
• STFiller.h (modified) (2 diffs)
• STHeader.cpp (modified) (4 diffs)
• STHeader.h (modified) (3 diffs)
• STWriter.cpp (modified) (2 diffs)
• Scantable.cpp (modified) (2 diffs)
• Scantable.h (modified) (2 diffs)
• ScantableWrapper.h (modified) (1 diff)

trunk/src/Makefile

@@ -83 +83 @@
              Logger.o \
              STAttr.o \
-             SDContainer.o \
+             STHeader.o \
              STFiller.o \
              STMath.o \
@@ -114 +114 @@
              Logger.h \
              STAttr.h \
-             SDContainer.h \
+             STHeader.h \
              Scantable.h \
              STFiller.h \

trunk/src/SDFITSImageWriter.cc

@@ -59 +59 @@
 
 #include "STDefs.h"
-#include "SDContainer.h"
+#include "STHeader.h"
 #include "SDMemTable.h"
 #include "SDPol.h"
@@ -81 +81 @@
 // Get global Header from Table
 
-   SDHeader header = sdTable.getSDHeader();
+   STHeader header = sdTable.getSTHeader();
    MEpoch::Ref timeRef(sdTable.getTimeReference());
    MDirection::Types dirRef = sdTable.getDirectionReference();

trunk/src/STFiller.cpp

@@ -30 +30 @@
 
 #include "STFiller.h"
+#include "STHeader.h"
 
 using namespace casa;
@@ -103 +104 @@
 
   if (header_) delete header_;
-  header_ = new SDHeader();
+  header_ = new STHeader();
   header_->nchan = nChan_;
   header_->npol = nPol_;

trunk/src/STFiller.h

@@ -23 +23 @@
 
 #include "Scantable.h"
-#include "SDContainer.h"
+#include "STHeader.h"
 #include "Logger.h"
 
@@ -96 +96 @@
 
   PKSreader* reader_;
-  SDHeader* header_;
+  STHeader* header_;
   casa::String filename_;
   casa::CountedPtr< Scantable > table_;

trunk/src/STHeader.cpp

@@ -1 +1 @@
 //#---------------------------------------------------------------------------
-//# SDContainer.cc: A container class for single dish integrations
+//# STHeader.cpp: A container class for single dish integrations
 //#---------------------------------------------------------------------------
 //# Copyright (C) 2004
@@ -41 +41 @@
 
 #include "STDefs.h"
-#include "SDContainer.h"
+#include "STHeader.h"
 
 using namespace casa;
@@ -48 +48 @@
 
 
-bool SDHeader::conformant( const SDHeader& other )
+bool STHeader::conformant( const STHeader& other )
 {
   bool conforms;
@@ -59 +59 @@
 }
 
-void SDHeader::print() const {
+void STHeader::print() const {
   MVTime mvt(this->utc);
   mvt.setFormat(MVTime::YMD);

trunk/src/STHeader.h

@@ -1 +1 @@
 //#---------------------------------------------------------------------------
-//# SDContainer.h: A container class for single dish integrations
+//# STHeader.h: A container class for single dish integrations
 //#---------------------------------------------------------------------------
 //# Copyright (C) 2004
@@ -29 +29 @@
 //# $Id:
 //#---------------------------------------------------------------------------
-#ifndef SDCONTAINER_H
-#define SDCONTAINER_H
+#ifndef STHEADER_H
+#define STHEADER_H
 
 #include <vector>
@@ -45 +45 @@
 
 
-struct SDHeader {
+struct STHeader {
 
-  bool conformant(const SDHeader& other);
+  bool conformant(const STHeader& other);
 
   casa::Int nchan;

trunk/src/STWriter.cpp

@@ -49 +49 @@
 //#include "SDFITSImageWriter.h"
 //#include "STAsciiWriter.h"
-//#include "SDPol.h"
-#include "SDContainer.h"
+#include "STHeader.h"
 
 #include "STWriter.h"
@@ -131 +130 @@
 
   // Extract the header from the table.
-  SDHeader hdr = in->getHeader();
+  STHeader hdr = in->getHeader();
   const Int nPol  = hdr.npol;
   const Int nChan = hdr.nchan;

trunk/src/Scantable.cpp

@@ -278 +278 @@
 }
 
-void Scantable::setHeader(const SDHeader& sdh)
+void Scantable::setHeader(const STHeader& sdh)
 {
   table_.rwKeywordSet().define("nIF", sdh.nif);
@@ -298 +298 @@
 }
 
-SDHeader Scantable::getHeader() const
-{
-  SDHeader sdh;
+STHeader Scantable::getHeader() const
+{
+  STHeader sdh;
   table_.keywordSet().get("nBeam",sdh.nbeam);
   table_.keywordSet().get("nIF",sdh.nif);

trunk/src/Scantable.h

@@ -31 +31 @@
 
 #include "Logger.h"
-#include "SDContainer.h"
+#include "STHeader.h"
 #include "STFrequencies.h"
 #include "STWeather.h"
@@ -115 +115 @@
   /**
    * set the header
-   * @param[in] sdh an SDHeader object
-   */
-  void setHeader( const SDHeader& sdh );
+   * @param[in] sdh an STHeader object
+   */
+  void setHeader( const STHeader& sth );
 
   /**
    * get the header information
-   * @return an SDHeader object
-   */
-  SDHeader getHeader( ) const;
+   * @return an STHeader object
+   */
+  STHeader getHeader( ) const;
   /**
    * Checks if the "other" Scantable is conformant with this,

trunk/src/ScantableWrapper.h

@@ -18 +18 @@
 
 #include "MathUtils.h"
-#include "SDFitTable.h"
+#include "STFit.h"
 #include "Scantable.h"