Changeset 2273 for trunk/external-alma/asdm2ASAP/ASDMReader.cc
- Timestamp:
- 08/12/11 16:20:30 (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/external-alma/asdm2ASAP/ASDMReader.cc
r2256 r2273 166 166 // create ASDM object 167 167 asdm_ = new ASDM() ; 168 // avoid unwanted message to stdout 169 ostringstream oss ; 170 streambuf *buforg = cout.rdbuf(oss.rdbuf()) ; 168 171 asdm_->setFromFile( filename ) ; 172 cout.rdbuf(buforg) ; 169 173 170 174 if ( antennaId_ == -1 ) { … … 213 217 processStation() ; 214 218 215 logsink_->postLocally( LogMessage( "antennaId_ = "+String::toString(antennaId_), LogOrigin(className_,funcName,WHERE) ) ) ;216 logsink_->postLocally( LogMessage( "antennaName_ = "+antennaName_, LogOrigin(className_,funcName,WHERE) ) ) ;219 //logsink_->postLocally( LogMessage( "antennaId_ = "+String::toString(antennaId_), LogOrigin(className_,funcName,WHERE) ) ) ; 220 //logsink_->postLocally( LogMessage( "antennaName_ = "+antennaName_, LogOrigin(className_,funcName,WHERE) ) ) ; 217 221 218 222 return true ; … … 286 290 // project 287 291 // T.B.D. (project UID?) 288 project = "T.B.D. (" + ebrow->getProject Id().toString() + ")" ;292 project = "T.B.D. (" + ebrow->getProjectUID().toString() + ")" ; 289 293 290 294 // utc … … 1880 1884 vector< vector<double> > ASDMReader::pointingDir( PointingRow *row ) 1881 1885 { 1886 //String funcName = "pointingDir" ; 1882 1887 vector< vector<Angle> > aTar = row->getTarget() ; 1883 1888 vector< vector<Angle> > aOff = row->getOffset() ; … … 1893 1898 * into account 1894 1899 * 1895 * az = dir[0][0] = target[0][0] + offset[0][0] / cos(el) 1900 * az = dir[0][0] = target[0][0] + offset[0][0] / cos(el) 1896 1901 * + encorder[0][0] - direction[0][0] 1897 1902 * el = dir[0][1] = target[0][1] + offset[0][1] 1898 1903 * + encorder[0][1] - direction[0][1] 1899 1904 **/ 1900 dir[i][0] = aTar[i][0].get() + factor * aOff[i][0].get() ;1905 dir[i][0] = aTar[i][0].get() + factor * aOff[i][0].get() 1901 1906 + aEnc[i][0].get() - aDir[i][0].get() ; 1902 dir[i][1] = aTar[i][1].get() + aOff[i][1].get() ;1907 dir[i][1] = aTar[i][1].get() + aOff[i][1].get() 1903 1908 + aEnc[i][1].get() - aDir[i][1].get() ; 1909 //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)) ) ; 1904 1910 } 1905 1911 return dir ;
Note: See TracChangeset
for help on using the changeset viewer.