Add a vlba_print_headers, and add some options to the existing

*_print_headers utilities.


git-svn-id: svn+ssh://jop91.astron.nl/auto/home/jive_cvs/SOFTC/svn/trunk/sfxc@1711 5736e3ea-d426-0410-8aaf-93e336ac3372

Author: keimpema

utils/Makefile.am

@@ -11,6 +11,7 @@ pkginclude_HEADERS = *.h *.py
 bin_PROGRAMS = mark5a_print_headers \
                mark5b_print_headers \
                vdif_print_headers \
+               vlba_print_headers \
                print_new_output_format \
                extract_channelizer
 
@@ -59,8 +60,6 @@ vdif_print_headers_SOURCES = \
 
 mark5a_print_headers_SOURCES = \
   mark5a_print_headers.cc \
-  ../src/log_writer.cc \
-  ../src/log_writer_cout.cc \
   ../src/data_reader.cc \
   ../src/data_reader_file.cc \
   ../src/data_reader_blocking.cc  \
@@ -72,6 +71,18 @@ mark5a_print_headers_SOURCES = \
   ../src/control_parameters.cc \
   ../src/correlator_time.cc
 
+vlba_print_headers_SOURCES = \
+  vlba_print_headers.cc \
+  ../src/data_reader.cc \
+  ../src/data_reader_file.cc \
+  ../src/data_reader_blocking.cc  \
+  ../src/input_data_format_reader.cc \
+  ../src/vlba_reader.cc \
+  ../src/vlba_header.cc \
+  ../src/channel_extractor_5.cc \
+  ../src/utils.cc \
+  ../src/control_parameters.cc \
+  ../src/correlator_time.cc
 
 produce_html_plotpage_SOURCES = \
   produce_html_plotpage.cc \

utils/mark5a_print_headers.cc

@@ -117,40 +117,91 @@ void get_input_node_parameters(Input_node_parameters &param, Mark5a_reader::Data
   param.track_bit_rate = 1;
 }
 
+void usage(char *filename){
+  std::cout << "Usage : " << filename << " [OPTIONS] <filename>\n"
+            << "Options : -n <number>, Only print <number> timestamps\n"
+            << "          -y <YEAR>, the year in which the recording was made\n";
+}
+
+void parse_arguments(int argc, char *argv[], char **filename, int *n_time_stamps, int *year){
+  int c;
+  *n_time_stamps = -1;
+  *year = 0;
+    
+  while ((c = getopt (argc, argv, "n:y:")) != -1){
+    bool error = false;
+    char *next;
+
+    switch (c){
+    case 'n':
+      next = optarg;
+      *n_time_stamps = strtol(optarg, &next, 10);
+      error = (next == optarg);
+     break;
+    case 'y':
+      next = optarg;
+      *year = strtol(optarg, &next, 10);
+      error = (next == optarg);
+      break;
+    case '?':
+      std::cerr << "Error : Invalid option, " << (char)optopt << "\n";
+      usage(argv[0]);
+      exit(1);
+    }
+    if (error){
+      std::cerr << "Error : invalid parameter\n";
+      exit(1);
+    }
+  }
+  if(argc - optind != 1){
+    std::cerr << "Invalid number of arguments\n";
+    usage(argv[0]);
+    exit(1);
+  }
+  *filename = argv[optind];
+}
+
+boost::shared_ptr< Data_memory_pool > memory_pool_(new Data_memory_pool(10));
+
 int main(int argc, char *argv[]) {
 #ifdef SFXC_PRINT_DEBUG
   RANK_OF_NODE = 0;
 #endif
+  int n_time_stamps=-1, year=0;
+  char *filename; 
 
-  Log_writer_cout log_writer(0);
+  parse_arguments(argc, argv, &filename, &n_time_stamps, &year);
 
-  if (argc != 2) {
-    log_writer << "usage: " << argv[0] << " <mark5a-file>" << std::endl;
-    return 1;
+  Time ref_time;
+  if (year > 0){
+    int y = year + 4799;
+    int mjd_year = 365*y + (y/4) - (y/100) + (y/400) - 2431738.5; 
+    ref_time.set_time(mjd_year, 0);
   }
 
   Mark5a_reader::Data_frame data;
-  boost::shared_ptr< Data_memory_pool > memory_pool_(new Data_memory_pool(10));
   data.buffer = memory_pool_->allocate();
 
   Input_node_parameters param;
-  get_input_node_parameters(param, data, argv[1]);
+  get_input_node_parameters(param, data, filename);
 
-  boost::shared_ptr<Data_reader> reader(new Data_reader_file(argv[1]));
-  Mark5a_reader *mark5a_reader = new Mark5a_reader(reader, Time(0));
+  boost::shared_ptr<Data_reader> reader(new Data_reader_file(filename));
+  Mark5a_reader *mark5a_reader = new Mark5a_reader(reader, ref_time);
   mark5a_reader->set_parameters(param);
 
   while ((!mark5a_reader->open_input_stream(data)) && (!mark5a_reader->eof()))
     ;
-  int64_t prev_time = (int64_t)mark5a_reader->get_current_time().get_time_usec(), current_time;
 
+  int n = 0;
+  int64_t prev_time = (int64_t)mark5a_reader->get_current_time().get_time_usec(), current_time;
   do {
     current_time = (int64_t)mark5a_reader->get_current_time().get_time_usec();
     std::cout
     << current_time
+    << " \t" << mark5a_reader->get_current_time()
     << " \t" << current_time - prev_time
     << std::endl;
     prev_time = current_time;
-  } while (mark5a_reader->read_new_block(data));
+  } while ((++n != n_time_stamps) && (mark5a_reader->read_new_block(data)));
 
 }

