Changeset 2478 for trunk/src

Timestamp:

04/24/12 11:10:09 (13 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...

SCANNO should be same over POLNO.

File:

• trunk/src/STGrid.cpp (modified) (5 diffs)

trunk/src/STGrid.cpp

@@ -1650 +1650 @@
   ArrayColumn<Float> spectraCol( tab, "SPECTRA" ) ;
   ScalarColumn<uInt> polnoCol( tab, "POLNO" ) ;
+  ScalarColumn<uInt> scannoCol( tab, "SCANNO" ) ;
   Int irow = 0 ;
   Vector<Float> sp( nchan_ ) ;
@@ -1658 +1659 @@
   long step = nx_ * ny_ * npol_ ;
   long offset ;
+  uInt scanno = 0 ;
   for ( Int iy = 0 ; iy < ny_ ; iy++ ) {
     dir(1) = center_(1) - ( cpix(1) - (Double)iy ) * celly_ ;
@@ -1677 +1679 @@
         directionCol.put( irow, dir ) ;
         polnoCol.put( irow, pollist_[ipol] ) ;
+        scannoCol.put( irow, scanno ) ;
         irow++ ;
       }
+      scanno++ ;
     }
   }
@@ -1731 +1735 @@
   // fill columns
   Int nrow = tab.nrow() ;
-  ScalarColumn<uInt> scannoCol( tab, "SCANNO" ) ;
   ScalarColumn<uInt> ifnoCol( tab, "IFNO" ) ;
   ScalarColumn<uInt> freqIdCol( tab, "FREQ_ID" ) ;
@@ -1753 +1756 @@
   ScalarColumn<Double> intervalCol( tab, "INTERVAL" ) ;
   for ( Int i = 0 ; i < nrow ; i++ ) {
-    scannoCol.put( i, (uInt)i ) ;
     ifnoCol.put( i, (uInt)ifno_ ) ;
     freqIdCol.put( i, freqId ) ;