Added a check to produce_html_plotpage to see whether the correlation

file is empty. We do not block then, but terminate with a message.


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

Author: kruithof

utils/baseline_info.cc

@@ -55,8 +55,13 @@ int main(int argc, char *argv[]) {
   }
 
   // read the data in
-  Fringe_info_container fringes(input);
+  Fringe_info_container fringes(input, /* stop at eof */ true);
 
+  if (fringes.eof()) {
+    std::cout << "Empty correlation file" << std::endl;
+    return 1;
+  }
+    
   std::ofstream out("baseline.txt");
   out << "# fringe_pos, phase (max), ampl (max), phase (center), ampl (center),  snr, weight" << std::endl;
 

utils/fringe_info.cc

@@ -121,10 +121,12 @@ int Fringe_info::max_value_offset() const {
 
 // Fringe_info_container
 
-Fringe_info_container::Fringe_info_container(FILE *input) : input(input) {
-  //`read-in the global header
+Fringe_info_container::
+Fringe_info_container(FILE *input, bool stop_at_eof) : input(input) {
+  // read-in the global header
   read_data_from_file(sizeof(Output_header_global),
-                      (char *)&global_header, false);
+                      (char *)&global_header, stop_at_eof);
+  if (eof()) return;
 
   data_freq.resize(global_header.number_channels+1);
   data_lag.resize(global_header.number_channels+1);
@@ -137,10 +139,14 @@ Fringe_info_container::Fringe_info_container(FILE *input) : input(input) {
 
   // Read the first timeslice header:
   read_data_from_file(sizeof(Output_header_timeslice),
-                      (char*)&last_timeslice_header, false);
+                      (char*)&last_timeslice_header, stop_at_eof);
+  if (eof()) return;
   assert(last_timeslice_header.number_baselines != 0);
 }
 
+bool Fringe_info_container::eof() {
+  return feof(input);
+}
 void
 Fringe_info_container::read_data_from_file(int to_read, char * data,
     bool stop_at_eof) {

utils/fringe_info.h

@@ -45,7 +45,7 @@ class Fringe_info_container {
   typedef Container::iterator   iterator;
 
 public:
-  Fringe_info_container(FILE *input);
+  Fringe_info_container(FILE *input, bool stop_at_eof);
 
   void read_plots(bool stop_at_eof);
 
@@ -58,6 +58,7 @@ class Fringe_info_container {
                        const Fringe_info_container &other_info,
                        bool relative_error);
 
+  bool eof();
 private:
   void read_data_from_file(int to_read, char * data, bool stop_at_eof);
 

utils/produce_html_diffpage.cc

@@ -77,11 +77,16 @@ int main(int argc, char *argv[]) {
 
 
   // read the data in
-  Fringe_info_container fringe_info1(input1);
-  Fringe_info_container fringe_info2(input2);
+  Fringe_info_container fringe_info1(input1, /* stop at eof */ true);
+  Fringe_info_container fringe_info2(input2, /* stop at eof */ true);
 
-  fringe_info1.read_plots(true);
-  fringe_info2.read_plots(true);
+  if (fringe_info1.eof() || fringe_info2.eof()) {
+    std::cout << "Empty correlation file" << std::endl;
+    return 1;
+  }
+    
+  fringe_info1.read_plots(/* stop at eof */ true);
+  fringe_info2.read_plots(/* stop at eof */ true);
 
   fringe_info1.print_diff_html(vex, fringe_info2, false);
 

utils/produce_html_plotpage.cc

@@ -127,7 +127,12 @@ int main(int argc, char *argv[]) {
 
 
   // read the data in
-  Fringe_info_container fringe_info(input);
+  Fringe_info_container fringe_info(input, !update);
+  if ((!update) && fringe_info.eof()) {
+    std::cout << "Empty correlation file" << std::endl;
+    return 1;
+  }
+    
 
   do {
     fringe_info.read_plots(!update);