Changeset 2216 for trunk/external-alma

Timestamp:

07/12/11 16:06:18 (13 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CAS-1913

Ready for Test: Yes/No?

Interface Changes: Yes/No?

What Interface Changed: Please list interface changes

Test Programs: List test programs

Put in Release Notes: Yes/No?

Module(s): Module Names change impacts.

Description: Describe your changes here...

Accept multi spectral resolution type (e.g. fr,ca).
Separator changed from '+' to ',' for -srt and -corr-mode options.

Location:

trunk/external-alma/asdm2ASAP

Files:

• ASDMReader.cc (modified) (2 diffs)
• asdm2ASAP.cc (modified) (2 diffs)

trunk/external-alma/asdm2ASAP/ASDMReader.cc

@@ -106 +106 @@
 
     // spectral resolution type
-    String resolutionType = "all" ;
+    string resolutionType = "all" ;
     if ( asdmrec.isDefined( "srt" ) ) {
-      resolutionType = asdmrec.asString( "srt" ) ;
-    }
-    if ( resolutionType == "all" ) {
-      resolutionType_.set( FULL_RESOLUTION ) ;
-      resolutionType_.set( BASEBAND_WIDE ) ;
-      resolutionType_.set( CHANNEL_AVERAGE ) ;
-    }
-    else if ( resolutionType == "fr" ) {
-      resolutionType_.set( FULL_RESOLUTION ) ;
-    }
-    else if ( resolutionType == "bw" ) {
-      resolutionType_.set( BASEBAND_WIDE ) ;
-    }
-    else if ( resolutionType == "ca" ) {
-      resolutionType_.set( CHANNEL_AVERAGE ) ;
-    }
-    else {
+      resolutionType = string( asdmrec.asString( "srt" ) ) ;
+    }
+    string resolutionTypes[3] ;
+    Int numType = split( resolutionType, resolutionTypes, 3, "," ) ;
+    for ( Int it = 0 ; it < numType ; it++ ) {
+      if ( resolutionTypes[it] == "all" ) {
+        resolutionType_.reset() ;
+        resolutionType_.set( FULL_RESOLUTION ) ;
+        resolutionType_.set( BASEBAND_WIDE ) ;
+        resolutionType_.set( CHANNEL_AVERAGE ) ;
+        break ;
+      }
+      else if ( resolutionTypes[it] == "fr" ) {
+        resolutionType_.set( FULL_RESOLUTION ) ;
+      }
+      else if ( resolutionTypes[it] == "bw" ) {
+        resolutionType_.set( BASEBAND_WIDE ) ;
+      }
+      else if ( resolutionTypes[it] == "ca" ) {
+        resolutionType_.set( CHANNEL_AVERAGE ) ;
+      }
+    }
+    if ( resolutionType_.size() == 0 ) {
       logsink_->postLocally( LogMessage( "Unrecognized option for spectral resolution type: "+String::toString(resolutionType), LogOrigin(className_,funcName,WHERE), LogMessage::WARN ) ) ;
       status = false ;
@@ -130 +136 @@
     
     // input correlation mode
+    string corrMode = "ao+ca" ;
     if ( asdmrec.isDefined( "corr" ) ) {
-      string corrMode = string( asdmrec.asString( "corr" ) ) ;
+      corrMode = string( asdmrec.asString( "corr" ) ) ;
       //logsink_->postLocally( LogMessage("corrMode = "+String(corrMode),LogOrigin(className_,funcName,WHERE)) ) ;
-      string corrModes[3] ;
-      Int numCorr = split( corrMode, corrModes, 3, "+" ) ;
-      for ( Int ic = 0 ; ic < numCorr ; ic++ ) {
-        if ( corrModes[ic] == "ao" ) {
-          corrMode_.set( AUTO_ONLY ) ;
-        }
-        else if ( corrModes[ic] == "ca" ) {
-          corrMode_.set( CROSS_AND_AUTO ) ;
-        }
-      }
-      //delete corrModes ;
-      if ( corrMode_.size() == 0 ) {
-        logsink_->postLocally( LogMessage( "Invalid option for correlation mode: "+String::toString(corrMode), LogOrigin(className_,funcName,WHERE), LogMessage::WARN ) ) ;
-        status = false ;
-      }
+    }
+    string corrModes[3] ;
+    Int numCorr = split( corrMode, corrModes, 3, "," ) ;
+    for ( Int ic = 0 ; ic < numCorr ; ic++ ) {
+      if ( corrModes[ic] == "ao" ) {
+        corrMode_.set( AUTO_ONLY ) ;
+      }
+      else if ( corrModes[ic] == "ca" ) {
+        corrMode_.set( CROSS_AND_AUTO ) ;
+      }
+    }
+    if ( corrMode_.size() == 0 ) {
+      logsink_->postLocally( LogMessage( "Invalid option for correlation mode: "+String::toString(corrMode), LogOrigin(className_,funcName,WHERE), LogMessage::WARN ) ) ;
+      status = false ;
     }
 

trunk/external-alma/asdm2ASAP/asdm2ASAP.cc

@@ -23 +23 @@
   Input inp ;
   String indent = "   " ;
-  String versionInfo = "$Id$\nConverts an ASDM dataset into Scantable.\nUsage:\n"+indent+argv[0]+" -antenna <antenna name or id> -asdm <ASDM directory> -asap <Scantable name> [-apc both|yes|no] [-corr-mode ca|ao|ca+ao] [-ocorr-mode ao] [-time-sampling all|integration|subintegration] [-srt fr|bw|ca|all]" ;
+  String versionInfo = "$Id$\nConverts an ASDM dataset into Scantable.\nUsage:\n"+indent+argv[0]+" -antenna <antenna name or id> -asdm <ASDM directory> -asap <Scantable name> [-apc both|yes|no] [-corr-mode ca|ao|ca,ao] [-ocorr-mode ao] [-time-sampling all|integration|subintegration] [-srt fr|bw|ca|fr,bw|fr,ca|ca,bw|all]" ;
   Bool helpMode = False ;
   for ( int i = 1 ; i < argc ; i++ ) {
@@ -47 +47 @@
   inp.create( "ocorr-mode", "ao", "Output correlator mode: ao", "String" ) ;
   inp.create( "time-sampling", "all", "time sampling mode: all|integration|subintegration", "String" ) ;
-  inp.create( "srt", "all", "spectral resolution mode: all|fr(full resolution)|ca(channel average)|bw(baseband wide)", "String" ) ;
+  inp.create( "srt", "all", "spectral resolution mode: all|fr(full resolution)|ca(channel average)|bw(baseband wide)|fr+ca|fr+bw|ca+bw", "String" ) ;
   inp.create( "logfile", "", "logger output", "String" ) ;
   inp.readArguments( argc, argv ) ;