Changeset 1674 for branches

Timestamp:

01/13/10 17:20:31 (15 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CAS-1799

Ready to Release: Yes

Interface Changes: Yes

What Interface Changed: srcType is added to PKSrecord class

Test Programs: List test programs

Put in Release Notes: Yes/No

Module(s): casa/atnf

Description: Describe your changes here...

Calibration scheme is updated to use SRCTYPE as an identifier of scan intent
(ON, OFF, ...). Currently, updated calibration scheme is implemented only for
ALMA data. Calibration of other data is still use SRCNAME as the identifier.

casa/atnf must be updated.

Location:

branches/alma/src

Files:

• STFiller.cpp (modified) (2 diffs)
• STMath.cpp (modified) (3 diffs)

branches/alma/src/STFiller.cpp

@@ -311 +311 @@
 #endif
   PKSrecord pksrec;
+  pksrec.srcType=-1;
   int n = 0;
   bool isGBTFITS = false ;
@@ -376 +377 @@
     //*srcnCol = pksrec.srcName;//.before(rx2);
     *srctCol = match;
+    if ( pksrec.srcType != -1 ) {
+      *srctCol = pksrec.srcType ;
+    }
     RecordFieldPtr<uInt> beamCol(rec, "BEAMNO");
     *beamCol = pksrec.beamNo-beamOffset_-1;

branches/alma/src/STMath.cpp

@@ -3412 +3412 @@
   }
   else {
-    string onstr = "*_" ;
-    string offstr = "*_" ;
-    
-    if ( calmode == "ps" || calmode == "otf" ) {
-      onstr += "pson" ;
-      offstr += "psoff" ;
-    }
-    else if ( calmode == "wob" ) {
-      onstr += "wobon" ;
-      offstr += "woboff" ;
-    }
-    
     vector<bool> masks = s->getMask( 0 ) ;
     
     // off scan
     STSelector sel = STSelector() ;
-    sel.setName( offstr ) ;
+    string taql = "SELECT FROM $1 WHERE SRCTYPE == 0" ;
+    sel.setTaQL( taql ) ;
     s->setSelection( sel ) ;
     // TODO 2010/01/08 TN
@@ -3475 +3464 @@
     CountedPtr<Scantable> out = getScantable( s, true ) ;
     insitu_ = insitu ;
-    sel.setName( onstr ) ;
+    taql = "SELECT FROM $1 WHERE SRCTYPE == 1" ;
+    sel.setTaQL( taql ) ;
     s->setSelection( sel ) ;
     TableCopy::copyRows( out->table(), s->table() ) ;
@@ -3488 +3478 @@
       out->setSpectrum( sp, i ) ;
     }
-
-    // remove additional string from SRCNAME
-    ScalarColumn<String> srcnameCol ;
-    srcnameCol.attach( out->table(), "SRCNAME" ) ;
-    Vector<String> srcnames( srcnameCol.getColumn() ) ;
-    for ( uInt i = 0 ; i < srcnames.nelements() ; i++ ) {
-      srcnames[i] = srcnames[i].substr( 0, srcnames[i].find( onstr.substr(1,onstr.size()-1) ) ) ;
-    }
-    srcnameCol.putColumn( srcnames ) ;
 
     // flux unit