Changeset 996 for trunk/src/STMath.cpp

Timestamp:

04/06/06 13:45:58 (18 years ago)

Author:

mar637

Message:

more fixes after compiling with -Wall.

File:

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

trunk/src/STMath.cpp

@@ -128 +128 @@
 
   for (uInt i=0; i < tout.nrow(); ++i) {
-    for ( int j=0; j < in.size(); ++j ) {
+    for ( int j=0; j < int(in.size()); ++j ) {
       const Table& tin = in[j]->table();
       const TableRecord& rec = row.get(i);
@@ -425 +425 @@
 //
 {
-  InterpolateArray1D<Double,Float>::InterpolationMethod interp;
+  //InterpolateArray1D<Double,Float>::InterpolationMethod interp;
   Int interpMethod(stringToIMethod(method));
 
@@ -621 +621 @@
   // Interpolate (and extrapolate) with desired method
 
-   //InterpolateArray1D<Double,Float>::InterpolationMethod method;
-   Int intmethod(stringToIMethod(method));
+  InterpolateArray1D<Double,Float>::InterpolationMethod interp = stringToIMethod(method);
 
    Vector<Float> yout;
    Vector<Bool> maskout;
    InterpolateArray1D<Float,Float>::interpolate(yout, maskout, xout,
-                                                xin, yin, maskin, intmethod,
+                                                xin, yin, maskin, interp,
                                                 True, True);
 
@@ -706 +705 @@
     STAttr sda;
     if (d < 0) d = sda.diameter(inst);
-    Float jyPerk = STAttr::findJyPerK(etaap, d);
+    jyperk = STAttr::findJyPerK(etaap, d);
     ostringstream oss;
     oss << "Jy/K = " << jyperk;
@@ -898 +897 @@
   STMath::invertPhase( const CountedPtr < Scantable >& in )
 {
-  applyToPol(in, &STPol::invertPhase, Float(0.0));
+  return applyToPol(in, &STPol::invertPhase, Float(0.0));
 }
 
@@ -1025 +1024 @@
   MPosition refPos = in->getAntennaPosition();
 
-  InterpolateArray1D<Double,Float>::InterpolationMethod interp;
-  Int interpMethod(stringToIMethod(method));
+  InterpolateArray1D<Double,Float>::InterpolationMethod interp = stringToIMethod(method);
   // test if user frame is different to base frame
   if ( in->frequencies().getFrameString(true)
@@ -1095 +1093 @@
         bool first = true;
         // these rows should be just be POLNO
-        for (int i=0; i<tab.nrow(); ++i) {
+        for (int i=0; i<int(tab.nrow()); ++i) {
           // input values
           Vector<uChar> flag = flagCol(i);