Merge remote-tracking branch 'origin/master' into feature/9209_can_fi…

…le_in_diffraction

Refs #9209

Conflicts:
	Code/Mantid/scripts/Inelastic/IndirectDataAnalysis.py

Code/Mantid/Build/CMake/CPackLinuxSetup.cmake

@@ -11,7 +11,7 @@ set ( CPACK_SOURCE_GENERATOR TGZ )
 include (DetermineLinuxDistro)
 
 # define which binary generators to use
-if ( ${UNIX_DIST} MATCHES "Ubuntu" )
+if ( "${UNIX_DIST}" MATCHES "Ubuntu" )
   find_program (DPKG_CMD dpkg)
   if ( DPKG_CMD )
     set ( CPACK_GENERATOR "DEB" )
@@ -22,23 +22,23 @@ if ( ${UNIX_DIST} MATCHES "Ubuntu" )
     set( CPACK_PACKAGE_FILE_NAME
       "${CPACK_PACKAGE_NAME}_${CPACK_PACKAGE_VERSION}-${CPACK_DEBIAN_PACKAGE_RELEASE}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}")   
   endif ( DPKG_CMD ) 
-endif ( ${UNIX_DIST} MATCHES "Ubuntu" )
+endif ( "${UNIX_DIST}" MATCHES "Ubuntu" )
 
 #RedHatEnterpriseClient RedHatEnterpriseWorkstation
-if ( ${UNIX_DIST} MATCHES "RedHatEnterprise" OR ${UNIX_DIST} MATCHES "Fedora" OR ${UNIX_DIST} MATCHES "SUSE LINUX" )
+if ( "${UNIX_DIST}" MATCHES "RedHatEnterprise" OR "${UNIX_DIST}" MATCHES "Fedora" OR "${UNIX_DIST}" MATCHES "SUSE LINUX" )
   find_program ( RPMBUILD_CMD rpmbuild )
   if ( RPMBUILD_CMD )
     set ( CPACK_GENERATOR "RPM" )
     set ( CPACK_RPM_PACKAGE_ARCHITECTURE "${CMAKE_SYSTEM_PROCESSOR}" )
     set ( CPACK_RPM_PACKAGE_URL "http://www.mantidproject.org" )
 
     # reset the release name to include the RHEL version if known
-    if ( ${UNIX_DIST} MATCHES "RedHatEnterprise" )
+    if ( "${UNIX_DIST}" MATCHES "RedHatEnterprise" )
       string ( REGEX REPLACE "^([0-9])\\.[0-9]+$" "\\1" TEMP ${UNIX_RELEASE} )
       set ( CPACK_RPM_PACKAGE_RELEASE "1.el${TEMP}" )
-    elseif ( ${UNIX_DIST} MATCHES "Fedora" )
+    elseif ( "${UNIX_DIST}" MATCHES "Fedora" )
       set ( CPACK_RPM_PACKAGE_RELEASE "1.fc${UNIX_RELEASE}" )
-    endif ( ${UNIX_DIST} MATCHES "RedHatEnterprise" )
+    endif ( "${UNIX_DIST}" MATCHES "RedHatEnterprise" )
 
     # If CPACK_SET_DESTDIR is ON then the Prefix doesn't get put in the spec file
     if( CPACK_SET_DESTDIR )
