Changeset 2869 for trunk/src

Timestamp:

12/02/13 13:31:34 (11 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CAS-5841

Ready for Test: Yes

Interface Changes: No

What Interface Changed: Please list interface changes

Test Programs: test_sdsave, test_importasdm_sd, all sd regressions

Put in Release Notes: Yes

Module(s): sd

Description: Describe your changes here...

Filler/writer are changed so that SCANNO is consistent with
SCAN_NUMBER in MS and scanNumber in ASDM.

It affects several regressions and unit tests so that tests
are necessary to be updated. This change should be verified
by the updated unit tests/regression tests.

Location:

trunk/src

Files:

• MSFiller.cpp (modified) (2 diffs)
• MSWriter.cpp (modified) (1 diff)
• Scantable.cpp (modified) (2 diffs)

trunk/src/MSFiller.cpp

@@ -1 @@
-
 //
 // C++ Interface: MSFiller
@@ -495 +494 @@
     //printf("%u: ScanNo: %d\n", recordNo, columnValue);
     // put value
-    // scan number is 1-based in MS while 0-based in Scantable
-    *scanNoRF = (uInt)columnValue - 1 ;
+    // CAS-5841: SCANNO should be consistent with MS SCAN_NUMBER
+    *scanNoRF = (uInt)columnValue ;
   }
   virtual void leaveScanNo(const uInt /*recordNo*/, Int /*columnValue*/) {

trunk/src/MSWriter.cpp

@@ -756 +756 @@
     //printf("%u: ScanNo: %u\n", recordNo, columnValue);
 
-    // put value 
-    // SCAN_NUMBER is 0-based in Scantable while 1-based in MS
-    *scanNumberRF = (Int)columnValue + 1 ;
+    // put value
+    // CAS-5841: SCANNO should be consistent with MS SCAN_NUMBER
+    *scanNumberRF = (Int)columnValue ;
   }
   virtual void leaveScanNo(const uInt /*recordNo*/, uInt /*columnValue*/) {

trunk/src/Scantable.cpp

@@ -1729 +1729 @@
     int nscan = scanlist.size();
     for (int i = 0; i < nscan; i++) {
-      Table subt = t( t.col("SCAN") == scanlist[i]+1 );
+      Table subt = t( t.col("SCAN") == scanlist[i] );
       if (subt.nrow()==0) {
         //cerr <<"Scan "<<scanlist[i]<<" cannot be found in the scantable."<<endl;
@@ -1743 +1743 @@
       if ( rec.asuInt("PROCSIZE")==2 ) {
         if ( i < nscan-1 ) {
-          Table subt2 = t( t.col("SCAN") == scanlist[i+1]+1 );
+          Table subt2 = t( t.col("SCAN") == scanlist[i+1] );
           if ( subt2.nrow() == 0) {
             LogIO os( LogOrigin( "Scantable", "checkScanInfo()", WHERE ) ) ;