Changeset 2156 for trunk/external-alma/atnf

Timestamp:

04/26/11 15:29:23 (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:

Put in Release Notes: Yes/No

Module(s): Module Names change impacts.

Description: Describe your changes here...

Bug fix on TIME value: changed from start time to mid point of integration.

Location:

trunk/external-alma/atnf/PKSIO

Files:

• NRODataset.cc (modified) (1 diff)
• NRODataset.h (modified) (1 diff)
• NROFITSDataset.cc (modified) (2 diffs)
• NROFITSDataset.h (modified) (1 diff)
• NROReader.cc (modified) (1 diff)

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

@@ -602 +602 @@
 }
 
+double NRODataset::getScanTime( int i ) 
+{
+  double startTime = getStartIntTime( i ) ;
+  double interval = getIPTIM() / 86400.0 ; // [sec]->[day]
+  return startTime+0.5*interval ;
+}
+
 vector<bool> NRODataset::getIFs()
 {

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

@@ -194 +194 @@
   virtual vector<double> getStartIntTime() ;
   virtual double getStartIntTime( int i ) ;
+  virtual double getScanTime( int i ) ;
   virtual double getMJD( char *time ) ;
   virtual vector<bool> getIFs() ;

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

@@ -622 +622 @@
 //   for ( int i = 0 ; i < ARYNM ; i++ ) {
 //     if ( i == 0 ) {
-//       //cout << "RX      " ;
+//       cout << "RX      " ;
 //     }
 //     else if ( ( i % 5 ) == 0 ) {
-//       //cout << endl << "        " ;
-//     }
-//     //cout << "\'" << RX[i] << "\' " ;
+//       cout << endl << "        " ;
+//     }
+//     cout << "\'" << RX[i] << "\' " ;
 //   }
-//   //cout << endl ;
+//   cout << endl ;
   //
   if ( readColumn( HPBW, "HPBW", sameEndian ) != 0 ) {
@@ -2734 +2734 @@
 }
 
+double NROFITSDataset::getScanTime( int i ) 
+{
+  double startTime = getStartIntTime( i ) ;
+  double interval ;
+  readTable( interval, "INTEG", same_, i ) ;
+  interval /= 86400.0 ;
+  return startTime+0.5*interval ;
+}
+
 // double NROFITSDataset::toLSR( double v, double t, double x, double y ) 
 // {

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

@@ -96 +96 @@
   virtual uInt getArrayId( string type ) ;
   virtual double getStartIntTime( int i ) ;
+  virtual double getScanTime( int i ) ;
 
  protected:

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

@@ -578 +578 @@
 
   // scantime
-  scantime = Double( dataset_->getStartIntTime( irow ) ) ;
+  //scantime = Double( dataset_->getStartIntTime( irow ) ) ;
+  scantime = Double( dataset_->getScanTime( irow ) ) ;
   //cout << "scantime = " << scantime << endl ;