v* NBEAM != 0: NANTS=1

Author: radonnachie

rawspec.c

@@ -580,11 +580,11 @@ int main(int argc, char *argv[])
 
       // If first file for stem, check sizing
       if(fi == 0) {
-        if(raw_hdr.nbeams > 0) {
-          printf("Header has NBEAMS (%d), which overrides NANTS (%d)\n",
-            raw_hdr.nbeams, raw_hdr.nants
+        if(raw_hdr.nbeam != 0) {
+          printf("Header has NBEAM (%d), which indicates that the data is that of a beam, overriding NANTS (%d) with 1.\n",
+            raw_hdr.nbeam, raw_hdr.nants
           );
-          raw_hdr.nants = raw_hdr.nbeams;
+          raw_hdr.nants = 1;
         }
 
         // Verify that obsnchan is divisible by nants
@@ -1036,8 +1036,8 @@ int main(int argc, char *argv[])
           }
           break;
         }
-        if(raw_hdr.nbeams > 0) {
-          raw_hdr.nants = raw_hdr.nbeams;
+        if(raw_hdr.nbeam != 0) {
+          raw_hdr.nants = 1;
         }
       } // For each block
 

rawspec_rawutils.c

@@ -168,7 +168,7 @@ void rawspec_raw_parse_header(const char * buf, rawspec_raw_hdr_t * raw_hdr)
   raw_hdr->directio = rawspec_raw_get_s32(buf, "DIRECTIO", 0);
   raw_hdr->pktidx   = rawspec_raw_get_u64(buf, "PKTIDX",  -1);
   raw_hdr->beam_id  = rawspec_raw_get_s32(buf, "BEAM_ID", -1);
-  raw_hdr->nbeams   = rawspec_raw_get_s32(buf, "NBEAMS",  -1);
+  raw_hdr->nbeam    = rawspec_raw_get_s32(buf, "NBEAM",   -1);
   raw_hdr->nants    = rawspec_raw_get_u32(buf, "NANTS",    1);
 
   rawspec_raw_get_str(buf, "DATATYPE", "INTEGER", tmp, 80);

rawspec_rawutils.h

@@ -18,7 +18,7 @@ typedef struct {
   double dec; // degrees
   double mjd;
   int beam_id; // -1 is unknown or single beam receiver
-  int nbeams;  // -1 is unknown or single beam receiver
+  int nbeam;  // -1 is unknown or single beam receiver
   unsigned int nants;
   char src_name[81];
   char telescop[81];