Changeset 2220 for trunk/external-alma/asdm2ASAP/ASDMReader.cc

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).

File:

• trunk/external-alma/asdm2ASAP/ASDMReader.cc (modified) (4 diffs)

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 ;
+}