Changeset 2154

Timestamp:

04/25/11 19:06:56 (14 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CAS-2819

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

Bug fix on nif and nbeam.
For BEARS (MULT2), nif and nbeam is fixed as 1 and 25, respectively.
Otherwise, nif is number of arrays used and nbeam is 1.

Location:

trunk/external-alma/atnf/PKSIO

Files:

• ASTEReader.cc (modified) (1 diff)
• ASTEReader.h (modified) (1 diff)
• NRO45Reader.cc (modified) (1 diff)
• NRO45Reader.h (modified) (1 diff)
• NROReader.cc (modified) (2 diffs)
• NROReader.h (modified) (1 diff)

trunk/external-alma/atnf/PKSIO/ASTEReader.cc

@@ -118 +118 @@
 }
 
+Int ASTEReader::getNumIF() 
+{
+  vector<Bool> v ;
+  vector<int> arry = dataset_->getARRY() ;
+  for ( uInt i = 0 ; i < arry.size() ; i++ ) {
+    if ( arry[i] != 0 ) {
+      v.push_back( True ) ;
+    }
+  }
+  Int nif = v.size() ;
+  return nif ;
+}
+
+Int ASTEReader::getNumBeam()
+{
+  // ASTE doesn't have array receiver so far
+  return 1 ;
+}

trunk/external-alma/atnf/PKSIO/ASTEReader.h

@@ -81 +81 @@
   virtual int read() ;
 
+  // get number of IF
+  virtual Int getNumIF() ;
+
+  // get number of Beams
+  virtual Int getNumBeam() ;
+
  protected:
   // Get Antenna Position in ITRF coordinate

trunk/external-alma/atnf/PKSIO/NRO45Reader.cc

@@ -124 +124 @@
 }
 
+Int NRO45Reader::getNumIF() 
+{
+  Int nif = 1 ;
+  if ( (dataset_->getRX()[0]).find("MULT2-") == string::npos ) {
+    vector<Bool> v ;
+    vector<int> arry = dataset_->getARRY() ;
+    for ( uInt i = 0 ; i < arry.size() ; i++ ) {
+      if ( arry[i] != 0 ) {
+        v.push_back( True ) ;
+      }
+    }
+    nif = v.size() ;
+  }
+  return nif ;
+}
+
+Int NRO45Reader::getNumBeam()
+{
+  Int nbeam = 25 ;
+  if ( (dataset_->getRX()[0]).find("MULT2-") == string::npos ) {
+    nbeam = 1 ;
+  }
+  return nbeam ;
+}

trunk/external-alma/atnf/PKSIO/NRO45Reader.h

@@ -83 +83 @@
   virtual int read() ;
 
+  // get number of IF
+  virtual Int getNumIF() ;
+
+  // get number of Beams
+  virtual Int getNumBeam() ;
+
  protected:
   // Get Antenna Position in ITRF coordinate

trunk/external-alma/atnf/PKSIO/NROReader.cc

@@ -457 +457 @@
   //freqref = vref ;
   freqref = "LSRK" ;
+  //freqref = "REST" ;
   //cout << "freqref = " << freqref << endl ;
   NRODataRecord *record = dataset_->getRecord( 0 ) ;
@@ -483 +484 @@
   //cout << "poltype = " << poltype << endl ;
 
-  vector<Bool> ifs = getIFs() ;
-  nif = ifs.size() ;
+  //vector<Bool> ifs = getIFs() ;
+  //nif = ifs.size() ;
+  nif = getNumIF() ;
   //cout << "nif = " << nif << endl ;
 
-  vector<Bool> beams = getBeams() ;
-  nbeam = beams.size() ;
+  //vector<Bool> beams = getBeams() ;
+  //nbeam = beams.size() ;
+  nbeam = getNumBeam() ;
   //cout << "nbeam = " << nbeam << endl ;
 

trunk/external-alma/atnf/PKSIO/NROReader.h

@@ -171 +171 @@
   virtual vector<Bool> getIFs() ;
 
+  // Get Number of IFs
+  virtual Int getNumIF() = 0 ;
+
   // Get Beam settings
   virtual vector<Bool> getBeams() ;
+
+  // Get Number of Beams
+  virtual Int getNumBeam() = 0 ;
 
  protected: