Changeset 3079 for trunk

Timestamp:

11/25/15 15:36:30 (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...

Make STMath warning free.

File:

• trunk/src/STMath.cpp (modified) (10 diffs)

trunk/src/STMath.cpp

@@ -15 +15 @@
 #include <sstream>
 #include <iostream>
+#include <limits.h>
 
 #include <casa/iomanip.h>
@@ -2057 +2058 @@
   for (uInt i=0; i < tab.nrow(); ++i ) {
     if (in->isAllChannelsFlagged(i)) {
-      out.push_back(NAN);
+      out.push_back(static_cast<int>(NAN));
     } else {
       Vector<Float> spec; specCol.get(i, spec);
@@ -3427 +3428 @@
       for ( uInt ifreq = 0 ; ifreq < freqid[itable].size() ; ifreq++ ) {
         double minf = iffreq[itable][2*ifreq] ;
-        uInt groupid ;
+        uInt groupid = UINT_MAX;
         for ( uInt igrp = 0 ; igrp < freqgrp.size() ; igrp++ ) {
           vector<uInt> memberlist = freqgrp[igrp] ;
@@ -3434 +3435 @@
             break ;
           }
+        }
+        if (groupid == UINT_MAX) {
+          LogIO os(LogOrigin("STMath", "new_average", WHERE));
+          os << LogIO::WARN << "frequency grouping may be failed. set to 0" << LogIO::POST;
+          groupid = 0;
         }
         groups[itable][ifreq] = groupid ;
@@ -3494 +3500 @@
 
       // update MAIN
-      for ( uInt irow = 0 ; irow < newin[itable]->nrow() ; irow++ ) {
+      for ( Int irow = 0 ; irow < newin[itable]->nrow() ; irow++ ) {
         uInt groupid = groups[itable][oldFreqId[irow]] ;
         newFreqId[irow] = groupid ;
@@ -3991 +3997 @@
                               const vector< CountedPtr<Scantable> >& sky,
                               const vector< CountedPtr<Scantable> >& hot,
-                              const vector< CountedPtr<Scantable> >& cold,
+                              const vector< CountedPtr<Scantable> >& /*cold*/,
                               const Vector<uInt> &rows )
 {
@@ -4026 +4032 @@
   Block<uInt> flagchan( spsize ) ;
   uInt nflag = 0 ;
-  for ( int irow = 0 ; irow < rows.nelements() ; irow++ ) {
+  for ( size_t irow = 0 ; irow < rows.nelements() ; irow++ ) {
     double reftime = timeCol.asdouble(*p) ;
     ids = getRowIdFromTime( reftime, timeSkyS ) ;
@@ -4079 +4085 @@
                           const CountedPtr<Scantable>& sky,
                           const CountedPtr<Scantable>& hot,
-                          const CountedPtr<Scantable>& cold,
+                          const CountedPtr<Scantable>& /*cold*/,
                           const Vector<uInt> &rows )
 {
@@ -4104 +4110 @@
   Block<uInt> flagchan( spsize ) ;
   uInt nflag = 0 ;
-  for ( int irow = 0 ; irow < rows.nelements() ; irow++ ) {
+  for ( size_t irow = 0 ; irow < rows.nelements() ; irow++ ) {
     double reftime = timeCol.asdouble(*p) ;
     ids = getRowIdFromTime( reftime, timeSky ) ;
@@ -4242 +4248 @@
   delete timeCol ;
   Vector<Double> interval = s->integrCol_.getColumn() ;
-  uInt nrow = timeVec.nelements() ;
+  //uInt nrow = timeVec.nelements() ;
   uInt outrow = 0 ;