Changeset 2777 for trunk/external-alma

Timestamp:

03/07/13 13:28:44 (11 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: List test programs

Put in Release Notes: Yes/No?

Module(s): Module Names change impacts.

Description: Describe your changes here...

Bug fix on numbering of IFNO/BEAMNO based on Arrays.

Location:

trunk/external-alma/atnf/PKSIO

Files:

• ASTEDataset.h (modified) (1 diff)
• ASTEFXDataset.h (modified) (1 diff)
• NRODataset.cc (modified) (5 diffs)
• NRODataset.h (modified) (3 diffs)
• NROOTFDataset.cc (modified) (2 diffs)
• NROOTFDataset.h (modified) (1 diff)
• NROReader.cc (modified) (2 diffs)

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

@@ -83 +83 @@
   // fill header information
   virtual int fillHeader( int sameEndian ) ;
+
+  // return ARRAYMAX
+  virtual int arrayMax() { return ASTE_ARYMAX; } ;
 } ;
 

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

@@ -83 +83 @@
   // fill header information
   virtual int fillHeader( int sameEndian ) ;
+
+  // return ARRAYMAX
+  virtual int arrayMax() { return ASTE_ARYMAX_FX; } ;
 } ;
 

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

@@ -262 +262 @@
     LogIO os( LogOrigin( "NRODataset", "getRecord()", WHERE ) ) ;
     //cerr << "NRODataset::getRecord()  error while reading data " << i << endl ;
-    os << LogIO::SEVERE << "error while reading data " << i << ". return NULL." << LogIO::POST ;
+    os << LogIO::SEVERE << "error while reading data " << i << ". return NULL." << LogIO::EXCEPTION ;
     dataid_ = -1 ;
     return NULL ;
@@ -468 +468 @@
   //
   const NRODataRecord *record = getRecord( irow ) ;
+
   const string str = record->ARRYT ;
   // DEBUG
   //cout << "NRODataset::getIndex()  str = " << str << endl ;
   //
-  string substr = str.substr( 1, 2 ) ;
-  unsigned int index = (unsigned int)(atoi( substr.c_str() ) - 1) ;
+  int index = (int)getArrayId(str);
   // DEBUG 
-  //cout << "NRODataset::getIndex()  irow = " << irow << " index = " << index << endl ;
+  //cout << "NRODataset::getIndex()  irow = " << irow << "str = " << str << " index = " << index << endl ;
   //
 
@@ -489 +489 @@
   //cout << "NRODataset::getPolarizationNum()  start process" << endl ;
   //
-  int npol = 0 ;
-
-  vector<string> type( 2 ) ;
-  type[0] = "CIRC" ;
-  type[1] = "LINR" ;
-  vector<double> crot ;
-  vector<double> lagl ;
-  //vector<int> ntype( 2, 0 ) ;
-
-  unsigned int imax = rowNum_ ;
-  for ( unsigned int i = 0 ; i < imax ; i++ ) { 
-    int index = getIndex( i ) ;
-    // DEBUG 
-    //cout <<"NRODataset::getPolarizationNum()  index = " << index << endl ;
-    //
-    if ( POLTP[index] == type[0] ) {
-      if( count( crot.begin(), crot.end(), POLDR[index] ) != 0 ) {
-        crot.push_back( POLDR[index] ) ;
-        npol++ ;
-      }
-      //ntype[0] = 1 ;
-    }
-    else if ( POLTP[index] == type[1] ) {
-      if ( count( lagl.begin(), lagl.end(), POLAN[index] ) != 0 ) {
-        lagl.push_back( POLAN[index] ) ;
-        npol++ ;
-      }
-      //ntype[1] = 1 ;
-    }
-  }
-
-  if ( npol == 0 )
-    npol = 1 ;
+  int npol = 1;
+  Regex reRx2("(.*V|H20ch2)$");
+  Regex reRx1("(.*H|H20ch1)$");
+  Bool match1 = false;
+  Bool match2 = false;
+  for (int i = 0; i < arrayMax(); i++) {
+    cout << "RX[" << i << "]=" << RX[i] << endl;
+    if (!match1) {
+      match1 = (reRx1.match(RX[i].c_str(), RX[i].size()) != String::npos);
+    }
+    if (!match2) {
+      match2 = (reRx2.match(RX[i].c_str(), RX[i].size()) != String::npos);
+    }
+  }
+
+  if (match1 && match2)
+    npol = 2;  
+
+  //cout << "npol = " << npol << endl;
 
   // DEBUG
@@ -755 +741 @@
 }
 
+uInt NRODataset::getSortedArrayId( string type )
+{
+  uInt index = 0;
+  while (arrayNames_[index] != type && index < (uInt)ARYNM)
+    ++index;
+  return index;
+}
+
 void NRODataset::show()
 {
@@ -866 +860 @@
   return polno ;
 }
+
+void NRODataset::initArray()
+{
+  if (ARYNM <= 0)
+    throw AipsError("ARYNM must be greater than zero.");
+
+  int numArray = 0;
+  arrayNames_.resize(ARYNM);
+  for (int irow = 0; numArray < ARYNM && irow < rowNum_; irow++) {
+    cout << "irow " << irow << endl;
+    const NRODataRecord *record = getRecord( irow ) ;
+    const string str = record->ARRYT ;
+    if (find(arrayNames_.begin(), arrayNames_.end(), str) == arrayNames_.end()) {
+      arrayNames_[numArray] = str;
+      cout << "arrayNames_[" << numArray << "]=" << str << endl;
+      ++numArray;
+    }
+  }
+  cout << "numArray=" << numArray << endl;
+}

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

@@ -199 +199 @@
   virtual std::vector<double> getFrequencies( int i ) ;
   virtual uInt getArrayId( std::string type ) ;
+  virtual uInt getSortedArrayId( std::string type ) ;
   virtual uInt getPolNo( int irow ) ;
 
@@ -242 +243 @@
   uInt polNoFromRX( const std::string &rx ) ;
 
+  // initialize array information (only for OTF data)
+  void initArray();
+
+  // return ARRYMAX
+  virtual int arrayMax() {return 0;} ; 
+
   // Type of file record
   std::string LOFIL ;
@@ -517 +524 @@
   // reference frequency for each array
   std::vector<double> refFreq_ ;
+
+  // list of array names
+  std::vector<std::string> arrayNames_;
 
   // record to store REFPIX, REFVAL, INCREMENT pair for each array

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

@@ -829 +829 @@
 
   scanNum_ = NSCAN + 1 ; // includes ZERO scan
+  //scanNum_ = NSCAN ; 
   rowNum_ = scanNum_ * ARYNM ;
   scanLen_ = SCNLEN ;
@@ -835 +836 @@
   record_->LDATA = new char[dataLen_] ;
 
+  initArray();
+
   show() ;
 

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

@@ -83 +83 @@
   // fill header information
   virtual int fillHeader( int sameEndian ) ;
+
+  // return ARRAYMAX
+  virtual int arrayMax() { return NRO_ARYMAX; } ;
 } ;
 

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

@@ -579 +579 @@
   if ( rxname.find("MULT2") != string::npos ) {
     string arryt = string( record->ARRYT ) ;
-    beamno = dataset_->getArrayId( arryt ) ;
+    beamno = dataset_->getSortedArrayId( arryt ) ;
     ifno = 0 ;
   }
@@ -585 +585 @@
     beamno = 0 ;
     string arryt = string( record->ARRYT ) ;
-    ifno = dataset_->getArrayId( arryt ) ;
+    ifno = dataset_->getSortedArrayId( arryt ) ;
   }
   //cout << "beamno = " << beamno << endl ;