Frequency bundling introduced

Kernel/Applications/Makefile.am

@@ -1,11 +1,12 @@
 
-bin_PROGRAMS = load_bits
+bin_PROGRAMS = load_bits digihdr
 
 check_PROGRAMS = test_Input test_Unpack
 
 load_bits_SOURCES = load_bits.C
 test_Input_SOURCES = test_Input.C
 test_Unpack_SOURCES = test_Unpack.C
+digihdr_SOURCES = digihdr.C
 
 if HAVE_sigproc
   check_PROGRAMS += sigproc_header

Kernel/Applications/digihdr.C

@@ -6,6 +6,7 @@
  ***************************************************************************/
 
 #include <iostream>
+#include <unistd.h>
 
 #include "dsp/File.h"
 #include "TextInterface.h"

Kernel/Classes/BitUnpacker.C

@@ -59,33 +59,30 @@ void dsp::BitUnpacker::unpack ()
 
   // Step through the array in small block sizes so that the matrix
   // transpose (for nchan>1 case) remains cache-friendly.
-  const unsigned blockdat = npol*nchan*ndim > 32 ? npol*nchan*ndim : 32;
+  const unsigned blockdat = npol*nchan*ndim*8/nbit > 32 ? npol*nchan*ndim*8/nbit : 32;
   const unsigned blockbytes = blockdat*nbit/8;
 
   const unsigned char* iptr = input->get_rawptr();
 
   for (uint64_t idat=0; idat<ndat; idat+=blockdat, iptr+=blockbytes)
   {
     unsigned offset = 0;
-    const unsigned ndatblock = (blockdat>(ndat-idat)) ? ndat-idat : blockdat;
+    const unsigned ndatblock = (blockdat>(ndat-idat)) ? ndat-idat : blockdat/nskip;
     for (unsigned ichan=0; ichan<nchan; ichan++)
     {
       for (unsigned ipol=0; ipol<npol; ipol++)
       {
         for (unsigned idim=0; idim<ndim; idim++)
         {
-          //offset = idim + ipol*ndim + ichan*npol*ndim;
-          //const unsigned char* from = input->get_rawptr() + offset;
           const unsigned char* from = iptr + offset;
           float* into = output->get_datptr (ichan, ipol) + ndim*idat + idim;
           unsigned long* hist = get_histogram (offset);
-   
+
 #ifdef _DEBUG
           cerr << "c=" << ichan << " p=" << ipol << " d=" << idim << endl;
 #endif
 
           unpack (ndatblock, from, nskip, into, fskip, hist);
-          //unpack (ndat, from, nskip, into, fskip, hist);
           offset ++;
         }
       }

Kernel/Classes/DummyFile.C

@@ -56,6 +56,12 @@ void dsp::DummyFile::open_file (const char* filename)
 
   // Read obs info from ASCII file
   info = new ASCIIObservation(header);
+
+  // cannot load less than a byte. set the time sample resolution accordingly
+  unsigned bits_per_byte = 8;
+  resolution = bits_per_byte / get_info()->get_nbit();
+  if (resolution == 0)
+    resolution = 1;
 }
 
 void dsp::DummyFile::close ()

Kernel/Classes/MultiFile.C

@@ -17,7 +17,7 @@
 
 using namespace std;
 
-dsp::MultiFile::MultiFile () : File ("MultiFile")
+dsp::MultiFile::MultiFile (const char* name) : File (name)
 {
   test_contiguity = true;
   current_index = 0;

Kernel/Classes/Multiplex.C

@@ -1,7 +1,7 @@
 //-*-C++-*-
 /***************************************************************************
  *
- *   Copyright (C) 2009
+ *   Copyright (C) 2009 by Jonathon Kocz
  *   Licensed under the Academic Free License version 2.1
  *
  ***************************************************************************/
@@ -18,7 +18,7 @@
 
 using namespace std;
 
-dsp::Multiplex::Multiplex () : MultiFile ()
+dsp::Multiplex::Multiplex () : MultiFile ( "Multiplex" )
 {
   //current_index = 0;
 }

Kernel/Classes/ObservationInterface.C

@@ -13,6 +13,7 @@ dsp::Observation::Interface::Interface( Observation *c )
   add( &Observation::get_nchan, "nchan", "Number of frequency channels" );
   add( &Observation::get_npol,  "npol",  "Number of polarizations" );
   add( &Observation::get_ndim,  "ndim",  "Number of data dimensions" );
+  add( &Observation::get_nbit,  "nbit",  "Number of bits per datum" );
 
   add( &Observation::get_type,
        &Observation::set_type,

Kernel/Classes/dsp/MultiFile.h

@@ -27,7 +27,7 @@ namespace dsp {
   public:
 
     //! Constructor
-    MultiFile ();
+    MultiFile (const char* name = "MultiFile");
 
     //! Destructor
     virtual ~MultiFile ();

Kernel/Classes/dsp/Multiplex.h

@@ -1,16 +1,12 @@
 //-*-C++-*-
 /***************************************************************************
  *
- *   Copyright (C) 2002 by Willem van Straten
+ *   Copyright (C) 2002 by Jonathon Kocz
  *   Licensed under the Academic Free License version 2.1
  *
  ***************************************************************************/
 
-/* $Source: /cvsroot/dspsr/dspsr/Kernel/Classes/dsp/Multiplex.h,v $
-   $Revision: 1.1 $
-   $Date: 2009/09/10 01:02:34 $
-   $Author: tcaotiaafoc $ */
-
+// dspsr/Kernel/Classes/dsp/Multiplex.h
 
 #ifndef __Multiplex_h
 #define __Multiplex_h

Kernel/Formats/Unpacker_registry.C

@@ -102,6 +102,11 @@ static dsp::Unpacker::Register::Enter<dsp::GUPPIFourBit> guppi4;
 static dsp::Unpacker::Register::Enter<dsp::GUPPITwoBitCorrection> guppi2;
 #endif
 
+#if HAVE_kat
+#include "dsp/KAT7Unpacker.h"
+static dsp::Unpacker::Register::Enter<dsp::KAT7Unpacker> kat7;
+#endif
+
 #if HAVE_lofar_dal
 #include "dsp/LOFAR_DALUnpacker.h"
 static dsp::Unpacker::Register::Enter<dsp::LOFAR_DALUnpacker> lofar_dal;

Kernel/Formats/fits/FITSFile.C

@@ -154,6 +154,8 @@ void dsp::FITSFile::open_file(const char* filename)
   std::string backend_name = archive->get<Pulsar::Backend>()->get_name();
   if (backend_name == "GUPPI" || backend_name == "PUPPI")
     get_info()->set_machine("GUPPIFITS");
+  else if (backend_name == "COBALT")
+    get_info()->set_machine("COBALT");
   else
     get_info()->set_machine("FITS");
   get_info()->set_telescope(archive->get_telescope());

Kernel/Formats/fits/Makefile.am

@@ -1,12 +1,12 @@
 noinst_LTLIBRARIES = libfits.la
 
 nobase_include_HEADERS = dsp/FITSUnpacker.h dsp/FITSFile.h \
-			 dsp/GUPPIFITSUnpacker.h dsp/FITSDigitizer.h \
-             dsp/FITSOutputFile.h
+			 dsp/GUPPIFITSUnpacker.h dsp/FITSDigitizer.h 
+             #dsp/FITSOutputFile.h
 
 libfits_la_SOURCES = FITSUnpacker.C GUPPIFITSUnpacker.C \
-		     FITSFile.C fits_params.h FITSDigitizer.C\
-             FITSOutputFile.C
+		     FITSFile.C fits_params.h FITSDigitizer.C
+             #FITSOutputFile.C
 
 #############################################################################
 #

Kernel/Formats/gmrt/GMRTFile.C

@@ -133,18 +133,22 @@ void dsp::GMRTFile::open_file (const char* filename)
 
   fd = open_read_header (filename, &header, &block);
 
-  cerr << "n_ds = " << header.n_ds << endl;
-  cerr << "n_chan = " << header.n_chan << endl;
-  cerr << "i_chan = " << block.FreqChanNo << endl;
+  if (verbose) {
+   cerr << "n_ds = " << header.n_ds << endl;
+   cerr << "n_chan = " << header.n_chan << endl;
+   cerr << "i_chan = " << block.FreqChanNo << endl;
+  }
 
   get_info()->set_nbit (8);
 
   double bw = header.ch_bw * header.band_dir;
   get_info()->set_bandwidth (bw);
   get_info()->set_centre_frequency (header.rf + (block.FreqChanNo + 0.5) * bw);
 
-  cerr << "cf = " << get_info()->get_centre_frequency() << endl;
-  cerr << "bw = " << bw << endl;
+  if (verbose) {
+   cerr << "cf = " << get_info()->get_centre_frequency() << endl;
+   cerr << "bw = " << bw << endl;
+  }
 
   get_info()->set_npol(2);
   get_info()->set_state (Signal::Analytic);
@@ -154,18 +158,22 @@ void dsp::GMRTFile::open_file (const char* filename)
   epoch += block.ipts1 / get_info()->get_rate();
 
   get_info()->set_start_time( epoch );
-  cerr << "MJD = " << get_info()->get_start_time() << endl;
-  cerr << "telescope = " << header.telescope << endl;
+  if (verbose) {
+   cerr << "MJD = " << get_info()->get_start_time() << endl;
+   cerr << "telescope = " << header.telescope << endl;
+  }
   get_info()->set_telescope (header.telescope);
 
   get_info()->set_source (header.psr_name);
 
   header_bytes = sizeof(struct gmrt_params);
 
-  cerr << "totalsize=" << block.totalsize << endl;
-  cerr << "NPtsSend=" << block.NPtsSend << endl;
-  cerr << "overlap=" << header.overlap << endl;
-  cerr << "n_samp_dump=" << header.n_samp_dump << endl;
+  if (verbose) {
+   cerr << "totalsize=" << block.totalsize << endl;
+   cerr << "NPtsSend=" << block.NPtsSend << endl;
+   cerr << "overlap=" << header.overlap << endl;
+   cerr << "n_samp_dump=" << header.n_samp_dump << endl;
+  }
 
   block_header_bytes = sizeof(struct data2rcv);
   //block_tailer_bytes = header.overlap * 4;