Changeset 2652 for trunk

Timestamp:

09/28/12 11:06:32 (12 years ago)

Author:

Malte Marquarding

Message:

Fix for SDFITS part of issue #279: always limit to npol=2 if npol>2

File:

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

trunk/src/STWriter.cpp

@@ -161 +161 @@
   nPol = 0;nChan = 0; havexpol = False;
   for (uint i=0;i<ifs.size();++i) {
-    nPol(ifs[i]) = inst->npol();
+    if ( inst->npol() > 2 ) {
+      havexpol(ifs[i]) = True;      
+      nPol(ifs[i]) = 2;
+    } else {
+      nPol(ifs[i]) = inst->npol();
+    }
     nChan(ifs[i]) = inst->nchan(ifs[i]);
-    havexpol(ifs[i]) = nPol(ifs[i]) > 2;
   }
 //   Vector<String> obstypes(2);
@@ -222 +226 @@
         while(!typeit.pastEnd() ) {
           Table ttable = typeit.table() ;
-          TableIterator ifit(ttable, "IFNO", TableIterator::Ascending, TableIterator::HeapSort);
+          TableIterator ifit(ttable, "IFNO", 
+                             TableIterator::Ascending, TableIterator::HeapSort);
           MDirection::ScalarColumn dirCol(ctable, "DIRECTION");
           pksrec.direction = dirCol(0).getAngle("rad").getValue();
@@ -241 +246 @@
             inst->frequencies().getEntry(crpix,crval, pksrec.freqInc,
                                          rec.asuInt("FREQ_ID"));
-            inst->focus().getEntry(pksrec.parAngle, pksrec.focusAxi, pksrec.focusTan,
+            inst->focus().getEntry(pksrec.parAngle, pksrec.focusAxi, 
+                                   pksrec.focusTan,
                                    pksrec.focusRot, tmp0,tmp1,tmp2,tmp3,tmp4,
                                    rec.asuInt("FOCUS_ID"));
@@ -284 +290 @@
               }
             }
-            //LogIO os ;
-            //os << "npol = " << npol << " pksrec.tcal = " << pksrec.tcal << LogIO::POST ;
-            
             pksrec.mjd       = rec.asDouble("TIME");
             pksrec.interval  = rec.asDouble("INTERVAL");