Changeset 2407 for trunk/external-alma/asdm2ASAP

Timestamp:

02/14/12 13:08:36 (13 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: No

Ready for Test: Yes

Interface Changes: Yes/No

What Interface Changed: Please list interface changes

Test Programs: test_importasdm_sd

Put in Release Notes: Yes/No

Module(s): Module Names change impacts.

Description: Describe your changes here...

some clean up

File:

• trunk/external-alma/asdm2ASAP/ASDMFiller.cc (modified) (14 diffs)

trunk/external-alma/asdm2ASAP/ASDMFiller.cc

@@ -76 +76 @@
   Vector<casa::Double> antpos = table_->getHeader().antennaposition ;
 
-  //STHeader hdr = table_->getHeader() ;
-  
   // data selection
   reader_->select() ;
@@ -103 +101 @@
 
   // CYCLENO
-  //unsigned int cycleno = 0 ;
   map< unsigned int, unsigned int > cycleno ;
   map< unsigned int, unsigned int >::iterator citer ;
@@ -111 +108 @@
       //logsink_->postLocally( LogMessage("start configDescId "+String::toString(configDescIdList[icon])+" fieldId "+String::toString(fieldIdList[ifield]),LogOrigin(className_,funcName,WHERE)) ) ;
 
-      //Bool status = reader_->setMainRow( configDescIdList[icon], fieldIdList[ifield] ) ;
       if ( !(reader_->setMainRow( configDescIdList[icon], fieldIdList[ifield] )) ) {
         //logsink_->postLocally( LogMessage("skip configDescId "+String::toString(configDescIdList[icon])+" fieldId "+String::toString(fieldIdList[ifield]),LogOrigin(className_,funcName,WHERE)) ) ;
@@ -132 +128 @@
 
         // scan and subscan
-        //unsigned int scanno = reader_->getScanNo() ;
         unsigned int scanno = reader_->getScanNoOfCurrentRow() ;
         //logsink_->postLocally( LogMessage("scanno = "+String::toString(scanno),LogOrigin(className_,funcName,WHERE)) ) ;
-        //uInt subscanno = reader_->getSubscanNo() ;
         citer = cycleno.find( scanno ) ;
         if ( citer == cycleno.end() )
@@ -160 +154 @@
 
           // subscan number
-          //unsigned int subscanno = reader_->getSubscanNo( idata ) ;
           unsigned int subscanno = reader_->getSubscanNo() ;
           //logsink_->postLocally( LogMessage("subscanno = "+String::toString(subscanno),LogOrigin(className_,funcName,WHERE)) ) ;
 
           // IFNO
-          //uInt ifno = reader_->getIFNo( idata ) ;
           uInt ifno = reader_->getIFNo() ;
           //logsink_->postLocally( LogMessage("ifno = "+String::toString(ifno),LogOrigin(className_,funcName,WHERE)) ) ;
@@ -177 +169 @@
           double sysVel ;
           vector<double> rf ;
-          //reader_->getSourceProperty( idata, 
-          //                            srcname, 
-          //                            fieldname,
-          //                            srcDirection,
-          //                            srcProperMotion,
-          //                            sysVel,
-          //                            rf ) ;
           reader_->getSourceProperty( srcname, 
                                       fieldname,
@@ -199 +184 @@
           
           // time and interval
-          //casa::Double mjd = (casa::Double)(reader_->getTime( idata )) ;
-          //casa::Double interval = (casa::Double)(reader_->getInterval( idata )) ;
           casa::Double mjd = (casa::Double)(reader_->getTime()) ;
           casa::Double interval = (casa::Double)(reader_->getInterval()) ;
@@ -218 +201 @@
 
           // fill FLAGROW
-          //unsigned int flagrow = reader_->getFlagRow( idata ) ;
           unsigned int flagrow = reader_->getFlagRow() ;
           setFlagrow( (uInt)flagrow ) ;
@@ -228 +210 @@
           float windspeed ;
           float windaz ;
-          //reader_->getWeatherInfo( idata,
-          //                         temperature, 
-          //                         pressure,
-          //                         humidity,
-          //                         windspeed,
-          //                         windaz ) ;
           reader_->getWeatherInfo( temperature, 
                                    pressure,
@@ -250 +226 @@
           double el ;
           vector<double> srate ;
-          //reader_->getPointingInfo( idata,
-          //                          dir,
-          //                          az,
-          //                          el,
-          //                          srate ) ;
           reader_->getPointingInfo( dir,
                                     az,
@@ -282 +253 @@
           }
           else {
-            //reader_->getFrequency( idata, refpix, refval, incr, freqref ) ;
             reader_->getFrequency( refpix, refval, incr, freqref ) ;
             refval = (double)toLSRK( casa::Double(refval), 
@@ -298 +268 @@
 
           // loop on polarization
-          //vector<unsigned int> dataShape = reader_->getDataShape( idata ) ;
           vector<unsigned int> dataShape = reader_->getDataShape() ;
 //           ostringstream oss ;
@@ -311 +280 @@
 //           logsink_->postLocally( LogMessage(oss.str(),LogOrigin(className_,funcName,WHERE)) ) ;
                                      
-          //int numPol = reader_->getNumPol( idata ) ;
           unsigned int numPol = dataShape[0] ;
           unsigned int numChan = dataShape[1] ;
@@ -318 +286 @@
 
           // OPACITY
-          //vector<float> tau = reader_->getOpacity( idata ) ;
           vector<float> tau = reader_->getOpacity() ;
           Vector<casa::Float> opacity = toVector( tau, numPol ) ;
 
           // SPECTRA, FLAGTRA, TSYS, TCAL
-          //float *sp = reader_->getSpectrum( idata ) ;
-          //logsink_->postLocally( LogMessage("getting spectra...",LogOrigin(className_,funcName,WHERE)) ) ;
           float *sp = reader_->getSpectrum() ;
           //logsink_->postLocally( LogMessage("sp[0] = "+String::toString(sp[0]),LogOrigin(className_,funcName,WHERE)) ) ;
           vector< vector<float> > ts ;
           vector< vector<float> > tc ;
-          //reader_->getTcalAndTsys( idata, tc, ts ) ;
           reader_->getTcalAndTsys( tc, ts ) ;
           Matrix<casa::Float> spectra = toMatrix( sp, numPol, numChan ) ;