Merge branch 'master' into feature/9473_refl_add_options_column

Refs #9473 Conflicts: Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/ReflMainViewPresenter.h Code/Mantid/MantidQt/CustomInterfaces/src/ReflMainViewPresenter.cpp
mantidproject · Sep 23, 2014 · 28929ed · 28929ed
2 parents aac2d9e + 0e7ad92
commit 28929ed
Show file tree

Hide file tree

Showing 71 changed files with 3,151 additions and 1,684 deletions.
diff --git a/Code/Mantid/Build/CMake/LinuxSetup.cmake b/Code/Mantid/Build/CMake/LinuxSetup.cmake
@@ -97,9 +97,15 @@ if ( "${UNIX_DIST}" MATCHES "RedHatEnterprise" )
 							             "  ln -s $RPM_INSTALL_PREFIX0/${BIN_DIR}/launch_mantidplot.sh $RPM_INSTALL_PREFIX0/${BIN_DIR}/MantidPlot\n"
                                                                      "fi\n"
 	)
-	file ( WRITE ${CMAKE_CURRENT_BINARY_DIR}/launch_mantidplot.sh "#!/bin/sh\n"
-								      "scl enable mantidlibs \"${CMAKE_INSTALL_PREFIX}/${BIN_DIR}/MantidPlot_exe $*\" \n"
+        if ( "${UNIX_CODENAME}" MATCHES "Santiago" ) # el6
+            file ( WRITE ${CMAKE_CURRENT_BINARY_DIR}/launch_mantidplot.sh "#!/bin/sh\n"
+	           "scl enable mantidlibs \"${CMAKE_INSTALL_PREFIX}/${BIN_DIR}/MantidPlot_exe $*\" \n"
 	)
+        else ()
+            file ( WRITE ${CMAKE_CURRENT_BINARY_DIR}/launch_mantidplot.sh "#!/bin/sh\n"
+	           "LD_LIBRARY_PATH=/usr/lib64/paraview:${LD_LIBRARY_PATH} ${CMAKE_INSTALL_PREFIX}/${BIN_DIR}/MantidPlot_exe $* \n"
+	)
+	endif()
 
     install ( FILES  ${CMAKE_CURRENT_BINARY_DIR}/launch_mantidplot.sh
           DESTINATION ${BIN_DIR}

diff --git a/Code/Mantid/Build/Jenkins/buildscript b/Code/Mantid/Build/Jenkins/buildscript
@@ -13,6 +13,7 @@
 # Print out the versions of things we are using
 ###############################################################################
 cmake --version
+echo "SHA1=${sha1}"
 
 ###############################################################################
 # OS X setup steps

diff --git a/Code/Mantid/Build/dev-packages/rpm/mantid-developer/mantid-developer-el6.spec b/Code/Mantid/Build/dev-packages/rpm/mantid-developer/mantid-developer-el6.spec
diff --git a/Code/Mantid/Build/dev-packages/rpm/mantid-developer/mantid-developer-f19.spec b/Code/Mantid/Build/dev-packages/rpm/mantid-developer/mantid-developer-f19.spec
diff --git a/...antid-developer/mantid-developer-f20.spec → ...pm/mantid-developer/mantid-developer.spec b/...antid-developer/mantid-developer-f20.spec → ...pm/mantid-developer/mantid-developer.spec
@@ -1,16 +1,17 @@
 Name:           mantid-developer
-Version:        1.3
-Release:        8%{?dist}
+Version:        1.4
+Release:        1%{?dist}
 Summary:        Meta Package to install dependencies for Mantid Development
 
 Group:          Development/Tools
 License:        GPL
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires: rpmfusion-nonfree-release
+%{?fc20:Requires: rpmfusion-nonfree-release}
 Requires: cmake-gui >= 2.8.5
 Requires: boost-devel
+%{?el6:Requires: epel-release}
 Requires: gperftools-devel
 Requires: gperftools-libs
 Requires: gcc-c++
@@ -27,11 +28,16 @@ Requires: OCE-devel
 Requires: poco-devel
 Requires: PyQt4-devel
 Requires: python-devel
-Requires: python-ipython
+Requires: python-ipython >= 1.1
+Conflicts: python-ipython >= 2.0
 Requires: python-sphinx
 Requires: qscintilla-devel
 Requires: qt-devel >= 4.6
+%if 0%{?el6}
+Requires: qwt-devel
+%else
 Requires: qwt5-qt4-devel
+%endif
 Requires: qwtplot3d-qt4-devel
 Requires: redhat-lsb
 Requires: rpmdevtools
@@ -44,8 +50,14 @@ Requires: texlive-latex-bin
 Requires: texlive-was
 Requires: tex-preview
 Requires: dvipng
+%if 0%{?el6}
+Requires: mantidlibs-qt-devel
+Requires: mantidlibs-qtwebkit-devel
+Requires: scl-utils
+%else
 Requires: qt-devel
 Requires: qtwebkit-devel
+%endif
 
 BuildArch: noarch
 
@@ -68,6 +80,9 @@ required for Mantid development.
 %files
 
 %changelog
+* Wed Aug 13 2014 Peter Peterson <petersonpf@ornl.gov>
+- Merged all three distribution spec files into one
+
 * Fri Apr 25 2014 Michael Reuter <reuterma@ornl.gov>
 - Added texlive-latex-bin, texlive-was, tex-preview
 

diff --git a/Code/Mantid/CMakeLists.txt b/Code/Mantid/CMakeLists.txt
@@ -184,13 +184,20 @@ if ( ENABLE_CPACK )
       message ( STATUS " CPACK_PACKAGE_FILE_NAME = ${CPACK_PACKAGE_FILE_NAME}" )
 
       # 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}" MATCHES "Heisenbug" )
+      set ( CPACK_RPM_PACKAGE_REQUIRES "boost >= 1.34.1,qt4 >= 4.2,nexus,nexus-python,gsl,glibc,qwtplot3d-qt4,muParser,numpy" )
+      # OpenCASCADE changed names when packaged for Fedora 20 and RHEL7
+      if( "${UNIX_CODENAME}" MATCHES "Heisenbug" OR "${UNIX_CODENAME}" MATCHES "Maipo" )
         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" )
       endif()
+      # Qwt is qwt5-qt4 in RHEL7
+      if( "${UNIX_CODENAME}" MATCHES "Maipo" )
+        set( CPACK_RPM_PACKAGE_REQUIRES "${CPACK_RPM_PACKAGE_REQUIRES},qwt5-qt4" )
+      else()
+        set( CPACK_RPM_PACKAGE_REQUIRES "${CPACK_RPM_PACKAGE_REQUIRES},qwt" )
+      endif()
+
       set ( CPACK_RPM_PACKAGE_REQUIRES "${CPACK_RPM_PACKAGE_REQUIRES},poco-crypto,poco-data,poco-mysql,poco-sqlite,poco-odbc,poco-util,poco-xml,poco-zip,poco-net,poco-netssl,poco-foundation,PyQt4,sip" )
       set ( CPACK_RPM_PACKAGE_REQUIRES "${CPACK_RPM_PACKAGE_REQUIRES},python-ipython >= 1.1.0" )
       # scipy & matplotlib

diff --git a/Code/Mantid/Framework/API/inc/MantidAPI/ExperimentInfo.h b/Code/Mantid/Framework/API/inc/MantidAPI/ExperimentInfo.h
@@ -155,7 +155,7 @@ namespace API
   private:
     /// Fill with given instrument parameter
     void populateWithParameter(Geometry::ParameterMap & paramMap,
-                               const std::string & name, const Geometry::XMLlogfile & paramInfo,
+                               const std::string & name, const Geometry::XMLInstrumentParameter & paramInfo,
                                const Run & runData);
 
     /// Detector grouping information

diff --git a/Code/Mantid/Framework/API/inc/MantidAPI/MatrixWorkspace.h b/Code/Mantid/Framework/API/inc/MantidAPI/MatrixWorkspace.h
@@ -167,7 +167,7 @@ namespace Mantid
       const MantidVec& readDx(size_t const index) const { return getSpectrum(index)->dataDx(); }
 
       /// Returns the x data
-      virtual MantidVec& dataX(const std::size_t index) { return getSpectrum(index)->dataX(); }
+      virtual MantidVec& dataX(const std::size_t index) { invalidateCommonBinsFlag(); return getSpectrum(index)->dataX(); }
       /// Returns the y data
       virtual MantidVec& dataY(const std::size_t index) { return getSpectrum(index)->dataY(); }
       /// Returns the error data
@@ -192,13 +192,13 @@ namespace Mantid
       virtual Kernel::cow_ptr<MantidVec> refX(const std::size_t index) const { return getSpectrum(index)->ptrX(); }
 
       /// Set the specified X array to point to the given existing array
-      virtual void setX(const std::size_t index, const MantidVec& X) { getSpectrum(index)->setX(X); }
+      virtual void setX(const std::size_t index, const MantidVec& X) { getSpectrum(index)->setX(X); invalidateCommonBinsFlag(); }
 
       /// Set the specified X array to point to the given existing array
-      virtual void setX(const std::size_t index, const MantidVecPtr& X) { getSpectrum(index)->setX(X); }
+      virtual void setX(const std::size_t index, const MantidVecPtr& X) { getSpectrum(index)->setX(X); invalidateCommonBinsFlag(); }
 
       /// Set the specified X array to point to the given existing array
-      virtual void setX(const std::size_t index, const MantidVecPtr::ptr_type& X)  { getSpectrum(index)->setX(X); }
+      virtual void setX(const std::size_t index, const MantidVecPtr::ptr_type& X)  { getSpectrum(index)->setX(X); invalidateCommonBinsFlag(); }
 
       /** Sets the data in the workspace
       @param index :: the workspace index to set.
@@ -232,10 +232,13 @@ namespace Mantid
       int axes() const;
       Axis* getAxis(const std::size_t& axisIndex) const;
       void replaceAxis(const std::size_t& axisIndex, Axis* const newAxis);
-
+      
       /// Returns true if the workspace contains data in histogram form (as opposed to point-like)
       virtual bool isHistogramData() const;
 
+      /// Returns true if the workspace contains has common X bins
+      virtual bool isCommonBins() const;
+
       std::string YUnit() const;
       void setYUnit(const std::string& newUnit);
       std::string YUnitLabel() const;
@@ -314,6 +317,9 @@ namespace Mantid
       /// Initialises the workspace. Sets the size and lengths of the arrays. Must be overloaded.
       virtual void init(const std::size_t &NVectors, const std::size_t &XLength, const std::size_t &YLength) = 0;
 
+      /// Invalidates the commons bins flag.  This is generally called when a method could allow the X values to be changed.
+      void invalidateCommonBinsFlag() { m_isCommonBinsFlagSet = false; }
+
       /// A vector of pointers to the axes for this workspace
       std::vector<Axis*> m_axes;
 
@@ -332,6 +338,12 @@ namespace Mantid
       std::string m_YUnitLabel;
       /// Flag indicating whether the Y-values are dimensioned. False by default
       bool m_isDistribution;
+
+      /// Flag indicating whether the m_isCommonBinsFlag has been set. False by default
+      mutable bool m_isCommonBinsFlagSet;
+      /// Flag indicating whether the data has common bins. False by default
+      mutable bool m_isCommonBinsFlag;
+
       /// The set of masked bins in a map keyed on spectrum index
       std::map< int64_t, MaskList > m_masks;