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

Timestamp:

06/09/10 19:03:06 (14 years ago)

Author:

Kana Sugimoto

Message:

New Development: Yes

JIRA Issue: Yes (CAS-2211)

Ready for Test: Yes

Interface Changes: Yes

What Interface Changed: ASAP 3.0.0 interface changes

Test Programs:

Put in Release Notes: Yes

Module(s): all the CASA sd tools and tasks are affected.

Description: Merged ATNF-ASAP 3.0.0 developments to CASA (alma) branch.

Note you also need to update casa/code/atnf.

Location:

branches/alma

Files:

• . (modified) (2 props)
• src/STFiller.cpp (modified) (6 diffs)

branches/alma/src/STFiller.cpp

@@ -264 +264 @@
     freqFrame = "REST";
   }
-  table_->frequencies().setFrame(freqFrame);
-     
+  // set both "FRAME" and "BASEFRAME"
+  table_->frequencies().setFrame(freqFrame, false);
+  table_->frequencies().setFrame(freqFrame,true);
+  //table_->focus().setParallactify(true);
 }
 
@@ -329 +331 @@
     if ( status != 0 ) break;
     n += 1;
-
     Regex filterrx(".*[SL|PA]$");
     Regex obsrx("^AT.+");
@@ -391 +392 @@
     /// @todo this has to change when nchan isn't global anymore
     //id = table_->frequencies().addEntry(Double(header_->nchan/2),
-    //                                        pksrec.refFreq, pksrec.freqInc);
+    //                                    pksrec.refFreq, pksrec.freqInc);
     if ( pksrec.nchan == 1 ) {
       id = table_->frequencies().addEntry(Double(0),
@@ -416 +417 @@
     RecordFieldPtr<uInt> mweatheridCol(rec, "WEATHER_ID");
     *mweatheridCol = id;
+
     RecordFieldPtr<uInt> mfocusidCol(rec, "FOCUS_ID");
-    id = table_->focus().addEntry(pksrec.focusAxi, pksrec.focusTan,
-                                  pksrec.focusRot);
+    id = table_->focus().addEntry(pksrec.parAngle, pksrec.focusAxi, 
+                                  pksrec.focusTan, pksrec.focusRot);
     *mfocusidCol = id;
     RecordFieldPtr<Array<Double> > dirCol(rec, "DIRECTION");
@@ -426 +428 @@
     RecordFieldPtr<Float> elCol(rec, "ELEVATION");
     *elCol = pksrec.elevation;
-
-    RecordFieldPtr<Float> parCol(rec, "PARANGLE");
-    *parCol = pksrec.parAngle;
 
     RecordFieldPtr< Array<Float> > specCol(rec, "SPECTRA");
@@ -542 +541 @@
   }
 
-  // set frame keyword of FREQUENCIES table
+  // set FRAME and BASEFRAME keyword of FREQUENCIES table
   if ( header_->freqref != "TOPO" ) {
     table_->frequencies().setFrame( header_->freqref, false ) ;
+    table_->frequencies().setFrame( header_->freqref, true ) ;
   }