Changeset 2273 for trunk

Timestamp:

08/12/11 16:20:30 (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...

Support latest ASDM definition in asdm2ASAP.
Now asdm2ASAP is linked to libalma_v3.so to be able to read latest ASDM.

The importasdm task invokes asdm2ASAP when singledish is True.

Older version of asdm2ASAP is renamec as oldasdm2ASAP.
The oldasdm2ASAP and related classes are built by linking to libalma.so.
It is installed but not used by any tasks.

Location:

trunk

Files:

• CMakeLists.txt (modified) (1 diff)
• cmake/withcasa.cmake (modified) (2 diffs)
• external-alma/asdm2ASAP/ASDMFiller.cc (modified) (4 diffs)
• external-alma/asdm2ASAP/ASDMReader.cc (modified) (5 diffs)
• external-alma/asdm2ASAP/asdm2ASAP.cc (modified) (2 diffs)
• external-alma/oldasdm2ASAP (added)
• external-alma/oldasdm2ASAP/CMakeLists.txt (added)
• external-alma/oldasdm2ASAP/OldASDMFiller.cc (added)
• external-alma/oldasdm2ASAP/OldASDMFiller.h (added)
• external-alma/oldasdm2ASAP/OldASDMReader.cc (added)
• external-alma/oldasdm2ASAP/OldASDMReader.h (added)
• external-alma/oldasdm2ASAP/oldasdm2ASAP.cc (added)

trunk/CMakeLists.txt

@@ -544 +544 @@
 set( ASAP2TO3 asap2to3 )
 if ( NOT STANDALONE )
+   set( ASDM2ASAP_OLD oldasdm2ASAP )
    set( ASDM2ASAP asdm2ASAP )
 endif()

trunk/cmake/withcasa.cmake

@@ -114 +114 @@
 endif()
 message( STATUS "LIBXML2_LIBRARY = " ${LIBXML2_LIBRARY} ) 
-set( ASDM_INCLUDE_DIR ${CASA_CODE_PATH}/alma/implement/ASDM
-                      ${CASA_CODE_PATH}/alma/implement/Enumerations
-                      ${CASA_CODE_PATH}/alma/implement/ASDMBinaries
-                      ${CASA_CODE_PATH}/alma/implement/Enumtcl
+set( ASDM_INCLUDE_DIR_OLD ${CASA_CODE_PATH}/alma/implement/ASDM
+                          ${CASA_CODE_PATH}/alma/implement/Enumerations
+                          ${CASA_CODE_PATH}/alma/implement/ASDMBinaries
+                          ${CASA_CODE_PATH}/alma/implement/Enumtcl
+                          ${LIBXML2_INCLUDE_DIR} )
+set( ASDM_LIBRARY_OLD ${casaroot}/${arch}/lib/libalma${CMAKE_SHARED_LIBRARY_SUFFIX} 
+                      ${LIBXML2_LIBRARY}/libxml2${CMAKE_SHARED_LIBRARY_SUFFIX} )
+set( ASDM_INCLUDE_DIR ${CASA_CODE_PATH}/alma_v3/implement/ASDM
+                      ${CASA_CODE_PATH}/alma_v3/implement/Enumerations
+                      ${CASA_CODE_PATH}/alma_v3/implement/ASDMBinaries
+                      ${CASA_CODE_PATH}/alma_v3/implement/Enumtcl
                       ${LIBXML2_INCLUDE_DIR} )
-set( ASDM_LIBRARY ${casaroot}/${arch}/lib/libalma${CMAKE_SHARED_LIBRARY_SUFFIX}
- ${LIBXML2_LIBRARY}/libxml2${CMAKE_SHARED_LIBRARY_SUFFIX} )
+set( ASDM_LIBRARY ${casaroot}/${arch}/lib/libalma_v3${CMAKE_SHARED_LIBRARY_SUFFIX}
+                  ${LIBXML2_LIBRARY}/libxml2${CMAKE_SHARED_LIBRARY_SUFFIX} )
 add_definitions( -DWITHOUT_ACS )
 
@@ -139 +146 @@
    add_subdirectory( python )
    add_subdirectory( share )
-   add_subdirectory( external-alma/asdm2ASAP ) 
+   add_subdirectory( external-alma/asdm2ASAP )
+   add_subdirectory( external-alma/oldasdm2ASAP ) 
 endmacro( asap_add_subdirectory )
 

trunk/external-alma/asdm2ASAP/ASDMFiller.cc

@@ -125 +125 @@
         if ( !(reader_->setMainRow( irow )) ) {
           // skip row since the row doesn't have valid configDescId
-          //logsink_->postLocally( LogMessage("skip "+String::toString(irow),LogOrigin(className_,funcName,WHERE)) ) ;
+          //logsink_->postLocally( LogMessage("skip "+String::toString(irow)+" since ASDMReader::setMainrow() returns False",LogOrigin(className_,funcName,WHERE)) ) ;
           continue ;
         }
@@ -136 +136 @@
         if ( !(reader_->setData()) ) {
           // skip row since reader failed to retrieve data
-          //logsink_->postLocally( LogMessage("skip "+String::toString(irow),LogOrigin(className_,funcName,WHERE)) ) ;
+          //logsink_->postLocally( LogMessage("skip "+String::toString(irow)+" since ASDMReader::setData() returns False",LogOrigin(className_,funcName,WHERE)) ) ;
           continue ;
         }
@@ -271 +271 @@
 //               oss << dataShape[i] << ", " ;
 //           }
-//           logsink_->postLocally( LogMessage(oss.str(),LogOrigin(className_,funcName,WHERE)) ) ;
+          //logsink_->postLocally( LogMessage(oss.str(),LogOrigin(className_,funcName,WHERE)) ) ;
                                      
           //int numPol = reader_->getNumPol( idata ) ;
@@ -285 +285 @@
           // SPECTRA, FLAGTRA, TSYS, TCAL
           float *sp = reader_->getSpectrum( idata ) ;
-          vector< vector<float> > ts = reader_->getTsys( idata ) ;
-          vector< vector<float> > tc = reader_->getTcal( idata ) ;
+          vector< vector<float> > ts ;
+          vector< vector<float> > tc ;
+          reader_->getTcalAndTsys( idata, tc, ts ) ;
           Matrix<casa::Float> spectra = toMatrix( sp, numPol, numChan ) ;
           Vector<uChar> flagtra( numChan, 0 ) ;

trunk/external-alma/asdm2ASAP/ASDMReader.cc

@@ -166 +166 @@
   // create ASDM object
   asdm_ = new ASDM() ;
+  // avoid unwanted message to stdout
+  ostringstream oss ;
+  streambuf *buforg = cout.rdbuf(oss.rdbuf()) ;
   asdm_->setFromFile( filename ) ;
+  cout.rdbuf(buforg) ;
 
   if ( antennaId_ == -1 ) {
@@ -213 +217 @@
   processStation() ;
 
-  logsink_->postLocally( LogMessage(  "antennaId_ = "+String::toString(antennaId_), LogOrigin(className_,funcName,WHERE) ) ) ;
-  logsink_->postLocally( LogMessage(  "antennaName_ = "+antennaName_, LogOrigin(className_,funcName,WHERE) ) ) ;
+  //logsink_->postLocally( LogMessage(  "antennaId_ = "+String::toString(antennaId_), LogOrigin(className_,funcName,WHERE) ) ) ;
+  //logsink_->postLocally( LogMessage(  "antennaName_ = "+antennaName_, LogOrigin(className_,funcName,WHERE) ) ) ;
 
   return true ;
@@ -286 +290 @@
   // project
   // T.B.D. (project UID?)
-  project = "T.B.D. (" + ebrow->getProjectId().toString() + ")" ;
+  project = "T.B.D. (" + ebrow->getProjectUID().toString() + ")" ;
 
   // utc
@@ -1880 +1884 @@
 vector< vector<double> > ASDMReader::pointingDir( PointingRow *row ) 
 {
+  //String funcName = "pointingDir" ;
   vector< vector<Angle> > aTar = row->getTarget() ;
   vector< vector<Angle> > aOff = row->getOffset() ;
@@ -1893 +1898 @@
      * into account
      * 
-     * az = dir[0][0] = target[0][0] + offset[0][0] / cos(el)
+     * az = dir[0][0] = target[0][0] + offset[0][0] / cos(el) 
      *                 + encorder[0][0] - direction[0][0]
      * el = dir[0][1] = target[0][1] + offset[0][1]
      *                 + encorder[0][1] - direction[0][1]
      **/
-    dir[i][0] = aTar[i][0].get() + factor * aOff[i][0].get() ;
+    dir[i][0] = aTar[i][0].get() + factor * aOff[i][0].get()
                + aEnc[i][0].get() - aDir[i][0].get() ;
-    dir[i][1] = aTar[i][1].get() + aOff[i][1].get() ;
+    dir[i][1] = aTar[i][1].get() + aOff[i][1].get()
                + aEnc[i][1].get() - aDir[i][1].get() ;
+    //logsink_->postLocally( LogMessage("tracking offset: ["+String::toString(aEnc[i][0].get()-aDir[i][0].get())+","+String::toString(aEnc[i][0]-aDir[i][0].get())+"]",LogOrigin(className_,funcName,WHERE)) ) ;
   }
   return dir ;

trunk/external-alma/asdm2ASAP/asdm2ASAP.cc

@@ -127 +127 @@
     CountedPtr<ASDMReader> reader = filler->getReader() ;
     string aname = reader->getAntennaName() ;
-    int aid = reader->getAntennaId() ;
     string outname = asapname ;
     if ( asapname.size() == 0 ) {
@@ -137 +136 @@
     
     //logsink_p->postLocally( LogMessage("specified option summary:",LogOrigin(funcname,WHERE)) ) ;
-    //logsink_p->postLocally( LogMessage("   antenna = "+String(aname)+" (ID: "+String::toString(aid)+")",LogOrigin(funcname,WHERE)) ) ;
+    //logsink_p->postLocally( LogMessage("   antenna = "+String(aname)+" (ID: "+String::toString(reader->getAntennaId())+")",LogOrigin(funcname,WHERE)) ) ;
     //logsink_p->postLocally( LogMessage("   asdmname = "+asdmname,LogOrigin(funcname,WHERE)) ) ;
     //logsink_p->postLocally( LogMessage("   asapname = "+outname,LogOrigin(funcname,WHERE)) ) ;