Changeset 2962 for trunk/src

Timestamp:

06/29/14 17:39:32 (10 years ago)

Author:

Kana Sugimoto

Message:

New Development: Yes

JIRA Issue: Yes (CAS-6590)

Ready for Test: Yes

Interface Changes: No

What Interface Changed: Please list interface changes

Test Programs: runUnitTest.main(test_sdgrid[test302])

Put in Release Notes: Yes

Module(s): asapgrid, asapgrid2, sdgrid, sdplot(plottype='grid')

Description: FLAG_ROW is set to scantable rows if all channels in the rows are flagged.

File:

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

trunk/src/STGrid.cpp

@@ -1975 +1975 @@
   ArrayColumn<Float> spectraCol( tab, "SPECTRA" ) ;
   ArrayColumn<uChar> flagtraCol( tab, "FLAGTRA" ) ;
+  ScalarColumn<uInt> flagRowCol( tab, "FLAGROW" );
   ScalarColumn<uInt> polnoCol( tab, "POLNO" ) ;
   ScalarColumn<uInt> scannoCol( tab, "SCANNO" ) ;
@@ -1989 +1990 @@
   long offset ;
   uInt scanno = 0 ;
+  uChar rflag;
   for ( Int iy = 0 ; iy < ny_ ; iy++ ) {
     pix(1) = (Double)(iy);
@@ -2002 +2004 @@
         wdata_p = data_p + offset ;
         wflag_p = flag_p + offset ;
+        rflag = ~0 ; //11111111
         for ( Int ichan = 0 ; ichan < nchan_ ; ichan++ ) {
           *wsp_p = *wdata_p ;
           wsp_p++ ;
           wdata_p += step ;
-          flag[ichan] = *wflag_p;
+          flag[ichan] = *wflag_p ;
+          rflag &= flag[ichan] ;
           wflag_p += step ;
         }
@@ -2012 +2016 @@
         spectraCol.put( irow, sp ) ;
         flagtraCol.put( irow, flag ) ;
+        flagRowCol.put( irow, ((rflag>0) ? 1 : 0) ) ;
         directionCol.put( irow, dir ) ;
         polnoCol.put( irow, pollist_[ipol] ) ;
@@ -2088 +2093 @@
     weatheridCol.put( i, weatherId ) ;
     //flagtraCol.put( i, flagtra ) ;
-    rflagCol.put( i, 0 ) ;
+    //rflagCol.put( i, 0 ) ;
     tsysCol.put( i, defaultTsys ) ;
     srcnameCol.put( i, srcname ) ;