Refs #6383 put goniometer into peaks workspace

mantidproject · Jan 23, 2013 · 8d6d4ad · 8d6d4ad
1 parent 8b93b36
commit 8d6d4ad
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/Code/Mantid/Framework/Crystal/src/LoadIsawPeaks.cpp b/Code/Mantid/Framework/Crystal/src/LoadIsawPeaks.cpp
@@ -478,6 +478,13 @@ namespace Crystal
       // Read the header if necessary
       s = readPeakBlockHeader( s ,  in  , run , bankNum , chi , phi ,
           omega , monCount );
+      // Build the Rotation matrix using phi,chi,omega
+      uniGonio.setRotationAngle("phi", phi);
+      uniGonio.setRotationAngle("chi", chi);
+      uniGonio.setRotationAngle("omega", omega);
+      //Put goniometer into peaks workspace
+      outWS->mutableRun().setGoniometer(uniGonio, false);
+
 
       std::ostringstream oss;
       oss << "bank" << bankNum;
@@ -490,11 +497,6 @@ namespace Crystal
         // Read the peak
         Peak peak = readPeak(outWS, s, in, seqNum, bankName);
 
-        // Build the Rotation matrix using phi,chi,omega
-        uniGonio.setRotationAngle("phi", phi);
-        uniGonio.setRotationAngle("chi", chi);
-        uniGonio.setRotationAngle("omega", omega);
-
         // Get the calculated goniometer matrix
         Matrix<double> gonMat = uniGonio.getR();
 

diff --git a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/IPeaksWorkspace.cpp b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/IPeaksWorkspace.cpp
@@ -26,6 +26,8 @@ void export_IPeaksWorkspace()
     .def("getPeak", &IPeaksWorkspace::getPeakPtr, return_internal_reference<>(), "Returns a peak at the given index" )
     .def("createPeak", &IPeaksWorkspace::createPeak, return_internal_reference<>(), "Create a Peak and return it")
     .def("hasIntegratedPeaks", &IPeaksWorkspace::hasIntegratedPeaks, "Determine if the peaks have been integrated")
+    .def("getRun", &IPeaksWorkspace::mutableRun, return_internal_reference<>(),
+             "Return the Run object for this workspace")
       ;
 
   REGISTER_SINGLEVALUE_HANDLER(IPeaksWorkspace_sptr);