Changeset 2004 for trunk/src/STMath.cpp

Timestamp:

02/22/11 20:24:33 (15 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes .CAS-2718

Ready for Test: Yes

Interface Changes: 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...

The MSFiller is called instead of PKSFiller when input data is MS.
I have tested all task regressions as well as sdsave unit test and passed.

A few modification was needed for STMath::dototalpower() and
STWriter::write().

File:

• trunk/src/STMath.cpp (modified) (1 diff)

trunk/src/STMath.cpp

@@ -1047 +1047 @@
       if ( tcal <= 0.0 ) {
         caloff->tcal().getEntry(tcalt, tcalout, tcalId);
-        if (polno<=3) {
-          tcalUsed = tcalout[polno];
-        }
+//         if (polno<=3) {
+//           tcalUsed = tcalout[polno];
+//         }
+//         else {
+//           tcalUsed = tcalout[0];
+//         }
+        if ( tcalout.size() == 1 )
+          tcalUsed = tcalout[0] ;
+        else if ( tcalout.size() == nchan ) 
+          tcalUsed = mean(tcalout) ;
         else {
-          tcalUsed = tcalout[0];
+          uInt ipol = polno ;
+          if ( ipol > 3 ) ipol = 0 ;
+          tcalUsed = tcalout[ipol] ;
         }
       }