refs #6449 Templates again.

Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/BoxControllerNxSIO.h

@@ -4,6 +4,8 @@
 #include "MantidAPI/IBoxControllerIO.h"
 #include "MantidAPI/BoxController.h"
 #include "MantidKernel/DiskBuffer.h"
+#include <nexus/NeXusFile.hpp>
+
 
 namespace Mantid
 {

Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/MDEvent.h

@@ -207,7 +207,6 @@ namespace MDEvents
      @return totalSignal -- total signal in the vector of events
      @return totalErr   -- total error corresponting to the vector of events
     */
-    template<size_t nd>
     static inline void eventsToData(const std::vector<MDEvent<nd> > & events,std::vector<coord_t> &data,size_t &ncols,double &totalSignal,double &totalErrSq )
     {
       ncols = (nd+4);
@@ -244,7 +243,6 @@ namespace MDEvents
      @param events    -- vector of events
      @param reserveMemory -- reserve memory for events copying. Set to false if one wants to add new events to the existing one.  
     */
-    template<size_t nd>
     static inline void dataToEvents(const std::vector<coord_t> &data, std::vector<MDEvent<nd> > & events, bool reserveMemory=true)
     {
     // Number of columns = number of dimensions + 4 (signal/error)+detId+runID

Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/MDLeanEvent.h

@@ -288,7 +288,6 @@ namespace MDEvents
      @return totalSignal -- total signal in the vector of events
      @return totalErr   -- total error corresponting to the vector of events
     */
-    template<size_t nd> 
     static inline void eventsToData(const std::vector<MDLeanEvent<nd> > & events,std::vector<coord_t> &data,size_t &ncols,double &totalSignal,double &totalErrSq )
     {
       ncols = nd+2;
@@ -323,7 +322,6 @@ namespace MDEvents
      @param events    -- vector of events
      @param reserveMemory -- reserve memory for events copying. Set to false if one wants to add new events to the existing one.  
     */
-    template<size_t nd> 
     static inline void dataToEvents(const std::vector<coord_t> &coord, std::vector<MDLeanEvent<nd> > & events, bool reserveMemory=true)
     {
     // Number of columns = number of dimensions + 2 (signal/error)

Code/Mantid/Framework/MDEvents/src/BoxControllerNxSIO.cpp

@@ -2,7 +2,6 @@
 #include "MantidMDEvents/MDBoxFlatTree.h"
 #include "MantidKernel/Exception.h"
 #include "MantidAPI/FileFinder.h"
-#include <nexus/NeXusFile.hpp>
 
 #include <string>
 
@@ -53,14 +52,14 @@ namespace MDEvents
 
           return static_cast<EventType>(std::distance(typesSupported.begin(), it ));
    }
-   /**The optional method to set up the event type and the size of the event coordinate
-  /** As save/load operations use void data type, these function allow set up/get  the type name provided for the IO operations
+ /** The optional method to set up the event type and the size of the event coordinate
+   *  As save/load operations use void data type, these function allow set up/get  the type name provided for the IO operations
    *  and the size of the data type in bytes (e.g. the  class dependant physical  meaning of the blockSize and blockPosition used 
    *  by save/load operations     
-   *@param CoordSize -- size (in bytes) of the blockPosition and blockSize used in save/load operations. 4 and 8 are supported only
-   *@paramtypeName  -- the name of the event used in the operations. The name itself defines the size and the format of the event
+   * @param CoordSize -- size (in bytes) of the blockPosition and blockSize used in save/load operations. 4 and 8 are supported only
+   * @paramtypeName  -- the name of the event used in the operations. The name itself defines the size and the format of the event
                        The events described in the class header are supported only
-  */  
+ */
   void BoxControllerNxSIO::setDataType(const size_t blockSize, const std::string &typeName)
   {
       if(blockSize==4 || blockSize==8)