Commit 06 Refs #3493 fixed difference in SF num

mantidproject · Nov 6, 2014 · 9a0f247 · 9a0f247
1 parent e6a7764
commit 9a0f247
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 13 deletions.
diff --git a/Code/Mantid/Framework/DataHandling/src/SaveAscii2.cpp b/Code/Mantid/Framework/DataHandling/src/SaveAscii2.cpp
@@ -93,7 +93,7 @@ namespace Mantid
       int nSpectra = static_cast<int>(m_ws->getNumberHistograms());
       m_nBins = static_cast<int>(m_ws->blocksize());
       m_isHistogram = m_ws->isHistogramData();
-      //m_isCommonBins = m_ws->isCommonBins(); //checking for ragged workspace
+      m_isCommonBins = m_ws->isCommonBins(); //checking for ragged workspace
       m_writeID = getProperty("WriteSpectrumID");
       if (nSpectra != 1) m_writeID = true;
 
@@ -246,17 +246,17 @@ namespace Mantid
 
       for(int bin=0;bin<m_nBins;bin++)                                                                                                                                                                                                                                                                     
       {
-        //if (!m_isCommonBins) //checking for ragged workspace
-        //{
-        //  file << m_ws->readX(*spectraItr)[bin];
-        //}
+        if (!m_isCommonBins) //checking for ragged workspace
+        {
+          file << (m_ws->readX(*spectraItr)[bin] + m_ws->readX(*spectraItr)[bin+1] )/2;
+        }
 
-        if (m_isHistogram  ) // bin centres,& m_isCommonBins
+        else if (m_isHistogram & m_isCommonBins) // bin centres,  
         {
           file << ( m_ws->readX(0)[bin] + m_ws->readX(0)[bin+1] )/2; 
         }
 
-        else // data points
+        else 
         {
           file << m_ws->readX(0)[bin];
         }
@@ -294,14 +294,14 @@ namespace Mantid
 
       for(int bin=0;bin<m_nBins;bin++)
       {
-        if (m_isHistogram ) // bin centres, & m_isCommonBins
+        if (m_isHistogram & m_isCommonBins) // bin centres, 
+        {
+          file << m_ws->readX(0)[bin]; //+ m_ws->readX(0)[bin+1] )/2
+        }
+        else if (!m_isCommonBins) //checking for ragged workspace
         {
-          file << ( m_ws->readX(0)[bin] + m_ws->readX(0)[bin+1] )/2;
+          file << (m_ws->readX(spectraIndex)[bin]);
         }
-        //if (!m_isCommonBins) //checking for ragged workspace
-        //{
-        //  file << m_ws->readX(spectraIndex)[bin];
-        //}
         else // data points
         {
           file << m_ws->readX(0)[bin];

diff --git a/Test/AutoTestData/UsageData/INES_Definition.vtp b/Test/AutoTestData/UsageData/INES_Definition.vtp
@@ -0,0 +1,22 @@
+<VTKFile byte_order="LittleEndian" type="PolyData" version="1.0">
+	<PolyData>
+		<Piece NumberOfPoints="0" NumberOfPolys="0" name="1">
+			<Points>
+				<DataArray NumberOfComponents="3" format="ascii" type="Float32"/>
+			</Points>
+			<Polys>
+				<DataArray Name="connectivity" format="ascii" type="Int32"/>
+				<DataArray Name="offsets" format="ascii" type="Int32"/>
+			</Polys>
+		</Piece>
+		<Piece NumberOfPoints="0" NumberOfPolys="0" name="0">
+			<Points>
+				<DataArray NumberOfComponents="3" format="ascii" type="Float32"/>
+			</Points>
+			<Polys>
+				<DataArray Name="connectivity" format="ascii" type="Int32"/>
+				<DataArray Name="offsets" format="ascii" type="Int32"/>
+			</Polys>
+		</Piece>
+	</PolyData>
+</VTKFile>