Changeset 2355 for trunk/external-alma/asdm2ASAP/ASDMFiller.cc

Timestamp:

12/01/11 17:33:24 (12 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: No

Ready for Test: Yes

Interface Changes: No

What Interface Changed: Please list interface changes

Test Programs: test_importasdm_sd

Put in Release Notes: es/No

Module(s): Module Names change impacts.

Description: Describe your changes here...

Bug fix on asdm2ASAP that causes segmentation fault.

File:

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

trunk/external-alma/asdm2ASAP/ASDMFiller.cc

@@ -134 +134 @@
         //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 ) ;
@@ -152 +153 @@
         string freqref = "" ;
 
+        //logsink_->postLocally( LogMessage("numData = "+String::toString(numData),LogOrigin(className_,funcName,WHERE)) ) ;
         for ( unsigned int idata = 0 ; idata < numData ; idata++ ) {
           // prepare to extract binary data
+          //logsink_->postLocally( LogMessage("prepare data...",LogOrigin(className_,funcName,WHERE)) ) ;
           reader_->prepareData( idata ) ;
 
@@ -159 +162 @@
           //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)) ) ;
           // source spec
           int srctype = reader_->getSrcType( scanno, subscanno ) ;
+          //logsink_->postLocally( LogMessage("srctype = "+String::toString(srctype),LogOrigin(className_,funcName,WHERE)) ) ;
           string srcname ;
           string fieldname ;
@@ -185 +190 @@
                                       sysVel,
                                       rf ) ;
-          
+          //logsink_->postLocally( LogMessage("srcname = "+String::toString(srcname),LogOrigin(className_,funcName,WHERE)) ) ;          
+
           // fill MOLECULE_ID and add MOLECULES row if necessary
           Vector<casa::Double> restFreqs( rf.size() ) ;
@@ -197 +203 @@
           casa::Double mjd = (casa::Double)(reader_->getTime()) ;
           casa::Double interval = (casa::Double)(reader_->getInterval()) ;
+          //logsink_->postLocally( LogMessage("mjd = "+String::toString(mjd),LogOrigin(className_,funcName,WHERE)) ) ;
 
           // fill TIME and INTERVAL
@@ -214 +221 @@
           unsigned int flagrow = reader_->getFlagRow() ;
           setFlagrow( (uInt)flagrow ) ;
-
+          //logsink_->postLocally( LogMessage("flagrow = "+String::toString(flagrow),LogOrigin(className_,funcName,WHERE)) ) ;
           // fill WEATHER_ID and add WEATHER row if necessary
           float temperature ;
@@ -237 +244 @@
                        (casa::Float)windspeed,
                        (casa::Float)windaz ) ;
-
+          //logsink_->postLocally( LogMessage("temperature = "+String::toString(temperature),LogOrigin(className_,funcName,WHERE)) ) ;
           // fill AZIMUTH, ELEVATION, DIRECTION and SCANRATE
           vector<double> dir ;
@@ -302 +309 @@
 //               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 ) ;
@@ -317 +324 @@
           // 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 ;
@@ -323 +332 @@
           reader_->getTcalAndTsys( tc, ts ) ;
           Matrix<casa::Float> spectra = toMatrix( sp, numPol, numChan ) ;
+          //logsink_->postLocally( LogMessage("spectra(0,0) = "+String::toString(spectra(0,0)),LogOrigin(className_,funcName,WHERE)) ) ;
           Vector<uChar> flagtra( numChan, 0 ) ;
           Matrix<casa::Float> tsys = toMatrix( ts, numPol, numChan ) ;
           Matrix<casa::Float> tcal = toMatrix( tc, numPol, numChan ) ;
+          //logsink_->postLocally( LogMessage("tsys(0,0) = "+String::toString(tsys(0,0)),LogOrigin(className_,funcName,WHERE)) ) ;
 //           String caltime = "" ;
 //           if ( anyNE( tcal, (casa::Float)1.0 ) )