Changeset 2220 for trunk/external-alma

Timestamp:

07/13/11 17:54:48 (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...

Number of IFs is not a number of rows of SpectralWindow table,
but a number of frequency groups.
When freqGroup is not defined, number of IFs is set to number
of non-WVR spectral windows plus 1 (WVR spectral window).

Location:

trunk/external-alma/asdm2ASAP

Files:

• ASDMFiller.cc (modified) (3 diffs)
• ASDMReader.cc (modified) (4 diffs)
• ASDMReader.h (modified) (1 diff)
• asdm2ASAP.cc (modified) (3 diffs)

trunk/external-alma/asdm2ASAP/ASDMFiller.cc

@@ -69 +69 @@
   table_->frequencies().setFrame( freqFrame, false ) ;
   table_->frequencies().setFrame( freqFrame, true ) ;
+  //logsink_->postLocally( LogMessage("sFreqFrame = "+sFreqFrame,LogOrigin(className_,funcName,WHERE)) ) ;
   
   Vector<casa::Double> antpos = table_->getHeader().antennaposition ;
@@ -111 +112 @@
       uInt nrow = reader_->getNumMainRow() ;
 
-      //logsink_->postLocally( LogMessage("There are "+String::toString(nrow)+" rows in Main table corresponding to configDescId "+String::toString(configDescIdList[icon]+" fieldId "+String::toString(fieldIdList[ifield]),LogOrigin(className_,funcName,WHERE)) ) ;
+      //logsink_->postLocally( LogMessage("There are "+String::toString(nrow)+" rows in Main table corresponding to configDescId "+String::toString(configDescIdList[icon])+" fieldId "+String::toString(fieldIdList[ifield]),LogOrigin(className_,funcName,WHERE)) ) ;
       
       // CYCLENO
@@ -132 +133 @@
         if ( !(reader_->setData()) ) {
           // skip row since reader failed to retrieve data
-          //logsink_->postLocally( LogMessage("skip "+String::toString(irow),LogOrigin(className_,funcName,WHRER)) ) ;
+          //logsink_->postLocally( LogMessage("skip "+String::toString(irow),LogOrigin(className_,funcName,WHERE)) ) ;
           continue ;
         }

trunk/external-alma/asdm2ASAP/ASDMReader.cc

@@ -212 +212 @@
   processStation() ;
 
-  logsink_->postLocally( LogMessage(  "antennaId_ = "+String::toString(antennaId_), LogOrigin() ) ) ;
-  logsink_->postLocally( LogMessage(  "antennaName_ = "+antennaName_, LogOrigin() ) ) ;
+  logsink_->postLocally( LogMessage(  "antennaId_ = "+String::toString(antennaId_), LogOrigin(className_,funcName,WHERE) ) ) ;
+  logsink_->postLocally( LogMessage(  "antennaName_ = "+antennaName_, LogOrigin(className_,funcName,WHERE) ) ) ;
 
   return true ;
@@ -294 +294 @@
   SpectralWindowTable &spwtab = asdm_->getSpectralWindow() ;
   vector<SpectralWindowRow *> spwrows = spwtab.get() ;
+  int nspwrow = spwrows.size() ;
 
   // nif
-  nif = spwrows.size() ;
+  //nif = spwrows.size() ;
+  nif = getNumIFs() ;
 
   // nchan 
   int refidx = -1 ;
   vector<int> nchans ;
-  for ( int irow = 0 ; irow < nif ; irow++ ) {
+  for ( int irow = 0 ; irow < nspwrow ; irow++ ) {
     nchans.push_back( spwrows[irow]->getNumChan() ) ;
     if ( refidx == -1 && nchans[irow] != 1 && nchans[irow] != 4 )
@@ -312 +314 @@
   // bandwidth
   vector<double> bws ;
-  for ( int irow = 0 ; irow < nif ; irow++ ) {
+  for ( int irow = 0 ; irow < nspwrow ; irow++ ) {
     if ( nchans[irow] != 4 ) { // exclude WVR data
       bws.push_back( spwrows[irow]->getTotBandwidth().get() ) ;
@@ -1674 +1676 @@
   }
   
-  logsink_->postLocally( LogMessage("frame = "+String::toString(frame),LogOrigin(className_,funcName,WHERE)) ) ;
+  //logsink_->postLocally( LogMessage("frame = "+String::toString(frame),LogOrigin(className_,funcName,WHERE)) ) ;
 
   return frame ;
 }
+
+int ASDMReader::getNumIFs()
+{
+  String funcName = "getNumIFs" ;
+
+  int nif = 0 ;
+  vector<SpectralWindowRow *> rows = asdm_->getSpectralWindow().get() ;
+  unsigned int nrow = rows.size() ;
+  // check if all rows have freqGroup attribute
+  bool freqGroupExists = true ;
+  bool countedWvr = false ;
+  for ( unsigned int irow = 0 ; irow < nrow ; irow++ ) {
+    freqGroupExists &= rows[irow]->isFreqGroupExists() ;
+    if ( rows[irow]->getNumChan() == 4 ) {
+      if ( !countedWvr ) {
+        countedWvr = true ;
+        nif++ ;
+      }
+    }
+    else {
+      nif++ ;
+    }
+  }
+  
+  if ( freqGroupExists ) {
+    vector<int> freqGroup(0) ;
+    for ( unsigned int irow = 0 ; irow < nrow ; irow++ ) {
+      int fg = rows[irow]->getFreqGroup() ;
+      if ( (int)count( freqGroup.begin(), freqGroup.end(), fg ) == 0 ) {
+        freqGroup.push_back( fg ) ;
+      }
+    }
+    nif = freqGroup.size() ;
+  }
+
+  //logsink_->postLocally( LogMessage("nif = "+String::toString(nif),LogOrigin(className_,funcName,WHERE)) ) ;
+
+  return nif ;
+}

trunk/external-alma/asdm2ASAP/ASDMReader.h

@@ -495 +495 @@
                 double mjd,
                 casa::Vector<casa::Double> antpos ) ;
+
+  /**
+   * get nIF
+   *
+   * @return number of IFs
+   **/
+  int getNumIFs() ;
 
   asdm::ASDM *asdm_ ; // pointer to ASDM object

trunk/external-alma/asdm2ASAP/asdm2ASAP.cc

@@ -148 +148 @@
     if ( dir.exists() ) {
       if ( overwrite ) {
-        //*os << "Delete existing file " << outname << " ..." << LogIO::POST ;
         logsink_p->postLocally( LogMessage("Delete existing file "+outname+" ...",LogOrigin(funcname,WHERE)) ) ;
         dir.removeRecursive() ;
       }
       else {
-        //*os << LogIO::WARN << "Output file " << outname << " exists." << LogIO::POST ;
         logsink_p->postLocally( LogMessage("Output file "+outname+" exists.",LogOrigin(funcname,WHERE),LogMessage::WARN) ) ;
         return 1 ;
@@ -167 +165 @@
     // save data only if nrow is not zero
     if ( stable->nrow() > 0 ) {
-      //*os << "Creating " << outname << "..." << LogIO::POST ;
       logsink_p->postLocally( LogMessage("Creating "+outname+"...",LogOrigin(funcname,WHERE)) ) ;
       stable->makePersistent( outname ) ;
     }
     else {
-      //*os << outname << " will not be created since there are no data associate with the selection" << LogIO::POST ;
       logsink_p->postLocally( LogMessage(outname+" will not be created since there are no data associate with the selection",LogOrigin(funcname,WHERE)) ) ;
     }
@@ -184 +180 @@
   if ( logfile.size() != 0 )
     ofs.close() ;
-  //delete os ;
 
   return 0 ;