Changeset 2758 for trunk

Timestamp:

02/04/13 18:22:22 (11 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CAS-4770

Ready for Test: Yes

Interface Changes: No

What Interface Changed: Please list interface changes

Test Programs: test_sdcal2

Put in Release Notes: Yes/No?

Module(s): Module Names change impacts.

Description: Describe your changes here...

Implemented switch to change a behavior of EdgeMarker?.
Disabled some too verbose logs.

Location:

trunk/src

Files:

• STApplyCal.cpp (modified) (3 diffs)
• STCalSkyOtfAlma.cpp (modified) (1 diff)

trunk/src/STApplyCal.cpp

@@ -265 +265 @@
   Vector<Double> ftsys;
   uInt tsysifno = getIFForTsys(ifno);
-  os_ << "tsysifno=" << tsysifno << LogIO::POST;
+  os_ << "tsysifno=" << (Int)tsysifno << LogIO::POST;
   if (tsystable_.size() == 0) {
     os_.origin(LogOrigin("STApplyTable", "doapply", WHERE));
@@ -323 +323 @@
   Vector<Float> tmpTsys;
   if (doTsys) {
-    os_ << "doTsys" << LogIO::POST;
+    //os_ << "doTsys" << LogIO::POST;
     timeTsys.resize(nrowTsys);
     tsys.resize(nchanTsys, nrowTsys);
@@ -356 +356 @@
   Vector<Float> on;
   for (uInt i = 0; i < rows.nelements(); i++) {
-    os_ << "start i = " << i << " (row = " << rows[i] << ")" << LogIO::POST;
+    //os_ << "start i = " << i << " (row = " << rows[i] << ")" << LogIO::POST;
     uInt irow = rows[i];
 

trunk/src/STCalSkyOtfAlma.cpp

@@ -35 +35 @@
 
   // Detect edges using EdgeMarker
-  EdgeMarker marker(false); // generic (non-raster) scan pattern
-  marker.setdata(scantable_, True);  // we can set insitu=True since we only need 
-                            // a list of rows to be marked. No marking is 
-                            // done here.
+  EdgeMarker marker(israster_); 
+
+  // we can set insitu=True since we only need 
+  // a list of rows to be marked. No marking is 
+  // done here.
+  marker.setdata(scantable_, True);  
   marker.setoption(options_);
   marker.detect();