Merge remote-tracking branch 'origin' into feature/8590_Refl_gui_Live…

…_Data_fix
mantidproject · Jan 30, 2014 · bc766cc · bc766cc
2 parents fa73b4d + 3b91b4c
commit bc766cc
Show file tree

Hide file tree

Showing 10 changed files with 214 additions and 944 deletions.
diff --git a/Code/Mantid/Framework/SINQ/CMakeLists.txt b/Code/Mantid/Framework/SINQ/CMakeLists.txt
@@ -7,7 +7,6 @@ set ( SRC_FILES
     src/PoldiAutoCorrelation5.cpp
     src/PoldiLoadLog.cpp
     src/PoldiPeakDetection2.cpp
-#   src/PoldiPeakFit.cpp
     src/InvertMDDim.cpp
     src/MDHistoToWorkspace2D.cpp
     src/ProjectMD.cpp
@@ -26,7 +25,6 @@ set ( INC_FILES
     inc/MantidSINQ/PoldiAutoCorrelation5.h
     inc/MantidSINQ/PoldiLoadLog.h
     inc/MantidSINQ/PoldiPeakDetection2.h
-#   inc/MantidSINQ/PoldiPeakFit.h
     inc/MantidSINQ/InvertMDDim.h
     inc/MantidSINQ/MDHistoToWorkspace2D.h
     inc/MantidSINQ/ProjectMD.h

diff --git a/Code/Mantid/Framework/SINQ/inc/MantidSINQ/PoldiPeakFit.h b/Code/Mantid/Framework/SINQ/inc/MantidSINQ/PoldiPeakFit.h