Changeset 2215 for trunk/external-alma

Timestamp:

07/12/11 15:22:48 (13 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CAS-1913

Ready for Test: Yes

Interface Changes: 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...

Added selection by spectral resolution type.

Location:

trunk/external-alma/asdm2ASAP

Files:

• ASDMReader.cc (modified) (3 diffs)
• ASDMReader.h (modified) (1 diff)
• asdm2ASAP.cc (modified) (4 diffs)

trunk/external-alma/asdm2ASAP/ASDMReader.cc

@@ -56 +56 @@
   timeSampling_.reset() ;
   corrMode_.reset() ;
+  resolutionType_.reset() ;
   apc_ = AP_CORRECTED ;
 
@@ -104 +105 @@
     }      
 
+    // spectral resolution type
+    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 {
+      logsink_->postLocally( LogMessage( "Unrecognized option for spectral resolution type: "+String::toString(resolutionType), LogOrigin(className_,funcName,WHERE), LogMessage::WARN ) ) ;
+      status = false ;
+    }
+    
     // input correlation mode
     if ( asdmrec.isDefined( "corr" ) ) {
@@ -456 +481 @@
   // selection by input CorrelationMode
   EnumSet<CorrelationMode> esCorrs ;
-//   esCorrs.set( CROSS_AND_AUTO ) ;
-//   esCorrs.set( AUTO_ONLY ) ;
-//   esCorrs.set( corrMode_ ) ;
-//   sdmBin_->select( esCorrs ) ;
   sdmBin_->select( corrMode_ ) ;
 
   // selection by TimeSampling
   sdmBin_->select( timeSampling_ ) ;
+
+  // selection by SpectralResolutionType
+  sdmBin_->select( resolutionType_ ) ;
 
   // selection by AtmPhaseCorrection and output CorrelationMode

trunk/external-alma/asdm2ASAP/ASDMReader.h

@@ -535 +535 @@
   EnumSet<CorrelationModeMod::CorrelationMode> corrMode_ ; // input correlation mode
   EnumSet<TimeSamplingMod::TimeSampling> timeSampling_ ; // time sampling
+  EnumSet<SpectralResolutionTypeMod::SpectralResolutionType> resolutionType_ ; // spectral resolution type
   casa::CountedPtr<casa::LogSinkInterface> logsink_ ; // Logger
   casa::String className_ ;

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]" ;
+  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]" ;
   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( "logfile", "", "logger output", "String" ) ;
   inp.readArguments( argc, argv ) ;
@@ -57 +58 @@
   string corrMode = inp.getString( "corr-mode" ) ;
   string timeSampling = inp.getString( "time-sampling" ) ;
+  string resolutionType = inp.getString( "srt" ) ;
   string logfile = inp.getString( "logfile" ) ;
     
@@ -109 +111 @@
     asdmRec.define( "corr", corrMode ) ;
     asdmRec.define( "sampling", timeSampling ) ;
+    asdmRec.define( "srt", resolutionType ) ;
     if ( reg.match( antenna.c_str(), antenna.size() ) != String::npos ) {
       // antenna is specifiec as id