filename updates for leap dada writer and baseband multithread writer

psrdada_cpp/effelsberg/edd/src/dada_disk_sink_leap.cpp

@@ -55,6 +55,17 @@ bool DiskSinkLeap::operator()(RawBytes& block)
   }
   std::size_t heap_size = HEAP_SIZE;
   int fstart = 1340;
+  std::string date;
+  std::stringstream ss;
+  ss << _start_time;
+  date = ss.str();
+  std::string str2("-");
+  date.replace(date.find(str2),str2.length(),"");
+  date.replace(date.find(str2),str2.length(),"");
+  std::string filename;
+  std::stringstream xx;
+  xx << _start_time;
+  filename = xx.str();
   std::size_t nheap_groups = block.used_bytes() / heap_size / _nchan;
   _transpose.resize(block.used_bytes());
   #pragma omp parallel for num_threads(_nchan)
@@ -75,7 +86,7 @@ bool DiskSinkLeap::operator()(RawBytes& block)
     ascii_header_set(_loop_header, "OBS_OFFSET", "%ld", _counter);
     ascii_header_set(_loop_header, "FILE_SIZE", "%ld", 640000000);
     std::stringstream fname;
-    fname <<  _start_time << "_" << fstart + 16 * ii << "_" << std::setw(20) << std::setfill('0') << _counter << ".dada";
+    fname << date.substr(0, 8) <<"_EFF_"<< fstart + 16 * ii <<"/"<< filename.substr(0,19) << "_" << std::setw(16) << std::setfill('0') << _counter << ".000000.dada";
     BOOST_LOG_TRIVIAL(debug) << "filename" << fname.str();
     _output_streams[ii].open(fname.str().c_str(), std::ios::out | std::ios::app | std::ios::binary);
     _output_streams[ii].write((char*) _loop_header, HEADER_SIZE);