Changeset 2295 for trunk/src

Timestamp:

09/12/11 19:53:07 (13 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: No

Ready for Test: Yes

Interface Changes: No

What Interface Changed: sd regressions, test_sdsave

Test Programs: List test programs

Put in Release Notes: Yes/No

Module(s): Module Names change impacts.

Description: Describe your changes here...

Bug fix: support the case that TCAL_SPECTRUM exists but empty.

File:

• trunk/src/MSFiller.cpp (modified) (4 diffs)

trunk/src/MSFiller.cpp

@@ -272 +272 @@
     isWeather = False ;
     isSysCal = False ;
+    isTcal = False ;
     cycleNo = 0 ;
     numSysCalRow = 0 ;
@@ -687 +688 @@
   {
     isSysCal = True ;
+    isTcal = True ;
     syscalRecord = r ;
+    if ( syscalRecord.nfields() == 0 )
+      isTcal = False ;
 
     const TableDesc &desc = sctab.tableDesc() ;
@@ -1208 +1212 @@
   {
     // return 0 if no SysCal table
-    if ( !isSysCal ) {
+    if ( !isSysCal or !isTcal ) {
       return Block<uInt>( 4, 0 ) ;
     }
@@ -1266 +1270 @@
   Vector<Double> weatherInterval;
   Bool isSysCal;
+  Bool isTcal;
   Record syscalRecord;
   //map< String,Vector<uInt> > syscalRecord;