Changeset 1453 for branches/alma/external/atnf/PKSIO/PKSMS2writer.cc

Timestamp:

11/27/08 12:47:15 (16 years ago)

Author:

TakTsutsumi

Message:

New Development: No

JIRA Issue: No

Ready to Release: Yes

Interface Changes: Yes

What Interface Changed: many

Test Programs: sd.scantable(), sd.scantable.save()

Put in Release Notes: N/A

Description: copied from current casapy code tree

File:

• branches/alma/external/atnf/PKSIO/PKSMS2writer.cc (modified) (8 diffs)

branches/alma/external/atnf/PKSIO/PKSMS2writer.cc

@@ -93 +93 @@
 
   Int maxNPol = max(cNPol);
+  cGBT = cAPEX = cSMT = cALMA = False;
 
   // check if it is GBT data
-  cGBT = antName.contains("GBT");
+  if (antName.contains("GBT")) {
+    cGBT = True;
+  }
+  else if (antName.contains("APEX")) {
+    cAPEX = True; 
+  }
+  else if (antName.contains("HHT") || antName.contains("SMT")) {
+    cSMT = True;
+  }
+  else if (antName.contains("ALMA")) {
+    cALMA = True;
+  }
+ 
+
+   
+  //cGBT = antName.contains("GBT");
+  //cAPEX = antName.contains("APEX");
+  //cSMT = antName.contains("HHT");
+  //cALMA = antName.contains("ALMA");
 
   // Add the non-standard CALFCTR column.
@@ -125 +144 @@
 
     MS::addColumnToDesc(pksDesc, MS::DATA, 2);
+    //pksDesc.rwColumnDesc(MS::columnName(MS::DATA)).rwKeywordSet().
+    //            define("UNIT", "Jy");
     pksDesc.rwColumnDesc(MS::columnName(MS::DATA)).rwKeywordSet().
-                define("UNIT", "Jy");
+                define("UNIT", fluxUnit);
     pksDesc.rwColumnDesc(MS::columnName(MS::DATA)).rwKeywordSet().
                 define("MEASURE_TYPE", "");
@@ -391 +412 @@
         const Double          bandwidth,
         const Double          freqInc,
-        const Double          restFreq,
+        //const Double          restFreq,
+        const Vector<Double>  restFreq,
         const Vector<Float>   tcal,
         const String          tcalTime,
@@ -533 +555 @@
   Vector<Float> weight(nPol, 1.0f);
   cMSCols->weight().put(irow, weight);
+  //imaging weight
+  //Vector<Float> imagingWeight(nChan); 
+  //cMSCols->imagingWeight().put(irow, imagingWeight);
 
   // Flag information.
@@ -612 +637 @@
   // do specific things for GBT
   // Data.
+  // plus some more telescopes
   cAntennaCols->name().put(n, antName);
   //cAntennaCols->station().put(n, "ATNF_PARKES");
   if (cGBT) {
     cAntennaCols->station().put(n, "GREENBANK");
+    cAntennaCols->dishDiameter().put(n, 110.0);
+  }
+  else if (cAPEX) {
+    cAntennaCols->station().put(n, "CHAJNANTOR");
+    cAntennaCols->dishDiameter().put(n, 12.0);
+  }
+  else if (cALMA) {
+    cAntennaCols->station().put(n, "CHAJNANTOR");
+    cAntennaCols->dishDiameter().put(n, 12.0);
+  }
+  else if (cSMT) {
+    cAntennaCols->station().put(n, "MT_GRAHAM");
+    cAntennaCols->dishDiameter().put(n, 10.0);
   }
   else {
     cAntennaCols->station().put(n, "ATNF_PARKES");
+    cAntennaCols->dishDiameter().put(n, 64.0);
   }
   cAntennaCols->type().put(n, "GROUND-BASED");
@@ -626 +666 @@
   cAntennaCols->offset().put(n, antOffset);
   //cAntennaCols->dishDiameter().put(n, 64.0);
-  if (cGBT) {
-    cAntennaCols->dishDiameter().put(n, 110.0);
-  }
-  else {
-    cAntennaCols->dishDiameter().put(n, 64.0);
-  }
+  //if (cGBT) {
+  //  cAntennaCols->dishDiameter().put(n, 110.0);
+  //}
+  //else {
+  //  cAntennaCols->dishDiameter().put(n, 64.0);
+  //}
   // Flags.
   cAntennaCols->flagRow().put(n, False);
@@ -950 +990 @@
         const Vector<Double> direction,
         const Vector<Double> properMotion,
-        const Double restFreq,
+        //const Double restFreq,
+        const Vector<Double> restFreq,
         const Double radialVelocity)
 {
@@ -984 +1025 @@
 //  cSourceCols->position().put(n, position);
     cSourceCols->properMotion().put(n, properMotion);
-    Vector<Double> restFrequency(1, restFreq);
-    cSourceCols->restFrequency().put(n, restFrequency);
+//  Vector<Double> restFrequency(1, restFreq);
+//  cSourceCols->restFrequency().put(n, restFrequency);
+    cSourceCols->restFrequency().put(n, restFreq);
     Vector<Double> sysvel(1, radialVelocity);
     cSourceCols->sysvel().put(n, sysvel);