Changeset 2345 for trunk

Timestamp:

11/08/11 19:03:54 (13 years ago)

Author:

WataruKawasaki

Message:

New Development: No

JIRA Issue: No

Ready for Test: Yes

Interface Changes: No

What Interface Changed:

Test Programs:

Put in Release Notes: No

Module(s): SD

Description: bugfix.

Location:

trunk/src

Files:

• STLineFinder.cpp (modified) (1 diff)
• STMath.cpp (modified) (3 diffs)

trunk/src/STLineFinder.cpp

@@ -955 +955 @@
 //   can be achieved using a spectrum mask only
 int STLineFinder::findLines(const std::vector<bool> &in_mask,
-                const std::vector<int> &in_edge,
-                const casa::uInt &whichRow) throw(casa::AipsError)
+                            const std::vector<int> &in_edge,
+                            const casa::uInt &whichRow) throw(casa::AipsError)
 {
   if (useScantable && scan.null())

trunk/src/STMath.cpp

@@ -224 +224 @@
         Vector<Double> x0 = (subt.col("DIRECTION").getArrayDouble(TableExprId(irow))) ;
         Vector<Double> x1 = rec.asArrayDouble("DIRECTION") ;
-        double dx = x0[0] - x1[0] ;
-        double dy = x0[0] - x1[0] ;
+        double dx = x0[0] - x1[0];
+        double dy = x0[1] - x1[1];
         Double dd = sqrt( dx * dx + dy * dy ) ;
         //if ( !allNearAbs((subt.col("DIRECTION").getArrayDouble(TableExprId(irow))), rec.asArrayDouble("DIRECTION"), tol ) ) {
@@ -444 +444 @@
           dircol(jrow).getAngle(Unit(String("rad"))).getValue() ;
         //if ( t[0] != direction[0] || t[1] != direction[1] ) {
-        Double dx = t[0] - direction[0] ;
-        Double dy = t[1] - direction[1] ;
-        Double dd = sqrt( dx * dx + dy * dy ) ;
+        Double dx = t[0] - direction[0];
+        Double dy = t[1] - direction[1];
+        Double dd = sqrt(dx*dx + dy*dy);
         //if ( !allNearAbs( t, direction, tol ) ) {
         if ( dd > tol &&  in->nbeam() < 2 ) {
@@ -3711 +3711 @@
   }
   
-  return out ;
+  return out;
 }