Changeset 1603 for branches/alma/src/STHeader.cpp

Timestamp:

07/18/09 06:35:47 (15 years ago)

Author:

TakTsutsumi

Message:

New Development: No, merge with asap2.3.1

JIRA Issue: Yes CAS-1450

Ready to Release: Yes/No?

Interface Changes: Yes/No?

What Interface Changed: Please list interface changes

Test Programs: List test programs

Put in Release Notes: Yes

Module(s): single dish

Description: Upgrade of alma branch based on ASAP2.2.0

(rev.1562) to ASAP2.3.1 (rev.1561)

File:

• branches/alma/src/STHeader.cpp (modified) (1 diff)

branches/alma/src/STHeader.cpp

@@ -53 +53 @@
   conforms = (this->antennaname == other.antennaname
               && this->equinox == other.equinox
-              && this->obstype == other.obstype
               && this->fluxunit == other.fluxunit
               );
   return conforms;
+}
+
+String STHeader::diff( const STHeader& other )
+{
+  ostringstream thediff;
+  if ( this->equinox != other.equinox ) {
+    thediff  << "Equinox: "  << this->equinox << " <-> " 
+             << other.equinox << endl;
+  }
+  if ( this->obstype != other.obstype ) {
+    thediff << "Obs. Type: " << this->obstype << " <-> "
+            << other.obstype << endl;
+  }
+  if ( this->fluxunit != other.fluxunit ) {
+    thediff << "Flux unit: " << this->fluxunit << " <-> "
+            << other.fluxunit << endl;
+  }
+  return String(thediff);
 }