Changeset 3101 for trunk

Timestamp:

06/27/16 18:22:47 (8 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: No

Ready for Test: Yes

Interface Changes: Yes/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 frequency labeling for NOSTAR data. Do not apply additional (NEWSTAR specific) frequency correction if the data is NOSTAR.

Location:

trunk/external-alma/atnf/PKSIO

Files:

• NRODataset.cc (modified) (5 diffs)
• NRODataset.h (modified) (1 diff)
• NROOTFDataset.h (modified) (1 diff)

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

@@ -1404 +1404 @@
   vector<double> chcal = getCHCAL()[ib] ;
   double f0cal = getF0CAL()[ib] ;
+  //cout << "FREQ0=" << fq0 << " F0CAL=" << f0cal << endl;
   Vector<Double> freqs( ncal, fq0-f0cal ) ;
 
@@ -1409 +1410 @@
   if ( ivdef == 0 )
     factor = 1.0 / ( 1.0 - factor ) ;
+
   for ( int ii = 0 ; ii < ncal ; ii++ ) {
+    //double freqs_org = freqs[ii];
     freqs[ii] += fqcal[ii] ;
-    if ( ivdef == 0 ) {
-      freqs[ii] = freqs[ii] * factor + record->FQTRK * ( 1.0 - factor ) ;
-    }
-    else if ( ivdef == 1 ) {
-      freqs[ii] = freqs[ii] * ( 1.0 + factor ) - record->FQTRK * factor ;
+    if (isNewstarFormat()) {
+      if ( ivdef == 0 ) {
+        freqs[ii] = freqs[ii] * factor + record->FQTRK * ( 1.0 - factor ) ;
+      }
+      else if ( ivdef == 1 ) {
+        freqs[ii] = freqs[ii] * ( 1.0 + factor ) - record->FQTRK * factor ;
+      }
     }
 
@@ -1422 +1427 @@
     //ofs << i << " " << record->ARRYT << " " << chcal[ii] << " " << freqs[ii] << " " << record->ISCAN << " " << fqcal[ii] << " " << f0cal << " " << record->FQTRK << " " << vel << endl ; 
     //ofs.close() ;
+//    cout << setprecision(16) ;
+//    cout << "LOOP " << ii << " ARRAY ID=" << record->ARRYT << " CHCAL=" << chcal[ii] << " FREQS(ORG)=" << freqs_org << " FREQS=" << freqs[ii] << " ISCAN=" << record->ISCAN << " FQCAL=" << fqcal[ii] << " F0CAL=" << f0cal << " FQTRK=" << record->FQTRK << " VEL=" << vel << endl ;
 
   }
@@ -1447 +1454 @@
   }
   else {
-
-    cw = ( freqs[1] - freqs[0] ) 
-      / ( chcal[1] - chcal[0] ) ;    
+    double nchcal = static_cast<double>(chcal[1] - chcal[0]);
+    //cout << "nchcal = " << nchcal << endl;
+    double bw = freqs[1] - freqs[0];
+    //cout << "bw = " << bw << " (effective bw " << bw * (nchcal + 1.0) / nchcal << ")"<< endl;
+    cw = bw / nchcal;
+    //cout << "cw = " << cw << endl;
 
     if ( isUSB ) {
@@ -1471 +1481 @@
   frec_.define( key, f ) ;
 
+  //cout << "refpix " << v[0] << " refval " << v[1] << " increment " << v[2] << endl;
   return v ;
 }

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

@@ -90 +90 @@
   // Data initialization
   virtual void initialize() = 0 ;
+
+  // whether data is NEWSTAR or not
+  virtual bool isNewstarFormat() const {return true;}
 
   // open file

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

@@ -77 +77 @@
   virtual void initialize() ;
 
+  // this is NOSTAR data
+  virtual bool isNewstarFormat() const {return false;}
+
  protected:
   // fill header information