Changeset 2208 for trunk/external-alma/asdm2ASAP/ASDMReader.h

Timestamp:

07/06/11 16:52:38 (13 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CAS-1913

Ready for Test: No

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...

Update of asdm2ASAP and related classes.

• replaced LogIO with StreamLogSink?
• all log messages are written to logger via StreamLogSink?
• no output to stdout/stderr
• commented out junk log
• added time_sampling selection
• supported wvr_corrected_data='both'
• added logfile specification
• added corr_mode selection

File:

• trunk/external-alma/asdm2ASAP/ASDMReader.h (modified) (8 diffs)

trunk/external-alma/asdm2ASAP/ASDMReader.h

@@ -7 +7 @@
 #include <casa/Utilities/CountedPtr.h>
 #include <casa/Containers/Record.h>
+#include <casa/Logging/LogSinkInterface.h>
 #include <ASDMAll.h>
 #include <SDMBinData.h>
@@ -35 +36 @@
    * fill data
    **/
-  void fill() ;
+//   void fill() ;
 
   /**
@@ -121 +122 @@
 
   /**
-   * set Main rows that matches given context (configDescId and fieldId) to mainRow_
+   * set Main rows that matches given context (configDescId and fieldId) 
+   * to mainRow_
    *
    * @param configDescId 
@@ -357 +359 @@
    * @return list of dataDescId
    **/
-  casa::Vector<casa::uInt> getDataDescIdList( casa::uInt cdid ) ;
+//   casa::Vector<casa::uInt> getDataDescIdList( casa::uInt cdid ) ;
 
   /**
@@ -365 +367 @@
    * @return list of dataDescId
    **/
-  casa::Vector<casa::uInt> getSwitchCycleIdList( casa::uInt cdid ) ;
+//   casa::Vector<casa::uInt> getSwitchCycleIdList( casa::uInt cdid ) ;
 
   /**
@@ -375 +377 @@
    * @return list of valid feedId 
    **/
-  casa::Vector<casa::uInt> getFeedIdList( casa::uInt cdid ) ;
+//   casa::Vector<casa::uInt> getFeedIdList( casa::uInt cdid ) ;
 
   /**
@@ -390 +392 @@
    **/
   unsigned int getNumData() { return numData_ ; } ;
+
+  /**
+   * set Logger
+   *
+   * @param logger (LogSinkInterface)
+   **/
+  void setLogger( casa::CountedPtr<casa::LogSinkInterface> &logsink ) ;
 
 
@@ -524 +533 @@
   int weatherStationId_ ; // closest weather station for antennaId_
   AtmPhaseCorrectionMod::AtmPhaseCorrection apc_ ; // ATM phase correction
+  EnumSet<CorrelationModeMod::CorrelationMode> corrMode_ ; // input correlation mode
+  EnumSet<TimeSamplingMod::TimeSampling> timeSampling_ ; // time sampling
+  casa::CountedPtr<casa::LogSinkInterface> logsink_ ; // Logger
+  casa::String className_ ;
 } ;
 #endif // ASAP_ASDM_READER_H