Changeset 1439 for trunk/src

Timestamp:

08/28/08 14:00:03 (16 years ago)

Author:

Malte Marquarding

Message:

added Header diff function. Don't use obstype for conformance test

Location:

trunk/src

Files:

• STHeader.cpp (modified) (1 diff)
• STHeader.h (modified) (2 diffs)
• STMath.cpp (modified) (1 diff)

trunk/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);
 }
 

trunk/src/STHeader.h

@@ -27 +27 @@
 //#                        AUSTRALIA
 //#
-//# $Id:$
+//# $Id$
 //#---------------------------------------------------------------------------
 #ifndef STHEADER_H
@@ -50 +50 @@
 
   bool conformant(const STHeader& other);
+  casa::String diff( const STHeader& other );
+
 
   casa::Int nchan;

trunk/src/STMath.cpp

@@ -1538 +1538 @@
   while ( it != in.end() ){
     if ( ! (*it)->conformant(*out) ) {
-      // log message: "ignoring scantable i, as it isn't
-      // conformant with the other(s)"
+      // non conformant.
       pushLog(String("Warning: Can't merge scantables as header info differs."));
-      ++it;
-      continue;
     }
     out->appendToHistoryTable((*it)->history());