Changeset 1603 for branches/alma/src/STMath.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/STMath.cpp (modified) (9 diffs)

branches/alma/src/STMath.cpp

@@ -297 +297 @@
                                              bool droprows)
 {
-  if (insitu_) return in;
+  if (insitu_) {
+    return in;
+  }
   else {
     // clone
-    Scantable* tabp = new Scantable(*in, Bool(droprows));
-    return CountedPtr<Scantable>(tabp);
+    return CountedPtr<Scantable>(new Scantable(*in, Bool(droprows)));
   }
 }
@@ -1513 +1514 @@
   ArrayColumn<Float> specCol(tab, "SPECTRA");
   ArrayColumn<uChar> flagCol(tab, "FLAGTRA");
+  ArrayColumn<Float> tsysCol(tab, "TSYS");
   for ( uInt i=0; i<tab.nrow(); ++i) {
     Float zdist = Float(C::pi_2) - elev(i);
@@ -1520 +1522 @@
     specCol.put(i, ma.getArray());
     flagCol.put(i, flagsFromMA(ma));
+    Vector<Float> tsys;
+    tsysCol.get(i, tsys);
+    tsys *= factor;
+    tsysCol.put(i, tsys);
   }
   return out;
@@ -1614 +1620 @@
   while ( it != in.end() ){
     if ( ! (*it)->conformant(*out) ) {
-      // log message: "ignoring scantable i, as it isn't
-      // conformant with the other(s)"
-      cerr << "oh oh" << endl;
-      ++it;
-      continue;
+      // non conformant.
+      pushLog(String("Warning: Can't merge scantables as header info differs."));
     }
     out->appendToHistoryTable((*it)->history());
@@ -1628 +1631 @@
         Table thetab = freqit.table();
         uInt nrow = tout.nrow();
-        //tout.addRow(thetab.nrow());
+        tout.addRow(thetab.nrow());
         TableCopy::copyRows(tout, thetab, nrow, 0, thetab.nrow());
         ROTableRow row(thetab);
@@ -1826 +1829 @@
 
   InterpolateArray1D<Double,Float>::InterpolationMethod interp = stringToIMethod(method);
+  /*
+  // Comment from MV.
+  // the following code has been commented out because different FREQ_IDs have to be aligned together even
+  // if the frame doesn't change. So far, lack of this check didn't cause any problems.
   // test if user frame is different to base frame
   if ( in->frequencies().getFrameString(true)
@@ -1832 +1839 @@
                     " (use set_freqframe) or it is aligned already."));
   }
+  */
   MFrequency::Types system = in->frequencies().getFrame();
   MVTime mvt(refEpoch.getValue());
@@ -1857 +1865 @@
 
     ROArrayColumn<Float> sCol(t, "SPECTRA");
-    MDirection direction = dirCol(0);
-    uInt nchan = sCol(0).nelements();
+    const MDirection direction = dirCol(0);
+    const uInt nchan = sCol(0).nelements();
+
+    // skip operations if there is nothing to align
+    if (fiter.pastEnd()) {
+        continue;
+    }
+
+    Table ftab = fiter.table();
+    // align all frequency ids with respect to the first encountered id
+    ScalarColumn<uInt> freqidCol(ftab, "FREQ_ID");
+    // get the SpectralCoordinate for the freqid, which we are iterating over
+    SpectralCoordinate sC = in->frequencies().getSpectralCoordinate(freqidCol(0));
+    FrequencyAligner<Float> fa( sC, nchan, refEpoch,
+                                direction, refPos, system );
+    // realign the SpectralCoordinate and put into the output Scantable
+    Vector<String> units(1);
+    units = String("Hz");
+    Bool linear=True;
+    SpectralCoordinate sc2 = fa.alignedSpectralCoordinate(linear);
+    sc2.setWorldAxisUnits(units);
+    const uInt id = out->frequencies().addEntry(sc2.referencePixel()[0],
+                                                sc2.referenceValue()[0],
+                                                sc2.increment()[0]);
     while ( !fiter.pastEnd() ) {
-      Table ftab = fiter.table();
-      ScalarColumn<uInt> freqidCol(ftab, "FREQ_ID");
-      // get the SpectralCoordinate for the freqid, which we are iterating over
-      SpectralCoordinate sC = in->frequencies().getSpectralCoordinate(freqidCol(0));
-      FrequencyAligner<Float> fa( sC, nchan, refEpoch,
-                                  direction, refPos, system );
-      // realign the SpectralCoordinate and put into the output Scantable
-      Vector<String> units(1);
-      units = String("Hz");
-      Bool linear=True;
-      SpectralCoordinate sc2 = fa.alignedSpectralCoordinate(linear);
-      sc2.setWorldAxisUnits(units);
-      uInt id = out->frequencies().addEntry(sc2.referencePixel()[0],
-                                            sc2.referenceValue()[0],
-                                            sc2.increment()[0]);
-      TableVector<uInt> tvec(ftab, "FREQ_ID");
-      tvec = id;
+      ftab = fiter.table();
+      // spectral coordinate for the current FREQ_ID
+      ScalarColumn<uInt> freqidCol2(ftab, "FREQ_ID");
+      sC = in->frequencies().getSpectralCoordinate(freqidCol2(0));
       // create the "global" abcissa for alignment with same FREQ_ID
       Vector<Double> abc(nchan);
-      Double w;
       for (uInt i=0; i<nchan; i++) {
-        sC.toWorld(w,Double(i));
-        abc[i] = w;
-      }
+           Double w;
+           sC.toWorld(w,Double(i));
+           abc[i] = w;
+      }
+      TableVector<uInt> tvec(ftab, "FREQ_ID");
+      // assign new frequency id to all rows
+      tvec = id;
       // cache abcissa for same time stamps, so iterate over those
       TableIterator timeiter(ftab, "TIME");
@@ -1892 +1912 @@
         MEpoch::ROScalarColumn timeCol(tab, "TIME");
         // use align abcissa cache after the first row
+        // these rows should be just be POLNO
         bool first = true;
-        // these rows should be just be POLNO
         for (int i=0; i<int(tab.nrow()); ++i) {
           // input values