Changeset 2907

Timestamp:

03/21/14 05:25:31 (11 years ago)

Author:

TakTsutsumi

Message:

New Development: No

JIRA Issue: Yes CAS-6303

Ready for Test: Yes

Interface Changes: No

What Interface Changed: Please list interface changes

Test Programs: test_sdsave

Put in Release Notes: No

Module(s): Module Names change impacts.

Description: Modified the way search the FITS header keywords

allowing more random ordering.
Fixed GBTFITSreader to work for GBT SDFITS with a single
binary table and a minor fix in PKSFiller side to force
npol=1 when pksrecord.polno = -1.

Location:

trunk

Files:

• external-alma/atnf/PKSIO/GBTFITSreader.cc (modified) (1 diff)
• external-alma/atnf/PKSIO/PKSreader.cc (modified) (1 diff)
• src/PKSFiller.cpp (modified) (1 diff)

trunk/external-alma/atnf/PKSIO/GBTFITSreader.cc

@@ -1848 +1848 @@
 
   // Convert frequency reference to LSRK if GBT TOPO
-  if ( cGBT ) {
+  if ( cGBT && numHDU > 1 ) {
     char sampler[10];
     readData(SAMPLER,cRowR,sampler);

trunk/external-alma/atnf/PKSIO/PKSreader.cc

@@ -78 +78 @@
     } else {
       RegularFileIO file(name);
-      char buf[32];
-      file.read(30, buf, False);
-      buf[30] = '\0';
-      if (String(buf) == "SIMPLE  =                    T") {
-        file.seek(560);
-        file.read(26, buf, False);
-        buf[26] = '\0' ;
-        if ( String(buf) == "ORIGIN  = 'NRAO Green Bank" ) {
-          // Looks like GBT SDFITS
-          format = "GBTFITS" ;
-          reader = new PKSFITSreader("GBTFITS") ;
-        }
-        else {
-          // Looks like SDFITS.
-          format = "SDFITS";
-          reader = new PKSFITSreader("SDFITS");
-        }
+      //char buf[32];
+      char buf[80];
+      //file.read(30, buf, False);
+      file.read(80, buf, False);
+      //buf[30] = '\0';
+      //if (String(buf) == "SIMPLE  =                    T") {
+      if (String(buf).contains("SIMPLE  =                    T")) {
+        //file.seek(560);
+        //file.read(26, buf, False);
+        //buf[26] = '\0' ;
+        Int nbread=1;
+        while (nbread) {
+          nbread=file.read(80, buf, False);
+        //if ( String(buf) == "ORIGIN  = 'NRAO Green Bank" ) {
+          if ( String(buf).contains("ORIGIN  = 'NRAO Green Bank" )) {
+            // Looks like GBT SDFITS
+            format = "GBTFITS" ;
+            reader = new PKSFITSreader("GBTFITS") ;
+            break;
+          }
+          else {
+            if ( String(buf).find("END ")==0 ) {
+              // Looks like SDFITS.
+              format = "SDFITS";
+              reader = new PKSFITSreader("SDFITS");
+              break;
+            }
+          }
+        }//while loop  
        } else {
          // Assume it's MBFITS.

trunk/src/PKSFiller.cpp

@@ -326 +326 @@
     // Why is spectra.ncolumn() == 3 for haveXPol_ == True
     uInt npol = (pksrec.spectra.ncolumn()==1 ? 1: 2);
-    uInt polno =0;
+    //uInt polno =0;
+    Int polno =0;
     for ( uInt i=0; i< npol; ++i ) {
       tsysvec = pksrec.tsys(i);
       if (isGBTFITS) {
         polno = pksrec.polNo ;
+        if (polno==-1) {
+          polno = i;
+        }
       } else {
         polno = i;
       }
-      setIndex(pksrec.scanNo-1, pksrec.cycleNo-1, pksrec.IFno-1, polno,
+      setIndex(pksrec.scanNo-1, pksrec.cycleNo-1, pksrec.IFno-1, (uInt) polno,
                pksrec.beamNo-1);
       setSpectrum(pksrec.spectra.column(i), pksrec.flagged.column(i), tsysvec);