- minor changes (format tabulations/spaces/...)

src/Acquisition.h

@@ -26,6 +26,7 @@
 
 namespace XiaDxp_ns
 {
+
 class Acquisition : public yat4tango::DeviceTask
 {
 public:

src/AcquisitionMapping.h

@@ -50,7 +50,6 @@ public :
     size_t m_buffer_length;
 } ;
 
-
 class AcquisitionMapping : public Acquisition
 {
 public:
@@ -99,6 +98,7 @@ private:
 
 //-------------------------------------------------------------
 /// Functor object called when reset the object AcquisitionMapping
+
 struct AcquisitionMappingTaskExiter
 {
     /// unique operator() of this functor

src/AcquisitionMca.h

@@ -25,6 +25,7 @@ const size_t MCA_STOP_MSG = yat::FIRST_USER_MSG + 300;
 
 namespace XiaDxp_ns
 {
+
 class AcquisitionMca : public Acquisition
 {
 public:
@@ -64,6 +65,7 @@ private:
 
 //-------------------------------------------------------------
 /// Functor object called when reset the object AcquisitionMca
+
 struct AcquisitionMcaTaskExiter
 {
     /// unique operator() of this functor

src/AttrView.h

@@ -29,7 +29,6 @@ namespace XiaDxp_ns
  /------------------------------------------------------------------*/
 class AttrView : public Tango::LogAdapter
 {
-
     //	typedef void (AttrView::*callback_type)(yat4tango::DynamicAttributeReadCallbackData& cbd);
 
 public:
@@ -57,10 +56,16 @@ protected:
             yat::Any user_data); //put any user data attached to this attribute
 
     /// callback methods for tango dyn attributes - NULL
-    void read_callback_null(yat4tango::DynamicAttributeReadCallbackData& cbd){/*nop*/}
+    void read_callback_null(yat4tango::DynamicAttributeReadCallbackData& cbd)
+    {
+        /*nop*/
+    }
 
     /// callback methods for tango dyn attributes - NULL
-    void write_callback_null(yat4tango::DynamicAttributeWriteCallbackData& cbd){/*nop*/}		
+    void write_callback_null(yat4tango::DynamicAttributeWriteCallbackData& cbd)
+    {
+        /*nop*/
+    }
 
     /// callback methods for common tango dyn attributes - statistics attributes
     void read_stat_callback(yat4tango::DynamicAttributeReadCallbackData& cbd);

src/AttrViewMapping.cpp

@@ -184,7 +184,8 @@ void AttrViewMapping::init(yat::SharedPtr<DataStore> data_store)
 		if(m_acquisition_mode == "MAPPING_SCA")//create sca_rois attributes in MAPPNG_SCA mode
 		{
 			for(int i = 0;i < m_nb_total_channels;i++)
-            {   m_dyn_hroi[i].resize(m_nb_rois[i]);
+			{
+				m_dyn_hroi[i].resize(m_nb_rois[i]);
 				DEBUG_STREAM << "channel_num = " << i << " : m_nb_rois = " << m_nb_rois[i] << endl;
 				for(int j = 0;j < m_nb_rois[i];j++)
 				{

src/AttrViewMapping.h

@@ -16,6 +16,7 @@
 
 namespace XiaDxp_ns
 {
+
 /*------------------------------------------------------------------
  *	class:	AttrViewMapping
  *	description: 

src/AttrViewMca.h

@@ -17,6 +17,7 @@
 
 namespace XiaDxp_ns
 {
+
 /*------------------------------------------------------------------
  *	class:	AttrViewMca
  *	description: 

src/Controller.h

@@ -43,6 +43,7 @@ const size_t CONTROLLER_LOAD_MSG                = yat::FIRST_USER_MSG + 100;
 namespace XiaDxp_ns
 {
 /// Used to pass properties from Main Device to Undulators object
+
 class ConfigLoader
 {
 public:
@@ -63,6 +64,7 @@ public:
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 /// 
+
 class Controller : public yat4tango::DeviceTask
 {
 public:

src/DataParser.h

@@ -19,6 +19,7 @@ namespace XiaDxp_ns
 //------------------------------------------------------------------
 //	class:	DataParser
 //------------------------------------------------------------------
+
 class DataParser : public Tango::LogAdapter
 {
 public:

src/DataParserMapping.cpp

@@ -143,8 +143,8 @@ void DataParserMapping::parse_pixel_full_xmap(int module, int pixel, DataType* m
 	// go to current pixel
 	for(int i = 0;i < pixel;++i)
 	{
-        unsigned long pixelBlockSize = WORD_TO_LONG(pixel_data[6], pixel_data[7]);
-        pixel_data += pixelBlockSize;
+		unsigned long length_of_pixel_data = WORD_TO_LONG(pixel_data[6], pixel_data[7]);
+		pixel_data += length_of_pixel_data;
 	}
 
 	// check pixel buffer tags
@@ -163,7 +163,6 @@ void DataParserMapping::parse_pixel_full_xmap(int module, int pixel, DataType* m
 
 	unsigned long the_pixel = WORD_TO_LONG(pixel_data[4], pixel_data[5]);
 	//DEBUG_STREAM<<"\t- the_pixel = "<<the_pixel<<std::endl;
-    unsigned long length_of_pixData = WORD_TO_LONG(pixel_data[6], pixel_data[7]);
 
 	// Get spectrum sizes located at WORD 8/9/10/11 
 	// number of channels = ALWAYS 4 for XMAP board !  
@@ -203,7 +202,7 @@ void DataParserMapping::parse_pixel_full_xmap(int module, int pixel, DataType* m
 	//datas for current pixel
 	//DEBUG_STREAM << "\t- push buffer data for the pixel ["<<the_pixel<<"] into DataStore "<<endl;
 	DataType* spectrum_data = pixel_data + PIXEL_HEADER_SIZE;
-    for (int channel = 0; channel < NB_CHANNEL_XMAP_MAX; ++channel)
+	for(int channel = 0;channel < NB_CHANNEL_XMAP_MAX;channel++)
 	{
 		m_store->store_data(module, //nb module
 							channel, //numero of channel
@@ -231,9 +230,9 @@ void DataParserMapping::parse_pixel_sca_xmap(int module, int pixel, DataType* ma
 	// go to current pixel
 	for(int i = 0;i < pixel;++i)
 	{
-        unsigned long pixelBlockSize = WORD_TO_LONG(pixel_data[6], pixel_data[7]);
-        //INFO_STREAM<<"\t\t- pixelBlockSize = "<<pixelBlockSize<<endl;
-        pixel_data += pixelBlockSize;
+		unsigned long length_of_pixel_data = WORD_TO_LONG(pixel_data[6], pixel_data[7]);
+		//INFO_STREAM<<"\t\t- length_of_pixel_data = "<<length_of_pixel_data<<endl;
+		pixel_data += length_of_pixel_data;
 	}
 
 	// check pixel buffer tags
@@ -252,7 +251,6 @@ void DataParserMapping::parse_pixel_sca_xmap(int module, int pixel, DataType* ma
 
 	unsigned long the_pixel = WORD_TO_LONG(pixel_data[4], pixel_data[5]);
 	//INFO_STREAM<<"\t\t- the_pixel = "<<the_pixel<<std::endl;
-    unsigned long length_of_pixData = WORD_TO_LONG(pixel_data[6], pixel_data[7]);
 
 	// Get spectrum sizes located at WORD 8/9/10/11 
 	// number of channels = ALWAYS 4 for XMAP board 
@@ -292,7 +290,7 @@ void DataParserMapping::parse_pixel_sca_xmap(int module, int pixel, DataType* ma
 	//datas for current pixel
 	//INFO_STREAM << "\t\t- push buffer data for the pixel ["<<the_pixel<<"] into DataStore "<<endl;
 	DataType* sca_rois = pixel_data + NB_SCA_MAX;//PIXEL_HEADER_SIZE in case of sca mode = 64
-    for (int channel = 0; channel < NB_CHANNEL_XMAP_MAX; ++channel)
+	for(int channel = 0;channel < NB_CHANNEL_XMAP_MAX;channel++)
 	{
 		m_store->store_data(module, //nb module
 							channel, //numero of channel

src/DataParserMapping.h

@@ -19,6 +19,7 @@ namespace XiaDxp_ns
 //------------------------------------------------------------------
 //	class:	DataParserMapping
 //------------------------------------------------------------------
+
 class DataParserMapping : public DataParser
 {
 public:

src/DataParserMca.h

@@ -19,6 +19,7 @@ namespace XiaDxp_ns
 //------------------------------------------------------------------
 //	class:	DataParserMca
 //------------------------------------------------------------------
+
 class DataParserMca : public DataParser
 {
 public: