Changeset 1446 for branches/alma/src/STFiller.cpp

Timestamp:

11/12/08 17:04:01 (16 years ago)

Author:

TakTsutsumi

Message:

Merged recent updates (since 2007) from nrao-asap

File:

• branches/alma/src/STFiller.cpp (modified) (2 diffs)

branches/alma/src/STFiller.cpp

@@ -205 +205 @@
     }
   }
+  String freqFrame = header_->freqref;
+  //translate frequency reference frame back to 
+  //MS style (as PKSMS2reader converts the original frame 
+  //in FITS standard style)
+  if (freqFrame == "TOPOCENT") {
+    freqFrame = "TOPO";
+  } else if (freqFrame == "GEOCENER") {
+    freqFrame = "GEO";
+  } else if (freqFrame == "BARYCENT") {
+    freqFrame = "BARY";
+  } else if (freqFrame == "GALACTOC") {
+    freqFrame = "GALACTO";
+  } else if (freqFrame == "LOCALGRP") {
+    freqFrame = "LGROUP";
+  } else if (freqFrame == "CMBDIPOL") {
+    freqFrame = "CMB";
+  } else if (freqFrame == "SOURCE") {
+    freqFrame = "REST";
+  }
+  table_->frequencies().setFrame(freqFrame);
      
 }
@@ -222 +242 @@
   Float  azimuth, elevation, focusAxi, focusRot, focusTan,
     humidity, parAngle, pressure, temperature, windAz, windSpeed;
-  Double bandwidth, freqInc, interval, mjd, refFreq, restFreq, srcVel;
+  Double bandwidth, freqInc, interval, mjd, refFreq, srcVel;
   String          fieldName, srcName, tcalTime, obsType;
   Vector<Float>   calFctr, sigma, tcal, tsys;
   Matrix<Float>   baseLin, baseSub;
-  Vector<Double>  direction(2), scanRate(2), srcDir(2), srcPM(2);
+  Vector<Double>  direction(2), scanRate(2), srcDir(2), srcPM(2), restFreq;
   Matrix<Float>   spectra;
   Matrix<uChar>   flagtra;