@@ -50,5 +50,5 @@ if ( ${UNIX_DIST} MATCHES "RedHatEnterprise" OR ${UNIX_DIST} MATCHES "Fedora" OR
     set ( CPACK_PACKAGE_FILE_NAME
       "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${CPACK_RPM_PACKAGE_RELEASE}.${CPACK_RPM_PACKAGE_ARCHITECTURE}" )
   endif ( RPMBUILD_CMD)
-endif ( ${UNIX_DIST} MATCHES "RedHatEnterprise" OR ${UNIX_DIST} MATCHES "Fedora" OR ${UNIX_DIST} MATCHES "SUSE LINUX" )
+endif ()
 

Code/Mantid/Build/CMake/DarwinSetup.cmake

@@ -95,6 +95,7 @@ endif()
 set ( CMAKE_INSTALL_PREFIX "" )
 set ( CPACK_PACKAGE_EXECUTABLES MantidPlot )
 set ( INBUNDLE MantidPlot.app/ )
+
 # We know exactly where this has to be on Darwin
 set ( PARAVIEW_APP_DIR "/Applications/${OSX_PARAVIEW_APP}" )
 set ( PARAVIEW_APP_BIN_DIR "${PARAVIEW_APP_DIR}/Contents/MacOS" )
@@ -107,27 +108,37 @@ set ( PLUGINS_DIR MantidPlot.app/plugins )
 set ( PVPLUGINS_DIR MantidPlot.app/pvplugins )
 set ( PVPLUGINS_SUBDIR pvplugins ) # Need to tidy these things up!
 
+if (OSX_VERSION VERSION_LESS 10.9)
+ set ( PYQT4_PYTHONPATH /Library/Python/${PY_VER}/site-packages/PyQt4 )
+ set ( SITEPACKAGES /Library/Python/${PY_VER}/site-packages )
+else()
+ # Assume we are using homebrew for now
+ set ( PYQT4_PYTHONPATH /usr/local/lib/python${PY_VER}/site-packages/PyQt4 )
+ set ( SITEPACKAGES /usr/local/lib/python${PY_VER}/site-packages )
+endif()
+
 # Python packages
 
-install ( PROGRAMS /Library/Python/${PY_VER}/site-packages/sip.so DESTINATION ${BIN_DIR} )
+install ( PROGRAMS ${SITEPACKAGES}/sip.so DESTINATION ${BIN_DIR} )
+
 # Explicitly specify which PyQt libraries we want because just taking the whole
 # directory will swell the install kit unnecessarily.
-install ( FILES /Library/Python/${PY_VER}/site-packages/PyQt4/Qt.so
-                /Library/Python/${PY_VER}/site-packages/PyQt4/QtCore.so
-                /Library/Python/${PY_VER}/site-packages/PyQt4/QtGui.so
-                /Library/Python/${PY_VER}/site-packages/PyQt4/QtOpenGL.so
-                /Library/Python/${PY_VER}/site-packages/PyQt4/QtSql.so
-                /Library/Python/${PY_VER}/site-packages/PyQt4/QtSvg.so
-                /Library/Python/${PY_VER}/site-packages/PyQt4/QtXml.so
-                /Library/Python/${PY_VER}/site-packages/PyQt4/__init__.py
+install ( FILES ${PYQT4_PYTHONPATH}/Qt.so
+                ${PYQT4_PYTHONPATH}/QtCore.so
+                ${PYQT4_PYTHONPATH}/QtGui.so
+                ${PYQT4_PYTHONPATH}/QtOpenGL.so
+                ${PYQT4_PYTHONPATH}/QtSql.so
+                ${PYQT4_PYTHONPATH}/QtSvg.so
+                ${PYQT4_PYTHONPATH}/QtXml.so
+                ${PYQT4_PYTHONPATH}/__init__.py
           DESTINATION ${BIN_DIR}/PyQt4 )
 # Newer PyQt versions have a new internal library that we need to take
-if ( EXISTS /Library/Python/${PY_VER}/site-packages/PyQt4/_qt.so )
-  install ( FILES /Library/Python/${PY_VER}/site-packages/PyQt4/_qt.so
+if ( EXISTS ${PYQT4_PYTHONPATH}/_qt.so )
+  install ( FILES ${PYQT4_PYTHONPATH}/_qt.so
             DESTINATION ${BIN_DIR}/PyQt4 )
 endif ()
 
-install ( DIRECTORY /Library/Python/${PY_VER}/site-packages/PyQt4/uic DESTINATION ${BIN_DIR}/PyQt4 )
+install ( DIRECTORY ${PYQT4_PYTHONPATH}/uic DESTINATION ${BIN_DIR}/PyQt4 )
 
 # Python packages in Third_Party need copying to build directory and the final package
 file ( GLOB THIRDPARTY_PYTHON_PACKAGES ${CMAKE_LIBRARY_PATH}/Python/* )
@@ -139,15 +150,17 @@ foreach ( PYPACKAGE ${THIRDPARTY_PYTHON_PACKAGES} )
 endforeach( PYPACKAGE )
 
 install ( DIRECTORY ${QT_PLUGINS_DIR}/imageformats DESTINATION MantidPlot.app/Contents/Frameworks/plugins )
+install ( DIRECTORY ${QT_PLUGINS_DIR}/sqldrivers DESTINATION MantidPlot.app/Contents/Frameworks/plugins )
 
 install ( FILES ${CMAKE_SOURCE_DIR}/Images/MantidPlot.icns
                 ${CMAKE_SOURCE_DIR}/Installers/MacInstaller/qt.conf
           DESTINATION MantidPlot.app/Contents/Resources/
 )
 
+set ( CPACK_DMG_BACKGROUND_IMAGE ${CMAKE_SOURCE_DIR}/Images/osx-bundle-background.png )
+set ( CPACK_DMG_DS_STORE ${CMAKE_SOURCE_DIR}/Installers/MacInstaller/osx_DS_Store)
 set ( MACOSX_BUNDLE_ICON_FILE MantidPlot.icns )
-  
+
 string (REPLACE " " "" CPACK_SYSTEM_NAME ${OSX_CODENAME})
 
 set ( CPACK_GENERATOR DragNDrop )
-

Code/Mantid/Build/CMake/LinuxSetup.cmake

@@ -90,7 +90,7 @@ endif()
 
 
 # RHEL6 specific stuff (as we need to use software collections)
-if ( ${UNIX_DIST} STREQUAL "RedHatEnterprise" )
+if ( "${UNIX_DIST}" MATCHES "RedHatEnterprise" )
 	file ( APPEND ${CMAKE_CURRENT_BINARY_DIR}/rpm_post_install.sh "\n"
 								     "if [ -f $RPM_INSTALL_PREFIX0/${BIN_DIR}/MantidPlot ]; then\n"
                                                                      "  mv $RPM_INSTALL_PREFIX0/${BIN_DIR}/MantidPlot $RPM_INSTALL_PREFIX0/${BIN_DIR}/MantidPlot_exe\n"
@@ -101,12 +101,12 @@ if ( ${UNIX_DIST} STREQUAL "RedHatEnterprise" )
 								      "scl enable mantidlibs \"${CMAKE_INSTALL_PREFIX}/${BIN_DIR}/MantidPlot_exe $*\" \n"
 	)
 
-install ( FILES  ${CMAKE_CURRENT_BINARY_DIR}/launch_mantidplot.sh 
+    install ( FILES  ${CMAKE_CURRENT_BINARY_DIR}/launch_mantidplot.sh
           DESTINATION ${BIN_DIR}
 	      PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ
 	                  GROUP_EXECUTE GROUP_READ
 	                  WORLD_EXECUTE WORLD_READ
-)
+    )
 
 endif()
 

Code/Mantid/Build/CMake/UseSystemQt4.cmake

@@ -74,7 +74,7 @@ SET(QT_QAXSERVER_MODULE_DEPENDS QTGUI QTCORE)
 SET(QT_QTSCRIPTTOOLS_MODULE_DEPENDS QTGUI QTCORE)
 
 # Qt modules  (in order of dependence)
-FOREACH(module QT3SUPPORT QTOPENGL QTASSISTANT QTDESIGNER QTMOTIF QTNSPLUGIN
+FOREACH(module QT3SUPPORT QTOPENGL QTDESIGNER QTMOTIF QTNSPLUGIN
                QAXSERVER QAXCONTAINER QTSCRIPT QTSVG QTUITOOLS QTHELP 
                QTWEBKIT PHONON QTSCRIPTTOOLS QTGUI QTTEST QTDBUS QTXML QTSQL 
                QTXMLPATTERNS QTNETWORK QTCORE)

Code/Mantid/Build/CMake/WindowsNSIS.cmake

@@ -96,9 +96,6 @@
     install ( DIRECTORY ${CMAKE_LIBRARY_PATH}/qt_plugins/imageformats ${CMAKE_LIBRARY_PATH}/qt_plugins/sqldrivers DESTINATION plugins/qtplugins 
               REGEX "^.*d4.dll$" EXCLUDE  )
     install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/Installers/WinInstaller/qt.conf DESTINATION bin )
-
-    # Copy assistant.exe
-    install ( FILES ${CMAKE_LIBRARY_PATH}/assistant.exe DESTINATION bin )
 
     # Release deployments do modify enviromental variables, other deployments do not.
     if(CPACK_PACKAGE_SUFFIX STREQUAL "") 

Code/Mantid/Build/Jenkins/buildscript

@@ -9,6 +9,11 @@
 # BUILD_THREADS & PARAVIEW_DIR should be set in the configuration of each slave.
 ###############################################################################
 
+###############################################################################
+# Print out the versions of things we are using
+###############################################################################
+cmake --version
+
 ###############################################################################
 # OS X setup steps
 ###############################################################################
@@ -34,12 +39,15 @@ if [[ ${JOB_NAME} == *clean* ]]; then
 
   # Set some variables relating to the linux packages created from clean builds
   if [[ $(uname) != 'Darwin' ]]; then
+    # Use different suffix for linux builds
     if [[ ${JOB_NAME} == *master* ]]; then
-      SUFFIX=nightly
+      PACKAGINGVARS="-DENVVARS_ON_INSTALL=False -DCMAKE_INSTALL_PREFIX=/opt/mantidnightly -DCPACK_PACKAGE_SUFFIX=nightly -DCPACK_SET_DESTDIR=OFF -DPACKAGE_DOCS=ON"
     elif [[ ${JOB_NAME} == *develop* ]]; then
-      SUFFIX=unstable
+      PACKAGINGVARS="-DENVVARS_ON_INSTALL=False -DCMAKE_INSTALL_PREFIX=/opt/mantidunstable -DCPACK_PACKAGE_SUFFIX=unstable -DCPACK_SET_DESTDIR=OFF -DPACKAGE_DOCS=ON"
     fi
-    PACKAGINGVARS="-DENVVARS_ON_INSTALL=False -DCMAKE_INSTALL_PREFIX=/opt/mantid${SUFFIX} -DCPACK_PACKAGE_SUFFIX=${SUFFIX} -DCPACK_SET_DESTDIR=OFF -DPACKAGE_DOCS=True"
+  else
+    # Mac packaging
+    PACKAGINGVARS="-DPACKAGE_DOCS=ON"
   fi
 fi
 

Code/Mantid/Build/Jenkins/buildscript.bat

@@ -7,6 +7,8 @@
 :: BUILD_THREADS & PARAVIEW_DIR should be set in the configuration of each slave.
 :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 
+"C:\Program Files (x86)\CMake 2.8\bin\cmake.exe" --version 
+
 :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 :: Get or update the third party dependencies
 :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::

Code/Mantid/Build/dev-packages/rpm/mantid-developer/mantid-developer-el6.spec

@@ -1,6 +1,6 @@
 Name:           mantid-developer
 Version:        1.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Meta Package to install dependencies for Mantid Development
 
 Group:          Development/Tools
@@ -41,7 +41,6 @@ Requires: openssl-devel
 Requires: texlive-latex
 Requires: dvipng
 Requires: mantidlibs-qt-devel
-Requires: mantidlibs-qt-assistant
 Requires: scl-utils
 
 BuildArch: noarch

Code/Mantid/Build/dev-packages/rpm/mantid-developer/mantid-developer-f19.spec

@@ -1,6 +1,6 @@
 Name:           mantid-developer
 Version:        1.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Meta Package to install dependencies for Mantid Development
 
 Group:          Development/Tools
@@ -41,7 +41,6 @@ Requires: openssl-devel
 Requires: texlive-latex
 Requires: dvipng
 Requires: qt-devel
-Requires: qt-assistant
 
 BuildArch: noarch
 

Code/Mantid/Build/dev-packages/rpm/mantid-developer/mantid-developer-f20.spec

@@ -1,6 +1,6 @@
 Name:           mantid-developer
 Version:        1.3
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Meta Package to install dependencies for Mantid Development
 
 Group:          Development/Tools
@@ -45,7 +45,6 @@ Requires: texlive-was
 Requires: tex-preview
 Requires: dvipng
 Requires: qt-devel
-Requires: qt-assistant
 Requires: qtwebkit-devel
 
 BuildArch: noarch

Code/Mantid/CMakeLists.txt

@@ -186,7 +186,7 @@ if ( ENABLE_CPACK )
       # rhel requirements
       set ( CPACK_RPM_PACKAGE_REQUIRES "boost >= 1.34.1,qt4 >= 4.2,nexus,nexus-python,qwt,gsl,glibc,qwtplot3d-qt4,muParser,numpy" )
       # OpenCASCADE changed names when packaged for Fedora 20
-      if( ${UNIX_CODENAME} STREQUAL "Heisenbug" )
+      if( "${UNIX_CODENAME}" MATCHES "Heisenbug" )
         set( CPACK_RPM_PACKAGE_REQUIRES "${CPACK_RPM_PACKAGE_REQUIRES},OCE-devel" )
       else()
         set( CPACK_RPM_PACKAGE_REQUIRES "${CPACK_RPM_PACKAGE_REQUIRES},OpenCASCADE-libs-modelling >= 6.3.0,OpenCASCADE-libs-foundation >= 6.3.0,OpenCASCADE-libs-visualization >= 6.3.0,OpenCASCADE-libs-ocaf >= 6.3.0,OpenCASCADE-libs-ocaf-lite >= 6.3.0" )
@@ -197,7 +197,7 @@ if ( ENABLE_CPACK )
       set ( CPACK_RPM_PACKAGE_REQUIRES "${CPACK_RPM_PACKAGE_REQUIRES},scipy,python-matplotlib" )
       set ( CPACK_RPM_PACKAGE_REQUIRES "${CPACK_RPM_PACKAGE_REQUIRES},mxml,hdf,hdf5" )
 
-      if( ${UNIX_CODENAME} STREQUAL "Santiago" )
+      if( "${UNIX_CODENAME}" MATCHES "Santiago" )
         # On RHEL6 we have to use an updated qscintilla to fix an auto complete bug
         set ( CPACK_RPM_PACKAGE_REQUIRES "${CPACK_RPM_PACKAGE_REQUIRES} qscintilla >= 2.4.6" )
         # On RHEL6 we are using SCL packages for Qt
@@ -207,20 +207,11 @@ if ( ENABLE_CPACK )
       endif()
 
       # Add software collections for RHEL
-      if (  ${UNIX_CODENAME} STREQUAL "Santiago" )
+      if ( "${UNIX_CODENAME}" MATCHES "Santiago" )
         set ( CPACK_RPM_PACKAGE_REQUIRES "${CPACK_RPM_PACKAGE_REQUIRES} scl-utils" )
       endif()
 
-      # qt assistant is in different places in every distro
-      if ( ${UNIX_DIST} MATCHES "RedHatEnterprise" )
-        set ( CPACK_RPM_PACKAGE_REQUIRES "${CPACK_RPM_PACKAGE_REQUIRES} qt4-x11" )
-      elseif ( ${UNIX_DIST} MATCHES "Fedora" )
-        set ( CPACK_RPM_PACKAGE_REQUIRES "${CPACK_RPM_PACKAGE_REQUIRES} qt4-assistant" )
-      elseif ( ${UNIX_DIST} MATCHES "SUSE LINUX" )
-        set ( CPACK_RPM_PACKAGE_REQUIRES "${CPACK_RPM_PACKAGE_REQUIRES} libqt4-devel-doc" )
-      endif ( ${UNIX_DIST} MATCHES "RedHatEnterprise" )
-
-      if( ${UNIX_DIST} STREQUAL "Ubuntu" )
+      if( "${UNIX_DIST}" MATCHES "Ubuntu" )
         # common packages
         set ( DEPENDS_LIST "libboost-date-time${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION},"
                            "libboost-regex${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION},"
@@ -229,15 +220,22 @@ if ( ENABLE_CPACK )
                            "libnexus0 (>= 4.3),libgsl0ldbl,libqtcore4 (>= 4.2),libqtgui4 (>= 4.2),libqt4-opengl (>= 4.2),"
                            "libqt4-xml (>= 4.2),libqt4-svg (>= 4.2),libqt4-qt3support (>= 4.2),qt4-dev-tools,"
                            "libqwt5-qt4,libqwtplot3d-qt4-0,python-numpy,python-sip,python-qt4" )
-        if( ${UNIX_CODENAME} STREQUAL "lucid" )
+        set ( PERFTOOLS_DEB_PACKAGE "libgoogle-perftools0 (>= 1.7)" )
+        if( "${UNIX_CODENAME}" MATCHES "lucid" )
           list ( APPEND DEPENDS_LIST ",libqscintilla2-5,"
                                      "libopencascade-foundation-6.3.0 (>= 6.3.0),libopencascade-modeling-6.3.0 (>= 6.3.0),"
                                      "libmuparser0" )
-        elseif( ${UNIX_CODENAME} STREQUAL "precise" )
+        elseif( "${UNIX_CODENAME}" MATCHES "precise" )
           list ( APPEND DEPENDS_LIST ",libqscintilla2-8,"
                                      "libopencascade-foundation-6.5.0 (>= 6.5.0),libopencascade-modeling-6.5.0 (>= 6.5.0),"
                                      "libmuparser0debian1,"
                                      "ipython-qtconsole (>= 1.1),python-matplotlib,python-scipy" )
+        elseif( "${UNIX_CODENAME}" STREQUAL "trusty" )
+          list ( APPEND DEPENDS_LIST ",libqscintilla2-11,"
+                                     "liboce-foundation8,liboce-modeling8,"
+                                     "libmuparser2,"
+                                     "ipython-qtconsole (>= 1.1),python-matplotlib,python-scipy" )
+          set ( PERFTOOLS_DEB_PACKAGE "libgoogle-perftools4 (>= 1.7)" )
         else()
           message( WARNING "Mantid does not support packaging of this Ubuntu version: ${UNIX_CODENAME}")
         endif()
@@ -248,7 +246,7 @@ if ( ENABLE_CPACK )
       IF ( USE_TCMALLOC AND TCMALLOC_FOUND )
         message ( STATUS " Adding gperftools to the package requirements" )
         set ( CPACK_RPM_PACKAGE_REQUIRES "${CPACK_RPM_PACKAGE_REQUIRES},gperftools-libs >= 2.0" )
-        set ( CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS},libgoogle-perftools0 (>= 1.7)" )
+        set ( CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS},${PERFTOOLS_DEB_PACKAGE}" )
       ENDIF ( )
     ENDIF ()
     # run cpack configuration

Code/Mantid/Framework/API/inc/MantidAPI/Algorithm.h

@@ -301,6 +301,8 @@ class MANTID_API_DLL Algorithm : public IAlgorithm, public Kernel::PropertyManag
 
   /// get whether we are tracking the history for this algorithm,
   bool trackingHistory();
+  /// Copy workspace history for input workspaces to output workspaces and record the history for ths algorithm
+  virtual void fillHistory();
 
   /// Set to true to stop execution
   bool m_cancel;
@@ -344,8 +346,6 @@ class MANTID_API_DLL Algorithm : public IAlgorithm, public Kernel::PropertyManag
   void unlockWorkspaces();
 
   void store();
-  /// Copy workspace history for input workspaces to output workspaces and record the history for ths algorithm
-  virtual void fillHistory();
   void linkHistoryWithLastChild();
 
   void logAlgorithmInfo() const;

Code/Mantid/Framework/API/inc/MantidAPI/AlgorithmHistory.h

@@ -128,16 +128,16 @@ class MANTID_API_DLL AlgorithmHistory
   void saveNexus(::NeXus::File* file, int& algCount) const;
   // Set the execution count 
   void setExecCount(std::size_t execCount) { m_execCount = execCount; }
+  /// Set data on history after it is created
+  void fillAlgorithmHistory(const Algorithm* const alg, 
+                       const Kernel::DateAndTime& start = Kernel::DateAndTime::defaultTime(),
+                       const double& duration = -1.0,std::size_t uexeccount = 0);
   // Allow Algorithm::execute to change the exec count & duration after the algorithm was executed
   friend class Algorithm;
 
 private:
   //private constructor
   AlgorithmHistory();
-  // Set data on history after it is created
-  void fillAlgorithmHistory(const Algorithm* const alg, 
-                       const Kernel::DateAndTime& start = Kernel::DateAndTime::defaultTime(),
-                       const double& duration = -1.0,std::size_t uexeccount = 0);
   // Set properties of algorithm
   void setProperties(const Algorithm* const alg);
   /// The name of the Algorithm

Code/Mantid/Framework/API/inc/MantidAPI/CatalogManager.h

@@ -45,6 +45,8 @@ namespace Mantid
         void destroyCatalog(const std::string &sessionID);
         /// Obtains a list of the current active catalog sessions.
         std::vector<CatalogSession_sptr> getActiveSessions();
+        /// Returns the number of active sessions
+        size_t numberActiveSessions() const;
 
       private:
         /// These methods are required to create a singleton.

Code/Mantid/Framework/API/inc/MantidAPI/CatalogSession.h

@@ -38,7 +38,7 @@ namespace Mantid
     {
       public:
         CatalogSession(const std::string &sessionID, const std::string &facility, const std::string &endpoint);
-        const std::string& getSessionId() const;
+        std::string getSessionId() const;
         void setSessionId(const std::string &sessionID);
         const std::string& getSoapEndpoint() const;
         const std::string& getFacility() const;