Changeset 2215 for trunk/external-alma/asdm2ASAP/ASDMReader.cc

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.

File:

• trunk/external-alma/asdm2ASAP/ASDMReader.cc (modified) (3 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