utils/mark5b_print_headers.cc

@@ -26,23 +26,71 @@ void find_first_header(FILE *infile){
  fseek(infile, -4, SEEK_CUR);
 }
 
+void usage(char *filename){
+  std::cout << "Usage : " << filename << " [OPTIONS] <filename>\n"
+            << "Options : -n <number>, Only print <number> timestamps\n"
+            << "          -y <YEAR>, the year in which the recording was made\n";
+}
+
+void parse_arguments(int argc, char *argv[], char **filename, int *n_time_stamps, int *year){
+  int c;
+  *n_time_stamps = -1;
+  *year = 0;
+    
+  while ((c = getopt (argc, argv, "n:y:")) != -1){
+    bool error = false;
+    char *next;
+
+    switch (c){
+    case 'n':
+      next = optarg;
+      *n_time_stamps = strtol(optarg, &next, 10);
+      error = (next == optarg);
+     break;
+    case 'y':
+      next = optarg;
+      *year = strtol(optarg, &next, 10);
+      error = (next == optarg);
+      break;
+    case '?':
+      std::cerr << "Error : Invalid option, " << (char)optopt << "\n";
+      usage(argv[0]);
+      exit(1);
+    }
+    if (error){
+      std::cerr << "Error : invalid parameter\n";
+      exit(1);
+    }
+  }
+  if(argc - optind != 1){
+    std::cerr << "Invalid number of arguments\n";
+    usage(argv[0]);
+    exit(1);
+  }
+  *filename = argv[optind];
+}
+
+
 // Prints the timestamps in the headers of a mark5b file
 int main(int argc, char *argv[]) {
-  if (argc != 2) {
-    std::cout << "usage: " << argv[0] << " <mark5b-file>" << std::endl;
-    return 1;
-  }
+  int n_time_stamps=-1, year=0;
+  char *filename; 
+
+  parse_arguments(argc, argv, &filename, &n_time_stamps, &year);
 
-  FILE *infile = fopen(argv[1], "r");
+  FILE *infile = fopen(filename, "r");
   if(infile == NULL){
-    std::cout << "Could not open " << argv[1] << " for reading.\n";
+    std::cout << "Could not open " << filename << " for reading.\n";
     return 1;
   }
 
   find_first_header(infile);
   int header[4];
   int bytes_read = fread(&header[0], 1, MARK5B_HEADER_SIZE, infile);
+  int n=0;
   while(bytes_read == MARK5B_HEADER_SIZE){
+    if (n++ == n_time_stamps)
+      break; 
     if (header[0] != SYNCWORD){
       std::cout << "Invalid header\n";
     }else{
@@ -63,6 +111,15 @@ int main(int argc, char *argv[]) {
         subsec += ((header[3]&mask) >> b) * mul;
         mask = mask << 4;
       }
+      // If a year is given then compute the full MJD
+      if (year > 0){
+        int y = year + 4799;
+        int mjd_year = 365*y + (y/4) - (y/100) + (y/400) - 2431738.5; 
+        if (mjd >= mjd_year%1000)
+          mjd = mjd_year + mjd - mjd_year%1000;
+        else
+          mjd = mjd_year + mjd - mjd_year%1000 + 1000;
+      }
       char time_string[80];
       sprintf(time_string, "%02d:%02d:%02d.%d", sec/(60*60), (sec%(60*60))/60, sec%60, subsec);
       std::cout << "mjd = " << mjd << ", sec = " << sec << ", subsec = " << subsec 

utils/vdif_print_headers.cc

@@ -46,23 +46,28 @@ void usage(char *filename){
   std::cout << "Options :\n";
   std::cout << "  -q, --quiet          Only print bad frames\n"; 
   std::cout << "  -s, --skip=N         Skip the first N frames.\n"; 
-  std::cout << "  -f, --frame-size=M   Override the frame size given in the VDIF headers..\n";
+  std::cout << "  -n, --n-frames=M     Only print the first M frames.\n"; 
+  std::cout << "  -f, --frame-size=P   Override the frame size given in the VDIF headers..\n";
 }
 
-void get_options(int argc, char*argv[], char **filename, int &frame_size, int &nskip, bool &quiet){
+void get_options(int argc, char*argv[], char **filename, int &frame_size, int &nskip, int &nframes, bool &quiet){
   int c, opt_index = 0;
   static struct option long_options[] = {
       {"help",    no_argument, 0, 'h'},
       {"frame-size",    required_argument, 0, 'f'},
       {"skip",    required_argument, 0, 's'},
+      {"nframes",  required_argument, 0, 'n'},
       {"quiet",    required_argument, 0, 'q'},
       {0, 0, 0, 0}
   };
   frame_size = 0;
   nskip = 0;
   quiet = false;
-  while( (c = getopt_long (argc, argv, "qhs:f:",  long_options, 
+  nframes = -1;
+  bool error = false;
+  while( (c = getopt_long (argc, argv, "qhs:f:n:",  long_options, 
                            &opt_index)) != -1){
+    int i;
     switch (c){
     case 'h':
       usage(argv[0]);
@@ -71,16 +76,26 @@ void get_options(int argc, char*argv[], char **filename, int &frame_size, int &n
     case 'q':
       quiet = true;
       break;
+    case 'n':
+      i = sscanf(optarg, "%d", &nframes);
+      error = (i == 0);
+      break;
     case 's':
-      sscanf(optarg, "%d", &nskip);
+      i = sscanf(optarg, "%d", &nskip);
+      error = (i == 0);
       break;
     case 'f':
-      sscanf(optarg, "%d", &frame_size);
+      i = sscanf(optarg, "%d", &frame_size);
+      error = (i == 0);
       break;
     default:
       printf ("option %s", long_options[opt_index].name);
       abort();
     }
+    if (error){
+      printf("Bad argument to option %s\n", long_options[opt_index].name);
+      abort();
+    }
   }
   if ((argc-optind) != 1) {
     std::cout << "Input file not specified\n";
@@ -168,10 +183,10 @@ int64_t find_next_valid_header(FILE *infile, Header &prev_header){
 }
 
 int main(int argc, char *argv[]) {
-  int frame_size, nskip;
+  int frame_size, nskip, nframes=-1;
   bool quiet;
   char *filename;
-  get_options(argc, argv, &filename, frame_size, nskip, quiet);
+  get_options(argc, argv, &filename, frame_size, nskip, nframes, quiet);
 
   FILE *infile = fopen(filename, "r");
   if(infile == NULL){
@@ -183,10 +198,11 @@ int main(int argc, char *argv[]) {
 
   bool eof = false;
   int invalid_nr = 0;
+  int n = 0;
   size_t data_size = 1, header_size = 0;
   bool first_header = true;
   Header prev_header;
-  while (eof == false){
+  while ((n++ != nframes) && (eof == false)){
     Header header;
     unsigned char *header_buf = (unsigned char *) &header;
     size_t nwords = fread(&header_buf[0],4,4,infile);