build bug fix

psrdada_cpp/effelsberg/edd/EDDRoach_merge.hpp

@@ -39,7 +39,7 @@ public:
 private:
     std::size_t _nsamps_per_heap;
     std::size_t _nchunck;
-    int _nthreads,	
+    int _nthreads;	
     DadaWriteClient& _writer;
 };
 

psrdada_cpp/effelsberg/edd/src/EDDRoach.cpp

@@ -9,44 +9,44 @@ namespace psrdada_cpp {
 namespace effelsberg {
 namespace edd {
 
-	uint64_t interleave(uint32_t x, uint32_t y) {
-  	__m128i xvec = _mm_cvtsi32_si128(x);
+uint64_t interleave(uint32_t x, uint32_t y) {
+	__m128i xvec = _mm_cvtsi32_si128(x);
 	__m128i yvec = _mm_cvtsi32_si128(y);
- 	__m128i interleaved = _mm_unpacklo_epi8(yvec, xvec);
-	  return _mm_cvtsi128_si64(interleaved);
-	}
+	__m128i interleaved = _mm_unpacklo_epi8(yvec, xvec);
+	return _mm_cvtsi128_si64(interleaved);
+}
 
-    EDDRoach::EDDRoach(std::size_t nsamps_per_heap, std::size_t npol, DadaWriteClient& writer)
-    : _nsamps_per_heap(nsamps_per_heap)
-    , _npol(npol)
-    , _writer(writer)
-    {
-    }
+EDDRoach::EDDRoach(std::size_t nsamps_per_heap, std::size_t npol, DadaWriteClient& writer)
+	: _nsamps_per_heap(nsamps_per_heap)
+	, _npol(npol)
+	, _writer(writer)
+{
+}
 
-    EDDRoach::~EDDRoach()
-    {
-    }
+EDDRoach::~EDDRoach()
+{
+}
 
-    void EDDRoach::init(RawBytes& block)
-    {
-        RawBytes& oblock = _writer.header_stream().next();
-        if (block.used_bytes() > oblock.total_bytes())
+void EDDRoach::init(RawBytes& block)
+{
+	RawBytes& oblock = _writer.header_stream().next();
+	if (block.used_bytes() > oblock.total_bytes())
 	{
-	    _writer.header_stream().release();
-	    throw std::runtime_error("Output DADA buffer does not have enough space for header");
+		_writer.header_stream().release();
+		throw std::runtime_error("Output DADA buffer does not have enough space for header");
 	}
-        std::memcpy(oblock.ptr(), block.ptr(), block.used_bytes());
-        char buffer[1024];
+	std::memcpy(oblock.ptr(), block.ptr(), block.used_bytes());
+	char buffer[1024];
 	ascii_header_get(block.ptr(), "SAMPLE_CLOCK_START", "%s", buffer);
 	std::size_t sample_clock_start = std::strtoul(buffer, NULL, 0);
 	ascii_header_get(block.ptr(), "CLOCK_SAMPLE", "%s", buffer);
 	long double sample_clock = std::strtold(buffer, NULL);
 	ascii_header_get(block.ptr(), "SYNC_TIME", "%s", buffer);
 	long double sync_time = std::strtold(buffer, NULL);
-        BOOST_LOG_TRIVIAL(debug) << "this is sample_clock_start "<< sample_clock_start;
-        BOOST_LOG_TRIVIAL(debug)<< "this is sample_clock "<< sample_clock;
-        BOOST_LOG_TRIVIAL(debug) << "this is sync_time "<< sync_time;
-	BOOST_LOG_TRIVIAL(debug) << "this is sample_clock_start / sample_clock "<< sample_clock_start / sample_clock;
+	BOOST_LOG_TRIVIAL(debug) << "this is sample_clock_start " << sample_clock_start;
+	BOOST_LOG_TRIVIAL(debug) << "this is sample_clock " << sample_clock;
+	BOOST_LOG_TRIVIAL(debug) << "this is sync_time " << sync_time;
+	BOOST_LOG_TRIVIAL(debug) << "this is sample_clock_start / sample_clock " << sample_clock_start / sample_clock;
 	long double unix_time = sync_time + (sample_clock_start / sample_clock);
 	long double mjd_time = unix_time / 86400 - 40587.5;
 	char time_buffer[80];
@@ -60,37 +60,37 @@ namespace edd {
 	std::stringstream utc_time_stamp;
 	BOOST_LOG_TRIVIAL(debug) << "unix_time" << unix_time;
 	BOOST_LOG_TRIVIAL(debug) << "fractional part " << fractpart;
-        //BOOST_LOG_TRIVIAL(debug) << "fractional part ." << static_cast<std::size_t>(fractpart*10000000000);
-        //utc_time_stamp<< time_buffer << "." <<fractpart;
-	utc_time_stamp<< time_buffer << "." << std::setw(10) << std::setfill('0') << std::size_t(fractpart*10000000000) << std::setfill(' ');
+	//BOOST_LOG_TRIVIAL(debug) << "fractional part ." << static_cast<std::size_t>(fractpart*10000000000);
+	//utc_time_stamp<< time_buffer << "." <<fractpart;
+	utc_time_stamp << time_buffer << "." << std::setw(10) << std::setfill('0') << std::size_t(fractpart * 10000000000) << std::setfill(' ');
 	//BOOST_LOG_TRIVIAL(debug) << "fractional part" <<static_cast<std::size_t>(fractpart * 10000000000);
 	//utc_time_stamp<< time_buffer << "." << static_cast<std::size_t>(fractpart * 10000000000);
-	BOOST_LOG_TRIVIAL(info) << "this is start time in utc "<< utc_time_stamp.str().c_str()<< "\n";
+	BOOST_LOG_TRIVIAL(info) << "this is start time in utc " << utc_time_stamp.str().c_str() << "\n";
 //	std::cout << "this is sync_time MJD "<< mjd_time<< "\n";
 	ascii_header_set(oblock.ptr(), "UTC_START", "%s", utc_time_stamp.str().c_str());
 	ascii_header_set(oblock.ptr(), "UNIX_TIME", "%Lf", unix_time);
 	oblock.used_bytes(oblock.total_bytes());
-        _writer.header_stream().release();
-    }
+	_writer.header_stream().release();
+}
 
-    bool EDDRoach::operator()(RawBytes& block)
-    {
+bool EDDRoach::operator()(RawBytes& block)
+{
 //	std:size_t nheap_groups = block.used_bytes()/_npol/_nsamps_per_heap;
-/**
-        if (block.used_bytes() < block.total_bytes())
-        {
-            BOOST_LOG_TRIVIAL (debug) << "Reach end of data";
-            _writer.data_stream().next();
-            _writer.data_stream().release();
-            return true;
-        }
-**/
+	/**
+	        if (block.used_bytes() < block.total_bytes())
+	        {
+	            BOOST_LOG_TRIVIAL (debug) << "Reach end of data";
+	            _writer.data_stream().next();
+	            _writer.data_stream().release();
+	            return true;
+	        }
+	**/
 	RawBytes& oblock = _writer.data_stream().next();
 	std::memcpy(oblock.ptr(), block.ptr(), block.used_bytes());
 	oblock.used_bytes(block.used_bytes());
 	_writer.data_stream().release();
-        return false;
-    }
+	return false;
+}
 }//edd
 }//effelsberg
 }//psrdada_cpp