Changeset 2615 for trunk/src/EdgeMarker.cpp

Timestamp:

08/01/12 15:32:08 (12 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CAS-2825

Ready for Test: Yes

Interface Changes: No

What Interface Changed: Please list interface changes

Test Programs: not available yet

Put in Release Notes: No

Module(s): Module Names change impacts.

Description: Describe your changes here...

Logging updated. Priorities for most of the logs are changed to
DEBUGGING since those are mainly for debug use.

File:

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

trunk/src/EdgeMarker.cpp

@@ -30 +30 @@
 EdgeMarker::EdgeMarker()
 {
-  detector_ = new GenericEdgeDetector() ;
+  EdgeMarker( false ) ;
 }
 
 EdgeMarker::EdgeMarker( bool israster )
 {
-  if ( israster )
+  os_.origin(LogOrigin( "EdgeMarker", "EdgeMarker", WHERE )) ;
+
+  if ( israster ) {
+    os_ << "edge detection by RasterEdgeDetector" << LogIO::POST ;
     detector_ = new RasterEdgeDetector() ;
-  else
+  }
+  else {
+    os_ << "edge detection by GenericEdgeDetector" << LogIO::POST ;
     detector_ = new GenericEdgeDetector() ;
+  }
 }
 
@@ -63 +69 @@
 void EdgeMarker::examine()
 {
+  os_.origin(LogOrigin( "EdgeMarker", "examine", WHERE )) ;
+
   // exclude WVR
   vector<uInt> wvr ;
@@ -79 +87 @@
   }
   wvr_ = Vector<uInt>( wvr ) ;
-  os_.origin(LogOrigin( "EdgeMarker", "examine", WHERE )) ;
-  os_ << "IFNO for WVR scan: " << wvr_ << LogIO::POST ;
+
+  if ( wvr_.nelements() > 0 ) {
+    os_ << LogIO::DEBUGGING
+        << "IFNO for WVR scan: " << wvr_ << LogIO::POST ;
+  }
 }
 
@@ -104 +115 @@
     Vector<uInt> current = iter.current() ;
     Int srcType = iter.getSrcType() ;
-    os_ << "BEAMNO=" << current[0] 
-        << ",POLNO=" << current[1]
-        << ",IFNO=" << current[2]
-        << ",SRCTYPE=" << srcType << LogIO::POST ;
+    os_ << LogIO::DEBUGGING
+        << "BEAMNO=" << current[0] 
+        << " POLNO=" << current[1]
+        << " IFNO=" << current[2]
+        << " SRCTYPE=" << srcType << LogIO::POST ;
     // only process ON position and no WVR
     Vector<uInt> rows = iter.getRows( SHARE ) ;
@@ -129 +141 @@
     iter.next() ;
   }
+
+  os_ << "detected " << noff_ << " integrations near edge" << LogIO::POST ;
 }
 
 void EdgeMarker::mark()
 {
+  os_.origin(LogOrigin( "EdgeMarker", "mark", WHERE )) ;
+
+  os_ << "marked " << noff_ << " points as OFF" << LogIO::POST ;
   ScalarColumn<Int> srcTypeCol( st_->table(), "SRCTYPE" ) ;
   Int psoff = Int(SrcType::PSOFF) ;