Index: build_tools/jenkins_win_build.bat
===================================================================
--- build_tools/jenkins_win_build.bat	(revision a78bc87ac448461a402d683240b496a5ae992bd3)
+++ build_tools/jenkins_win_build.bat	(revision b188f539f0b466527556326ac57d3a85d08ff6a0)
@@ -5,4 +5,5 @@
 set INNO="C:\Program Files (x86)\Inno Setup 5\ISCC.exe"
 set GIT_SED=C:\"Program Files (x86)"\Git\bin\sed.exe
+set SAS_COMPILER=mingw
 
 
Index: sasview/test/1d_data/hSDS_D2O_0p5_percent.xml
===================================================================
--- sasview/test/1d_data/hSDS_D2O_0p5_percent.xml	(revision 24c41e6ad9e9248b99c36524d45d905400789ffc)
+++ sasview/test/1d_data/hSDS_D2O_0p5_percent.xml	(revision 7ffa826d625e9651799a11739699dfcf746f3795)
@@ -149,94 +149,94 @@
 		</SASdata>
 		<SAStransmission_spectrum name="sample">
-			<Tdata><Lambda unit="Wavelength">2.2385</Lambda><T unit="none">0.709123</T><Tdev unit="none">0.0156311</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.31685</Lambda><T unit="none">0.707073</T><Tdev unit="none">0.014406</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.39794</Lambda><T unit="none">0.709408</T><Tdev unit="none">0.013713</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.48186</Lambda><T unit="none">0.707836</T><Tdev unit="none">0.0130059</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.56873</Lambda><T unit="none">0.690329</T><Tdev unit="none">0.0122169</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.65864</Lambda><T unit="none">0.697652</T><Tdev unit="none">0.0122091</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.75169</Lambda><T unit="none">0.687604</T><Tdev unit="none">0.0119481</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.848</Lambda><T unit="none">0.693904</T><Tdev unit="none">0.0119585</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.94768</Lambda><T unit="none">0.688256</T><Tdev unit="none">0.0117593</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.05085</Lambda><T unit="none">0.688661</T><Tdev unit="none">0.0118079</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.15763</Lambda><T unit="none">0.687085</T><Tdev unit="none">0.0118432</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.26814</Lambda><T unit="none">0.686791</T><Tdev unit="none">0.011904</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.38253</Lambda><T unit="none">0.665377</T><Tdev unit="none">0.0118216</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.50092</Lambda><T unit="none">0.661557</T><Tdev unit="none">0.0118643</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.62345</Lambda><T unit="none">0.656968</T><Tdev unit="none">0.0121532</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.75027</Lambda><T unit="none">0.661221</T><Tdev unit="none">0.0124156</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.88153</Lambda><T unit="none">0.655166</T><Tdev unit="none">0.0125237</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">4.01738</Lambda><T unit="none">0.656952</T><Tdev unit="none">0.0127909</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">4.15799</Lambda><T unit="none">0.648161</T><Tdev unit="none">0.0125787</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">4.30352</Lambda><T unit="none">0.652103</T><Tdev unit="none">0.0127132</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">4.45414</Lambda><T unit="none">0.652747</T><Tdev unit="none">0.0126102</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">4.61004</Lambda><T unit="none">0.654757</T><Tdev unit="none">0.0129907</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">4.77139</Lambda><T unit="none">0.652484</T><Tdev unit="none">0.012587</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">4.93839</Lambda><T unit="none">0.633223</T><Tdev unit="none">0.0120561</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">5.11123</Lambda><T unit="none">0.641331</T><Tdev unit="none">0.0123315</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">5.29012</Lambda><T unit="none">0.637552</T><Tdev unit="none">0.0124599</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">5.47528</Lambda><T unit="none">0.65181</T><Tdev unit="none">0.0127577</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">5.66691</Lambda><T unit="none">0.632429</T><Tdev unit="none">0.0127482</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">5.86525</Lambda><T unit="none">0.634692</T><Tdev unit="none">0.0130638</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">6.07054</Lambda><T unit="none">0.627598</T><Tdev unit="none">0.013359</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">6.28301</Lambda><T unit="none">0.626223</T><Tdev unit="none">0.0139519</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">6.50291</Lambda><T unit="none">0.614028</T><Tdev unit="none">0.0137582</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">6.73051</Lambda><T unit="none">0.634283</T><Tdev unit="none">0.0149458</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">6.96608</Lambda><T unit="none">0.634423</T><Tdev unit="none">0.0157783</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">7.2099</Lambda><T unit="none">0.646179</T><Tdev unit="none">0.0167181</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">7.46224</Lambda><T unit="none">0.639745</T><Tdev unit="none">0.0178784</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">7.72342</Lambda><T unit="none">0.671474</T><Tdev unit="none">0.019813</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">7.99374</Lambda><T unit="none">0.73097</T><Tdev unit="none">0.0228352</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">8.27352</Lambda><T unit="none">0.651515</T><Tdev unit="none">0.0220147</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">8.56309</Lambda><T unit="none">0.717888</T><Tdev unit="none">0.0258823</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">8.8628</Lambda><T unit="none">0.668446</T><Tdev unit="none">0.0261152</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">9.173</Lambda><T unit="none">0.656197</T><Tdev unit="none">0.0277635</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">9.49406</Lambda><T unit="none">0.658201</T><Tdev unit="none">0.0302085</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">9.82867</Lambda><T unit="none">0.651859</T><Tdev unit="none">0.0331165</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.2385</Lambda><T unit="none">0.709123</T><Tdev unit="none">0.0156311</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.31685</Lambda><T unit="none">0.707073</T><Tdev unit="none">0.014406</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.39794</Lambda><T unit="none">0.709408</T><Tdev unit="none">0.013713</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.48186</Lambda><T unit="none">0.707836</T><Tdev unit="none">0.0130059</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.56873</Lambda><T unit="none">0.690329</T><Tdev unit="none">0.0122169</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.65864</Lambda><T unit="none">0.697652</T><Tdev unit="none">0.0122091</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.75169</Lambda><T unit="none">0.687604</T><Tdev unit="none">0.0119481</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.848</Lambda><T unit="none">0.693904</T><Tdev unit="none">0.0119585</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.94768</Lambda><T unit="none">0.688256</T><Tdev unit="none">0.0117593</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.05085</Lambda><T unit="none">0.688661</T><Tdev unit="none">0.0118079</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.15763</Lambda><T unit="none">0.687085</T><Tdev unit="none">0.0118432</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.26814</Lambda><T unit="none">0.686791</T><Tdev unit="none">0.011904</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.38253</Lambda><T unit="none">0.665377</T><Tdev unit="none">0.0118216</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.50092</Lambda><T unit="none">0.661557</T><Tdev unit="none">0.0118643</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.62345</Lambda><T unit="none">0.656968</T><Tdev unit="none">0.0121532</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.75027</Lambda><T unit="none">0.661221</T><Tdev unit="none">0.0124156</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.88153</Lambda><T unit="none">0.655166</T><Tdev unit="none">0.0125237</Tdev></Tdata>
+			<Tdata><Lambda unit="A">4.01738</Lambda><T unit="none">0.656952</T><Tdev unit="none">0.0127909</Tdev></Tdata>
+			<Tdata><Lambda unit="A">4.15799</Lambda><T unit="none">0.648161</T><Tdev unit="none">0.0125787</Tdev></Tdata>
+			<Tdata><Lambda unit="A">4.30352</Lambda><T unit="none">0.652103</T><Tdev unit="none">0.0127132</Tdev></Tdata>
+			<Tdata><Lambda unit="A">4.45414</Lambda><T unit="none">0.652747</T><Tdev unit="none">0.0126102</Tdev></Tdata>
+			<Tdata><Lambda unit="A">4.61004</Lambda><T unit="none">0.654757</T><Tdev unit="none">0.0129907</Tdev></Tdata>
+			<Tdata><Lambda unit="A">4.77139</Lambda><T unit="none">0.652484</T><Tdev unit="none">0.012587</Tdev></Tdata>
+			<Tdata><Lambda unit="A">4.93839</Lambda><T unit="none">0.633223</T><Tdev unit="none">0.0120561</Tdev></Tdata>
+			<Tdata><Lambda unit="A">5.11123</Lambda><T unit="none">0.641331</T><Tdev unit="none">0.0123315</Tdev></Tdata>
+			<Tdata><Lambda unit="A">5.29012</Lambda><T unit="none">0.637552</T><Tdev unit="none">0.0124599</Tdev></Tdata>
+			<Tdata><Lambda unit="A">5.47528</Lambda><T unit="none">0.65181</T><Tdev unit="none">0.0127577</Tdev></Tdata>
+			<Tdata><Lambda unit="A">5.66691</Lambda><T unit="none">0.632429</T><Tdev unit="none">0.0127482</Tdev></Tdata>
+			<Tdata><Lambda unit="A">5.86525</Lambda><T unit="none">0.634692</T><Tdev unit="none">0.0130638</Tdev></Tdata>
+			<Tdata><Lambda unit="A">6.07054</Lambda><T unit="none">0.627598</T><Tdev unit="none">0.013359</Tdev></Tdata>
+			<Tdata><Lambda unit="A">6.28301</Lambda><T unit="none">0.626223</T><Tdev unit="none">0.0139519</Tdev></Tdata>
+			<Tdata><Lambda unit="A">6.50291</Lambda><T unit="none">0.614028</T><Tdev unit="none">0.0137582</Tdev></Tdata>
+			<Tdata><Lambda unit="A">6.73051</Lambda><T unit="none">0.634283</T><Tdev unit="none">0.0149458</Tdev></Tdata>
+			<Tdata><Lambda unit="A">6.96608</Lambda><T unit="none">0.634423</T><Tdev unit="none">0.0157783</Tdev></Tdata>
+			<Tdata><Lambda unit="A">7.2099</Lambda><T unit="none">0.646179</T><Tdev unit="none">0.0167181</Tdev></Tdata>
+			<Tdata><Lambda unit="A">7.46224</Lambda><T unit="none">0.639745</T><Tdev unit="none">0.0178784</Tdev></Tdata>
+			<Tdata><Lambda unit="A">7.72342</Lambda><T unit="none">0.671474</T><Tdev unit="none">0.019813</Tdev></Tdata>
+			<Tdata><Lambda unit="A">7.99374</Lambda><T unit="none">0.73097</T><Tdev unit="none">0.0228352</Tdev></Tdata>
+			<Tdata><Lambda unit="A">8.27352</Lambda><T unit="none">0.651515</T><Tdev unit="none">0.0220147</Tdev></Tdata>
+			<Tdata><Lambda unit="A">8.56309</Lambda><T unit="none">0.717888</T><Tdev unit="none">0.0258823</Tdev></Tdata>
+			<Tdata><Lambda unit="A">8.8628</Lambda><T unit="none">0.668446</T><Tdev unit="none">0.0261152</Tdev></Tdata>
+			<Tdata><Lambda unit="A">9.173</Lambda><T unit="none">0.656197</T><Tdev unit="none">0.0277635</Tdev></Tdata>
+			<Tdata><Lambda unit="A">9.49406</Lambda><T unit="none">0.658201</T><Tdev unit="none">0.0302085</Tdev></Tdata>
+			<Tdata><Lambda unit="A">9.82867</Lambda><T unit="none">0.651859</T><Tdev unit="none">0.0331165</Tdev></Tdata>
 		</SAStransmission_spectrum>
 		<SAStransmission_spectrum name="can">
-			<Tdata><Lambda unit="Wavelength">2.2385</Lambda><T unit="none">0.727588</T><Tdev unit="none">0.0158998</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.31685</Lambda><T unit="none">0.721742</T><Tdev unit="none">0.0145372</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.39794</Lambda><T unit="none">0.727301</T><Tdev unit="none">0.0139723</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.48186</Lambda><T unit="none">0.733651</T><Tdev unit="none">0.0133522</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.56873</Lambda><T unit="none">0.708769</T><Tdev unit="none">0.0124337</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.65864</Lambda><T unit="none">0.719468</T><Tdev unit="none">0.0124562</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.75169</Lambda><T unit="none">0.702402</T><Tdev unit="none">0.0120783</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.848</Lambda><T unit="none">0.697922</T><Tdev unit="none">0.0120089</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.94768</Lambda><T unit="none">0.697948</T><Tdev unit="none">0.0118972</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.05085</Lambda><T unit="none">0.672376</T><Tdev unit="none">0.0115341</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.15763</Lambda><T unit="none">0.679647</T><Tdev unit="none">0.0116933</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.26814</Lambda><T unit="none">0.675152</T><Tdev unit="none">0.0117553</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.38253</Lambda><T unit="none">0.689037</T><Tdev unit="none">0.0121333</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.50092</Lambda><T unit="none">0.681897</T><Tdev unit="none">0.0121972</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.62345</Lambda><T unit="none">0.691561</T><Tdev unit="none">0.0125677</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.75027</Lambda><T unit="none">0.677965</T><Tdev unit="none">0.0125759</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.88153</Lambda><T unit="none">0.682284</T><Tdev unit="none">0.0129018</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">4.01738</Lambda><T unit="none">0.663371</T><Tdev unit="none">0.0128811</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">4.15799</Lambda><T unit="none">0.661696</T><Tdev unit="none">0.012782</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">4.30352</Lambda><T unit="none">0.669405</T><Tdev unit="none">0.0128953</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">4.45414</Lambda><T unit="none">0.669118</T><Tdev unit="none">0.0127914</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">4.61004</Lambda><T unit="none">0.69353</T><Tdev unit="none">0.0135635</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">4.77139</Lambda><T unit="none">0.639561</T><Tdev unit="none">0.0123333</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">4.93839</Lambda><T unit="none">0.657168</T><Tdev unit="none">0.0123225</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">5.11123</Lambda><T unit="none">0.670312</T><Tdev unit="none">0.0127275</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">5.29012</Lambda><T unit="none">0.634913</T><Tdev unit="none">0.012332</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">5.47528</Lambda><T unit="none">0.63258</T><Tdev unit="none">0.0124404</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">5.66691</Lambda><T unit="none">0.655986</T><Tdev unit="none">0.013124</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">5.86525</Lambda><T unit="none">0.636271</T><Tdev unit="none">0.0130937</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">6.07054</Lambda><T unit="none">0.630462</T><Tdev unit="none">0.0133119</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">6.28301</Lambda><T unit="none">0.657602</T><Tdev unit="none">0.0143499</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">6.50291</Lambda><T unit="none">0.646356</T><Tdev unit="none">0.0142434</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">6.73051</Lambda><T unit="none">0.656583</T><Tdev unit="none">0.0152343</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">6.96608</Lambda><T unit="none">0.662525</T><Tdev unit="none">0.0162915</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">7.2099</Lambda><T unit="none">0.673293</T><Tdev unit="none">0.0172696</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">7.46224</Lambda><T unit="none">0.66953</T><Tdev unit="none">0.0184858</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">7.72342</Lambda><T unit="none">0.67777</T><Tdev unit="none">0.0199275</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">7.99374</Lambda><T unit="none">0.701727</T><Tdev unit="none">0.0221297</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">8.27352</Lambda><T unit="none">0.669309</T><Tdev unit="none">0.0225875</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">8.56309</Lambda><T unit="none">0.742833</T><Tdev unit="none">0.026469</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">8.8628</Lambda><T unit="none">0.703934</T><Tdev unit="none">0.0272645</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">9.173</Lambda><T unit="none">0.703654</T><Tdev unit="none">0.0291621</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">9.49406</Lambda><T unit="none">0.659669</T><Tdev unit="none">0.0303307</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">9.82867</Lambda><T unit="none">0.647612</T><Tdev unit="none">0.0323176</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.2385</Lambda><T unit="none">0.727588</T><Tdev unit="none">0.0158998</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.31685</Lambda><T unit="none">0.721742</T><Tdev unit="none">0.0145372</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.39794</Lambda><T unit="none">0.727301</T><Tdev unit="none">0.0139723</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.48186</Lambda><T unit="none">0.733651</T><Tdev unit="none">0.0133522</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.56873</Lambda><T unit="none">0.708769</T><Tdev unit="none">0.0124337</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.65864</Lambda><T unit="none">0.719468</T><Tdev unit="none">0.0124562</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.75169</Lambda><T unit="none">0.702402</T><Tdev unit="none">0.0120783</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.848</Lambda><T unit="none">0.697922</T><Tdev unit="none">0.0120089</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.94768</Lambda><T unit="none">0.697948</T><Tdev unit="none">0.0118972</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.05085</Lambda><T unit="none">0.672376</T><Tdev unit="none">0.0115341</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.15763</Lambda><T unit="none">0.679647</T><Tdev unit="none">0.0116933</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.26814</Lambda><T unit="none">0.675152</T><Tdev unit="none">0.0117553</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.38253</Lambda><T unit="none">0.689037</T><Tdev unit="none">0.0121333</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.50092</Lambda><T unit="none">0.681897</T><Tdev unit="none">0.0121972</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.62345</Lambda><T unit="none">0.691561</T><Tdev unit="none">0.0125677</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.75027</Lambda><T unit="none">0.677965</T><Tdev unit="none">0.0125759</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.88153</Lambda><T unit="none">0.682284</T><Tdev unit="none">0.0129018</Tdev></Tdata>
+			<Tdata><Lambda unit="A">4.01738</Lambda><T unit="none">0.663371</T><Tdev unit="none">0.0128811</Tdev></Tdata>
+			<Tdata><Lambda unit="A">4.15799</Lambda><T unit="none">0.661696</T><Tdev unit="none">0.012782</Tdev></Tdata>
+			<Tdata><Lambda unit="A">4.30352</Lambda><T unit="none">0.669405</T><Tdev unit="none">0.0128953</Tdev></Tdata>
+			<Tdata><Lambda unit="A">4.45414</Lambda><T unit="none">0.669118</T><Tdev unit="none">0.0127914</Tdev></Tdata>
+			<Tdata><Lambda unit="A">4.61004</Lambda><T unit="none">0.69353</T><Tdev unit="none">0.0135635</Tdev></Tdata>
+			<Tdata><Lambda unit="A">4.77139</Lambda><T unit="none">0.639561</T><Tdev unit="none">0.0123333</Tdev></Tdata>
+			<Tdata><Lambda unit="A">4.93839</Lambda><T unit="none">0.657168</T><Tdev unit="none">0.0123225</Tdev></Tdata>
+			<Tdata><Lambda unit="A">5.11123</Lambda><T unit="none">0.670312</T><Tdev unit="none">0.0127275</Tdev></Tdata>
+			<Tdata><Lambda unit="A">5.29012</Lambda><T unit="none">0.634913</T><Tdev unit="none">0.012332</Tdev></Tdata>
+			<Tdata><Lambda unit="A">5.47528</Lambda><T unit="none">0.63258</T><Tdev unit="none">0.0124404</Tdev></Tdata>
+			<Tdata><Lambda unit="A">5.66691</Lambda><T unit="none">0.655986</T><Tdev unit="none">0.013124</Tdev></Tdata>
+			<Tdata><Lambda unit="A">5.86525</Lambda><T unit="none">0.636271</T><Tdev unit="none">0.0130937</Tdev></Tdata>
+			<Tdata><Lambda unit="A">6.07054</Lambda><T unit="none">0.630462</T><Tdev unit="none">0.0133119</Tdev></Tdata>
+			<Tdata><Lambda unit="A">6.28301</Lambda><T unit="none">0.657602</T><Tdev unit="none">0.0143499</Tdev></Tdata>
+			<Tdata><Lambda unit="A">6.50291</Lambda><T unit="none">0.646356</T><Tdev unit="none">0.0142434</Tdev></Tdata>
+			<Tdata><Lambda unit="A">6.73051</Lambda><T unit="none">0.656583</T><Tdev unit="none">0.0152343</Tdev></Tdata>
+			<Tdata><Lambda unit="A">6.96608</Lambda><T unit="none">0.662525</T><Tdev unit="none">0.0162915</Tdev></Tdata>
+			<Tdata><Lambda unit="A">7.2099</Lambda><T unit="none">0.673293</T><Tdev unit="none">0.0172696</Tdev></Tdata>
+			<Tdata><Lambda unit="A">7.46224</Lambda><T unit="none">0.66953</T><Tdev unit="none">0.0184858</Tdev></Tdata>
+			<Tdata><Lambda unit="A">7.72342</Lambda><T unit="none">0.67777</T><Tdev unit="none">0.0199275</Tdev></Tdata>
+			<Tdata><Lambda unit="A">7.99374</Lambda><T unit="none">0.701727</T><Tdev unit="none">0.0221297</Tdev></Tdata>
+			<Tdata><Lambda unit="A">8.27352</Lambda><T unit="none">0.669309</T><Tdev unit="none">0.0225875</Tdev></Tdata>
+			<Tdata><Lambda unit="A">8.56309</Lambda><T unit="none">0.742833</T><Tdev unit="none">0.026469</Tdev></Tdata>
+			<Tdata><Lambda unit="A">8.8628</Lambda><T unit="none">0.703934</T><Tdev unit="none">0.0272645</Tdev></Tdata>
+			<Tdata><Lambda unit="A">9.173</Lambda><T unit="none">0.703654</T><Tdev unit="none">0.0291621</Tdev></Tdata>
+			<Tdata><Lambda unit="A">9.49406</Lambda><T unit="none">0.659669</T><Tdev unit="none">0.0303307</Tdev></Tdata>
+			<Tdata><Lambda unit="A">9.82867</Lambda><T unit="none">0.647612</T><Tdev unit="none">0.0323176</Tdev></Tdata>
 		</SAStransmission_spectrum>
 		<SASsample>
Index: sasview/test/1d_data/hSDS_D2O_2p0_percent.xml
===================================================================
--- sasview/test/1d_data/hSDS_D2O_2p0_percent.xml	(revision 24c41e6ad9e9248b99c36524d45d905400789ffc)
+++ sasview/test/1d_data/hSDS_D2O_2p0_percent.xml	(revision 7ffa826d625e9651799a11739699dfcf746f3795)
@@ -149,94 +149,94 @@
 		</SASdata>
 		<SAStransmission_spectrum name="sample">
-			<Tdata><Lambda unit="Wavelength">2.2385</Lambda><T unit="none">0.838414</T><Tdev unit="none">0.0176514</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.31685</Lambda><T unit="none">0.837222</T><Tdev unit="none">0.0163546</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.39794</Lambda><T unit="none">0.847424</T><Tdev unit="none">0.0157083</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.48186</Lambda><T unit="none">0.825617</T><Tdev unit="none">0.0145546</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.56873</Lambda><T unit="none">0.816259</T><Tdev unit="none">0.0138467</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.65864</Lambda><T unit="none">0.834452</T><Tdev unit="none">0.0139489</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.75169</Lambda><T unit="none">0.819287</T><Tdev unit="none">0.0136124</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.848</Lambda><T unit="none">0.82189</T><Tdev unit="none">0.0135444</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.94768</Lambda><T unit="none">0.819337</T><Tdev unit="none">0.0133188</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.05085</Lambda><T unit="none">0.825509</T><Tdev unit="none">0.0134633</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.15763</Lambda><T unit="none">0.835508</T><Tdev unit="none">0.0137137</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.26814</Lambda><T unit="none">0.825588</T><Tdev unit="none">0.0136954</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.38253</Lambda><T unit="none">0.819473</T><Tdev unit="none">0.0137831</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.50092</Lambda><T unit="none">0.817784</T><Tdev unit="none">0.0139618</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.62345</Lambda><T unit="none">0.791333</T><Tdev unit="none">0.0138581</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.75027</Lambda><T unit="none">0.800737</T><Tdev unit="none">0.0142449</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.88153</Lambda><T unit="none">0.825279</T><Tdev unit="none">0.014821</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">4.01738</Lambda><T unit="none">0.798752</T><Tdev unit="none">0.0147272</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">4.15799</Lambda><T unit="none">0.805149</T><Tdev unit="none">0.0147323</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">4.30352</Lambda><T unit="none">0.806166</T><Tdev unit="none">0.0147367</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">4.45414</Lambda><T unit="none">0.81248</T><Tdev unit="none">0.0147607</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">4.61004</Lambda><T unit="none">0.813264</T><Tdev unit="none">0.0152187</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">4.77139</Lambda><T unit="none">0.79879</T><Tdev unit="none">0.0146092</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">4.93839</Lambda><T unit="none">0.78049</T><Tdev unit="none">0.0139962</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">5.11123</Lambda><T unit="none">0.784708</T><Tdev unit="none">0.0142914</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">5.29012</Lambda><T unit="none">0.779826</T><Tdev unit="none">0.0143514</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">5.47528</Lambda><T unit="none">0.80712</T><Tdev unit="none">0.0148739</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">5.66691</Lambda><T unit="none">0.777279</T><Tdev unit="none">0.0148062</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">5.86525</Lambda><T unit="none">0.779116</T><Tdev unit="none">0.0150964</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">6.07054</Lambda><T unit="none">0.770505</T><Tdev unit="none">0.0154589</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">6.28301</Lambda><T unit="none">0.77816</T><Tdev unit="none">0.016269</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">6.50291</Lambda><T unit="none">0.776007</T><Tdev unit="none">0.0163157</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">6.73051</Lambda><T unit="none">0.759081</T><Tdev unit="none">0.0168386</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">6.96608</Lambda><T unit="none">0.755753</T><Tdev unit="none">0.0178756</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">7.2099</Lambda><T unit="none">0.74828</T><Tdev unit="none">0.0185142</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">7.46224</Lambda><T unit="none">0.785606</T><Tdev unit="none">0.0206497</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">7.72342</Lambda><T unit="none">0.81145</T><Tdev unit="none">0.0226681</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">7.99374</Lambda><T unit="none">0.843811</T><Tdev unit="none">0.0254157</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">8.27352</Lambda><T unit="none">0.807734</T><Tdev unit="none">0.0260948</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">8.56309</Lambda><T unit="none">0.856779</T><Tdev unit="none">0.0296118</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">8.8628</Lambda><T unit="none">0.798194</T><Tdev unit="none">0.0296663</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">9.173</Lambda><T unit="none">0.821945</T><Tdev unit="none">0.0326983</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">9.49406</Lambda><T unit="none">0.78935</T><Tdev unit="none">0.0347579</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">9.82867</Lambda><T unit="none">0.791521</T><Tdev unit="none">0.0378514</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.2385</Lambda><T unit="none">0.838414</T><Tdev unit="none">0.0176514</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.31685</Lambda><T unit="none">0.837222</T><Tdev unit="none">0.0163546</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.39794</Lambda><T unit="none">0.847424</T><Tdev unit="none">0.0157083</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.48186</Lambda><T unit="none">0.825617</T><Tdev unit="none">0.0145546</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.56873</Lambda><T unit="none">0.816259</T><Tdev unit="none">0.0138467</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.65864</Lambda><T unit="none">0.834452</T><Tdev unit="none">0.0139489</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.75169</Lambda><T unit="none">0.819287</T><Tdev unit="none">0.0136124</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.848</Lambda><T unit="none">0.82189</T><Tdev unit="none">0.0135444</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.94768</Lambda><T unit="none">0.819337</T><Tdev unit="none">0.0133188</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.05085</Lambda><T unit="none">0.825509</T><Tdev unit="none">0.0134633</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.15763</Lambda><T unit="none">0.835508</T><Tdev unit="none">0.0137137</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.26814</Lambda><T unit="none">0.825588</T><Tdev unit="none">0.0136954</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.38253</Lambda><T unit="none">0.819473</T><Tdev unit="none">0.0137831</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.50092</Lambda><T unit="none">0.817784</T><Tdev unit="none">0.0139618</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.62345</Lambda><T unit="none">0.791333</T><Tdev unit="none">0.0138581</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.75027</Lambda><T unit="none">0.800737</T><Tdev unit="none">0.0142449</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.88153</Lambda><T unit="none">0.825279</T><Tdev unit="none">0.014821</Tdev></Tdata>
+			<Tdata><Lambda unit="A">4.01738</Lambda><T unit="none">0.798752</T><Tdev unit="none">0.0147272</Tdev></Tdata>
+			<Tdata><Lambda unit="A">4.15799</Lambda><T unit="none">0.805149</T><Tdev unit="none">0.0147323</Tdev></Tdata>
+			<Tdata><Lambda unit="A">4.30352</Lambda><T unit="none">0.806166</T><Tdev unit="none">0.0147367</Tdev></Tdata>
+			<Tdata><Lambda unit="A">4.45414</Lambda><T unit="none">0.81248</T><Tdev unit="none">0.0147607</Tdev></Tdata>
+			<Tdata><Lambda unit="A">4.61004</Lambda><T unit="none">0.813264</T><Tdev unit="none">0.0152187</Tdev></Tdata>
+			<Tdata><Lambda unit="A">4.77139</Lambda><T unit="none">0.79879</T><Tdev unit="none">0.0146092</Tdev></Tdata>
+			<Tdata><Lambda unit="A">4.93839</Lambda><T unit="none">0.78049</T><Tdev unit="none">0.0139962</Tdev></Tdata>
+			<Tdata><Lambda unit="A">5.11123</Lambda><T unit="none">0.784708</T><Tdev unit="none">0.0142914</Tdev></Tdata>
+			<Tdata><Lambda unit="A">5.29012</Lambda><T unit="none">0.779826</T><Tdev unit="none">0.0143514</Tdev></Tdata>
+			<Tdata><Lambda unit="A">5.47528</Lambda><T unit="none">0.80712</T><Tdev unit="none">0.0148739</Tdev></Tdata>
+			<Tdata><Lambda unit="A">5.66691</Lambda><T unit="none">0.777279</T><Tdev unit="none">0.0148062</Tdev></Tdata>
+			<Tdata><Lambda unit="A">5.86525</Lambda><T unit="none">0.779116</T><Tdev unit="none">0.0150964</Tdev></Tdata>
+			<Tdata><Lambda unit="A">6.07054</Lambda><T unit="none">0.770505</T><Tdev unit="none">0.0154589</Tdev></Tdata>
+			<Tdata><Lambda unit="A">6.28301</Lambda><T unit="none">0.77816</T><Tdev unit="none">0.016269</Tdev></Tdata>
+			<Tdata><Lambda unit="A">6.50291</Lambda><T unit="none">0.776007</T><Tdev unit="none">0.0163157</Tdev></Tdata>
+			<Tdata><Lambda unit="A">6.73051</Lambda><T unit="none">0.759081</T><Tdev unit="none">0.0168386</Tdev></Tdata>
+			<Tdata><Lambda unit="A">6.96608</Lambda><T unit="none">0.755753</T><Tdev unit="none">0.0178756</Tdev></Tdata>
+			<Tdata><Lambda unit="A">7.2099</Lambda><T unit="none">0.74828</T><Tdev unit="none">0.0185142</Tdev></Tdata>
+			<Tdata><Lambda unit="A">7.46224</Lambda><T unit="none">0.785606</T><Tdev unit="none">0.0206497</Tdev></Tdata>
+			<Tdata><Lambda unit="A">7.72342</Lambda><T unit="none">0.81145</T><Tdev unit="none">0.0226681</Tdev></Tdata>
+			<Tdata><Lambda unit="A">7.99374</Lambda><T unit="none">0.843811</T><Tdev unit="none">0.0254157</Tdev></Tdata>
+			<Tdata><Lambda unit="A">8.27352</Lambda><T unit="none">0.807734</T><Tdev unit="none">0.0260948</Tdev></Tdata>
+			<Tdata><Lambda unit="A">8.56309</Lambda><T unit="none">0.856779</T><Tdev unit="none">0.0296118</Tdev></Tdata>
+			<Tdata><Lambda unit="A">8.8628</Lambda><T unit="none">0.798194</T><Tdev unit="none">0.0296663</Tdev></Tdata>
+			<Tdata><Lambda unit="A">9.173</Lambda><T unit="none">0.821945</T><Tdev unit="none">0.0326983</Tdev></Tdata>
+			<Tdata><Lambda unit="A">9.49406</Lambda><T unit="none">0.78935</T><Tdev unit="none">0.0347579</Tdev></Tdata>
+			<Tdata><Lambda unit="A">9.82867</Lambda><T unit="none">0.791521</T><Tdev unit="none">0.0378514</Tdev></Tdata>
 		</SAStransmission_spectrum>
 		<SAStransmission_spectrum name="can">
-			<Tdata><Lambda unit="Wavelength">2.2385</Lambda><T unit="none">0.860815</T><Tdev unit="none">0.0180986</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.31685</Lambda><T unit="none">0.845167</T><Tdev unit="none">0.0164779</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.39794</Lambda><T unit="none">0.844483</T><Tdev unit="none">0.015598</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.48186</Lambda><T unit="none">0.837217</T><Tdev unit="none">0.0146662</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.56873</Lambda><T unit="none">0.828356</T><Tdev unit="none">0.0140106</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.65864</Lambda><T unit="none">0.858083</T><Tdev unit="none">0.0142075</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.75169</Lambda><T unit="none">0.854147</T><Tdev unit="none">0.0140624</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.848</Lambda><T unit="none">0.840658</T><Tdev unit="none">0.0137717</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.94768</Lambda><T unit="none">0.838745</T><Tdev unit="none">0.0135966</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.05085</Lambda><T unit="none">0.842146</T><Tdev unit="none">0.0136675</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.15763</Lambda><T unit="none">0.825875</T><Tdev unit="none">0.0135082</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.26814</Lambda><T unit="none">0.827836</T><Tdev unit="none">0.0136904</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.38253</Lambda><T unit="none">0.826639</T><Tdev unit="none">0.0138799</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.50092</Lambda><T unit="none">0.820645</T><Tdev unit="none">0.0139414</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.62345</Lambda><T unit="none">0.844024</T><Tdev unit="none">0.014627</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.75027</Lambda><T unit="none">0.846513</T><Tdev unit="none">0.0148914</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.88153</Lambda><T unit="none">0.836232</T><Tdev unit="none">0.0150129</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">4.01738</Lambda><T unit="none">0.800463</T><Tdev unit="none">0.0147561</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">4.15799</Lambda><T unit="none">0.82719</T><Tdev unit="none">0.0150243</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">4.30352</Lambda><T unit="none">0.83271</T><Tdev unit="none">0.015155</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">4.45414</Lambda><T unit="none">0.830733</T><Tdev unit="none">0.0149943</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">4.61004</Lambda><T unit="none">0.824462</T><Tdev unit="none">0.0153427</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">4.77139</Lambda><T unit="none">0.81702</T><Tdev unit="none">0.0147501</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">4.93839</Lambda><T unit="none">0.830968</T><Tdev unit="none">0.0146721</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">5.11123</Lambda><T unit="none">0.805246</T><Tdev unit="none">0.0145375</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">5.29012</Lambda><T unit="none">0.822089</T><Tdev unit="none">0.0149643</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">5.47528</Lambda><T unit="none">0.795149</T><Tdev unit="none">0.0146443</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">5.66691</Lambda><T unit="none">0.821482</T><Tdev unit="none">0.0154357</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">5.86525</Lambda><T unit="none">0.803856</T><Tdev unit="none">0.0154916</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">6.07054</Lambda><T unit="none">0.843663</T><Tdev unit="none">0.016612</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">6.28301</Lambda><T unit="none">0.833172</T><Tdev unit="none">0.017083</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">6.50291</Lambda><T unit="none">0.827066</T><Tdev unit="none">0.0169775</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">6.73051</Lambda><T unit="none">0.818692</T><Tdev unit="none">0.0177961</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">6.96608</Lambda><T unit="none">0.820816</T><Tdev unit="none">0.0191031</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">7.2099</Lambda><T unit="none">0.803188</T><Tdev unit="none">0.0196213</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">7.46224</Lambda><T unit="none">0.842642</T><Tdev unit="none">0.0218106</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">7.72342</Lambda><T unit="none">0.866726</T><Tdev unit="none">0.023796</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">7.99374</Lambda><T unit="none">0.854952</T><Tdev unit="none">0.0254612</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">8.27352</Lambda><T unit="none">0.859841</T><Tdev unit="none">0.027075</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">8.56309</Lambda><T unit="none">0.928333</T><Tdev unit="none">0.0312963</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">8.8628</Lambda><T unit="none">0.877753</T><Tdev unit="none">0.0319304</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">9.173</Lambda><T unit="none">0.871583</T><Tdev unit="none">0.0341375</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">9.49406</Lambda><T unit="none">0.865242</T><Tdev unit="none">0.0369399</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">9.82867</Lambda><T unit="none">0.833197</T><Tdev unit="none">0.0391619</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.2385</Lambda><T unit="none">0.860815</T><Tdev unit="none">0.0180986</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.31685</Lambda><T unit="none">0.845167</T><Tdev unit="none">0.0164779</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.39794</Lambda><T unit="none">0.844483</T><Tdev unit="none">0.015598</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.48186</Lambda><T unit="none">0.837217</T><Tdev unit="none">0.0146662</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.56873</Lambda><T unit="none">0.828356</T><Tdev unit="none">0.0140106</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.65864</Lambda><T unit="none">0.858083</T><Tdev unit="none">0.0142075</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.75169</Lambda><T unit="none">0.854147</T><Tdev unit="none">0.0140624</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.848</Lambda><T unit="none">0.840658</T><Tdev unit="none">0.0137717</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.94768</Lambda><T unit="none">0.838745</T><Tdev unit="none">0.0135966</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.05085</Lambda><T unit="none">0.842146</T><Tdev unit="none">0.0136675</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.15763</Lambda><T unit="none">0.825875</T><Tdev unit="none">0.0135082</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.26814</Lambda><T unit="none">0.827836</T><Tdev unit="none">0.0136904</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.38253</Lambda><T unit="none">0.826639</T><Tdev unit="none">0.0138799</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.50092</Lambda><T unit="none">0.820645</T><Tdev unit="none">0.0139414</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.62345</Lambda><T unit="none">0.844024</T><Tdev unit="none">0.014627</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.75027</Lambda><T unit="none">0.846513</T><Tdev unit="none">0.0148914</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.88153</Lambda><T unit="none">0.836232</T><Tdev unit="none">0.0150129</Tdev></Tdata>
+			<Tdata><Lambda unit="A">4.01738</Lambda><T unit="none">0.800463</T><Tdev unit="none">0.0147561</Tdev></Tdata>
+			<Tdata><Lambda unit="A">4.15799</Lambda><T unit="none">0.82719</T><Tdev unit="none">0.0150243</Tdev></Tdata>
+			<Tdata><Lambda unit="A">4.30352</Lambda><T unit="none">0.83271</T><Tdev unit="none">0.015155</Tdev></Tdata>
+			<Tdata><Lambda unit="A">4.45414</Lambda><T unit="none">0.830733</T><Tdev unit="none">0.0149943</Tdev></Tdata>
+			<Tdata><Lambda unit="A">4.61004</Lambda><T unit="none">0.824462</T><Tdev unit="none">0.0153427</Tdev></Tdata>
+			<Tdata><Lambda unit="A">4.77139</Lambda><T unit="none">0.81702</T><Tdev unit="none">0.0147501</Tdev></Tdata>
+			<Tdata><Lambda unit="A">4.93839</Lambda><T unit="none">0.830968</T><Tdev unit="none">0.0146721</Tdev></Tdata>
+			<Tdata><Lambda unit="A">5.11123</Lambda><T unit="none">0.805246</T><Tdev unit="none">0.0145375</Tdev></Tdata>
+			<Tdata><Lambda unit="A">5.29012</Lambda><T unit="none">0.822089</T><Tdev unit="none">0.0149643</Tdev></Tdata>
+			<Tdata><Lambda unit="A">5.47528</Lambda><T unit="none">0.795149</T><Tdev unit="none">0.0146443</Tdev></Tdata>
+			<Tdata><Lambda unit="A">5.66691</Lambda><T unit="none">0.821482</T><Tdev unit="none">0.0154357</Tdev></Tdata>
+			<Tdata><Lambda unit="A">5.86525</Lambda><T unit="none">0.803856</T><Tdev unit="none">0.0154916</Tdev></Tdata>
+			<Tdata><Lambda unit="A">6.07054</Lambda><T unit="none">0.843663</T><Tdev unit="none">0.016612</Tdev></Tdata>
+			<Tdata><Lambda unit="A">6.28301</Lambda><T unit="none">0.833172</T><Tdev unit="none">0.017083</Tdev></Tdata>
+			<Tdata><Lambda unit="A">6.50291</Lambda><T unit="none">0.827066</T><Tdev unit="none">0.0169775</Tdev></Tdata>
+			<Tdata><Lambda unit="A">6.73051</Lambda><T unit="none">0.818692</T><Tdev unit="none">0.0177961</Tdev></Tdata>
+			<Tdata><Lambda unit="A">6.96608</Lambda><T unit="none">0.820816</T><Tdev unit="none">0.0191031</Tdev></Tdata>
+			<Tdata><Lambda unit="A">7.2099</Lambda><T unit="none">0.803188</T><Tdev unit="none">0.0196213</Tdev></Tdata>
+			<Tdata><Lambda unit="A">7.46224</Lambda><T unit="none">0.842642</T><Tdev unit="none">0.0218106</Tdev></Tdata>
+			<Tdata><Lambda unit="A">7.72342</Lambda><T unit="none">0.866726</T><Tdev unit="none">0.023796</Tdev></Tdata>
+			<Tdata><Lambda unit="A">7.99374</Lambda><T unit="none">0.854952</T><Tdev unit="none">0.0254612</Tdev></Tdata>
+			<Tdata><Lambda unit="A">8.27352</Lambda><T unit="none">0.859841</T><Tdev unit="none">0.027075</Tdev></Tdata>
+			<Tdata><Lambda unit="A">8.56309</Lambda><T unit="none">0.928333</T><Tdev unit="none">0.0312963</Tdev></Tdata>
+			<Tdata><Lambda unit="A">8.8628</Lambda><T unit="none">0.877753</T><Tdev unit="none">0.0319304</Tdev></Tdata>
+			<Tdata><Lambda unit="A">9.173</Lambda><T unit="none">0.871583</T><Tdev unit="none">0.0341375</Tdev></Tdata>
+			<Tdata><Lambda unit="A">9.49406</Lambda><T unit="none">0.865242</T><Tdev unit="none">0.0369399</Tdev></Tdata>
+			<Tdata><Lambda unit="A">9.82867</Lambda><T unit="none">0.833197</T><Tdev unit="none">0.0391619</Tdev></Tdata>
 		</SAStransmission_spectrum>
 		<SASsample>
Index: sasview/test/1d_data/hSDS_D2O_2p0_percent_0p2M_NaCl.xml
===================================================================
--- sasview/test/1d_data/hSDS_D2O_2p0_percent_0p2M_NaCl.xml	(revision 24c41e6ad9e9248b99c36524d45d905400789ffc)
+++ sasview/test/1d_data/hSDS_D2O_2p0_percent_0p2M_NaCl.xml	(revision 7ffa826d625e9651799a11739699dfcf746f3795)
@@ -149,94 +149,94 @@
 		</SASdata>
 		<SAStransmission_spectrum name="sample">
-			<Tdata><Lambda unit="Wavelength">2.2385</Lambda><T unit="none">0.86816</T><Tdev unit="none">0.0182583</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.31685</Lambda><T unit="none">0.851364</T><Tdev unit="none">0.0165751</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.39794</Lambda><T unit="none">0.850328</T><Tdev unit="none">0.015748</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.48186</Lambda><T unit="none">0.819327</T><Tdev unit="none">0.0144717</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.56873</Lambda><T unit="none">0.824205</T><Tdev unit="none">0.0139193</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.65864</Lambda><T unit="none">0.830737</T><Tdev unit="none">0.0138335</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.75169</Lambda><T unit="none">0.83823</T><Tdev unit="none">0.0138853</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.848</Lambda><T unit="none">0.843573</T><Tdev unit="none">0.0138911</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.94768</Lambda><T unit="none">0.814884</T><Tdev unit="none">0.0132879</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.05085</Lambda><T unit="none">0.820156</T><Tdev unit="none">0.0134283</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.15763</Lambda><T unit="none">0.812478</T><Tdev unit="none">0.013356</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.26814</Lambda><T unit="none">0.829049</T><Tdev unit="none">0.0137348</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.38253</Lambda><T unit="none">0.816297</T><Tdev unit="none">0.0137839</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.50092</Lambda><T unit="none">0.807763</T><Tdev unit="none">0.013791</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.62345</Lambda><T unit="none">0.811704</T><Tdev unit="none">0.0141782</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.75027</Lambda><T unit="none">0.826308</T><Tdev unit="none">0.0146706</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.88153</Lambda><T unit="none">0.800996</T><Tdev unit="none">0.0145204</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">4.01738</Lambda><T unit="none">0.789541</T><Tdev unit="none">0.0145953</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">4.15799</Lambda><T unit="none">0.814097</T><Tdev unit="none">0.0148735</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">4.30352</Lambda><T unit="none">0.82196</T><Tdev unit="none">0.0150057</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">4.45414</Lambda><T unit="none">0.813332</T><Tdev unit="none">0.0148418</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">4.61004</Lambda><T unit="none">0.813151</T><Tdev unit="none">0.0152674</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">4.77139</Lambda><T unit="none">0.79673</T><Tdev unit="none">0.0144917</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">4.93839</Lambda><T unit="none">0.794078</T><Tdev unit="none">0.0141706</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">5.11123</Lambda><T unit="none">0.813549</T><Tdev unit="none">0.0146863</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">5.29012</Lambda><T unit="none">0.816075</T><Tdev unit="none">0.0148919</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">5.47528</Lambda><T unit="none">0.795511</T><Tdev unit="none">0.0146964</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">5.66691</Lambda><T unit="none">0.801745</T><Tdev unit="none">0.0151593</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">5.86525</Lambda><T unit="none">0.795244</T><Tdev unit="none">0.0153005</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">6.07054</Lambda><T unit="none">0.796238</T><Tdev unit="none">0.0157736</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">6.28301</Lambda><T unit="none">0.787198</T><Tdev unit="none">0.0164255</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">6.50291</Lambda><T unit="none">0.774648</T><Tdev unit="none">0.0163529</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">6.73051</Lambda><T unit="none">0.790995</T><Tdev unit="none">0.0175304</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">6.96608</Lambda><T unit="none">0.798801</T><Tdev unit="none">0.0186696</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">7.2099</Lambda><T unit="none">0.814048</T><Tdev unit="none">0.0197538</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">7.46224</Lambda><T unit="none">0.798556</T><Tdev unit="none">0.0209193</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">7.72342</Lambda><T unit="none">0.819364</T><Tdev unit="none">0.0227707</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">7.99374</Lambda><T unit="none">0.806212</T><Tdev unit="none">0.024287</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">8.27352</Lambda><T unit="none">0.783517</T><Tdev unit="none">0.0251105</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">8.56309</Lambda><T unit="none">0.852889</T><Tdev unit="none">0.0293667</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">8.8628</Lambda><T unit="none">0.819569</T><Tdev unit="none">0.0305564</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">9.173</Lambda><T unit="none">0.807621</T><Tdev unit="none">0.03205</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">9.49406</Lambda><T unit="none">0.78865</T><Tdev unit="none">0.0347793</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">9.82867</Lambda><T unit="none">0.758171</T><Tdev unit="none">0.0367248</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.2385</Lambda><T unit="none">0.86816</T><Tdev unit="none">0.0182583</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.31685</Lambda><T unit="none">0.851364</T><Tdev unit="none">0.0165751</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.39794</Lambda><T unit="none">0.850328</T><Tdev unit="none">0.015748</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.48186</Lambda><T unit="none">0.819327</T><Tdev unit="none">0.0144717</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.56873</Lambda><T unit="none">0.824205</T><Tdev unit="none">0.0139193</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.65864</Lambda><T unit="none">0.830737</T><Tdev unit="none">0.0138335</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.75169</Lambda><T unit="none">0.83823</T><Tdev unit="none">0.0138853</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.848</Lambda><T unit="none">0.843573</T><Tdev unit="none">0.0138911</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.94768</Lambda><T unit="none">0.814884</T><Tdev unit="none">0.0132879</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.05085</Lambda><T unit="none">0.820156</T><Tdev unit="none">0.0134283</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.15763</Lambda><T unit="none">0.812478</T><Tdev unit="none">0.013356</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.26814</Lambda><T unit="none">0.829049</T><Tdev unit="none">0.0137348</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.38253</Lambda><T unit="none">0.816297</T><Tdev unit="none">0.0137839</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.50092</Lambda><T unit="none">0.807763</T><Tdev unit="none">0.013791</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.62345</Lambda><T unit="none">0.811704</T><Tdev unit="none">0.0141782</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.75027</Lambda><T unit="none">0.826308</T><Tdev unit="none">0.0146706</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.88153</Lambda><T unit="none">0.800996</T><Tdev unit="none">0.0145204</Tdev></Tdata>
+			<Tdata><Lambda unit="A">4.01738</Lambda><T unit="none">0.789541</T><Tdev unit="none">0.0145953</Tdev></Tdata>
+			<Tdata><Lambda unit="A">4.15799</Lambda><T unit="none">0.814097</T><Tdev unit="none">0.0148735</Tdev></Tdata>
+			<Tdata><Lambda unit="A">4.30352</Lambda><T unit="none">0.82196</T><Tdev unit="none">0.0150057</Tdev></Tdata>
+			<Tdata><Lambda unit="A">4.45414</Lambda><T unit="none">0.813332</T><Tdev unit="none">0.0148418</Tdev></Tdata>
+			<Tdata><Lambda unit="A">4.61004</Lambda><T unit="none">0.813151</T><Tdev unit="none">0.0152674</Tdev></Tdata>
+			<Tdata><Lambda unit="A">4.77139</Lambda><T unit="none">0.79673</T><Tdev unit="none">0.0144917</Tdev></Tdata>
+			<Tdata><Lambda unit="A">4.93839</Lambda><T unit="none">0.794078</T><Tdev unit="none">0.0141706</Tdev></Tdata>
+			<Tdata><Lambda unit="A">5.11123</Lambda><T unit="none">0.813549</T><Tdev unit="none">0.0146863</Tdev></Tdata>
+			<Tdata><Lambda unit="A">5.29012</Lambda><T unit="none">0.816075</T><Tdev unit="none">0.0148919</Tdev></Tdata>
+			<Tdata><Lambda unit="A">5.47528</Lambda><T unit="none">0.795511</T><Tdev unit="none">0.0146964</Tdev></Tdata>
+			<Tdata><Lambda unit="A">5.66691</Lambda><T unit="none">0.801745</T><Tdev unit="none">0.0151593</Tdev></Tdata>
+			<Tdata><Lambda unit="A">5.86525</Lambda><T unit="none">0.795244</T><Tdev unit="none">0.0153005</Tdev></Tdata>
+			<Tdata><Lambda unit="A">6.07054</Lambda><T unit="none">0.796238</T><Tdev unit="none">0.0157736</Tdev></Tdata>
+			<Tdata><Lambda unit="A">6.28301</Lambda><T unit="none">0.787198</T><Tdev unit="none">0.0164255</Tdev></Tdata>
+			<Tdata><Lambda unit="A">6.50291</Lambda><T unit="none">0.774648</T><Tdev unit="none">0.0163529</Tdev></Tdata>
+			<Tdata><Lambda unit="A">6.73051</Lambda><T unit="none">0.790995</T><Tdev unit="none">0.0175304</Tdev></Tdata>
+			<Tdata><Lambda unit="A">6.96608</Lambda><T unit="none">0.798801</T><Tdev unit="none">0.0186696</Tdev></Tdata>
+			<Tdata><Lambda unit="A">7.2099</Lambda><T unit="none">0.814048</T><Tdev unit="none">0.0197538</Tdev></Tdata>
+			<Tdata><Lambda unit="A">7.46224</Lambda><T unit="none">0.798556</T><Tdev unit="none">0.0209193</Tdev></Tdata>
+			<Tdata><Lambda unit="A">7.72342</Lambda><T unit="none">0.819364</T><Tdev unit="none">0.0227707</Tdev></Tdata>
+			<Tdata><Lambda unit="A">7.99374</Lambda><T unit="none">0.806212</T><Tdev unit="none">0.024287</Tdev></Tdata>
+			<Tdata><Lambda unit="A">8.27352</Lambda><T unit="none">0.783517</T><Tdev unit="none">0.0251105</Tdev></Tdata>
+			<Tdata><Lambda unit="A">8.56309</Lambda><T unit="none">0.852889</T><Tdev unit="none">0.0293667</Tdev></Tdata>
+			<Tdata><Lambda unit="A">8.8628</Lambda><T unit="none">0.819569</T><Tdev unit="none">0.0305564</Tdev></Tdata>
+			<Tdata><Lambda unit="A">9.173</Lambda><T unit="none">0.807621</T><Tdev unit="none">0.03205</Tdev></Tdata>
+			<Tdata><Lambda unit="A">9.49406</Lambda><T unit="none">0.78865</T><Tdev unit="none">0.0347793</Tdev></Tdata>
+			<Tdata><Lambda unit="A">9.82867</Lambda><T unit="none">0.758171</T><Tdev unit="none">0.0367248</Tdev></Tdata>
 		</SAStransmission_spectrum>
 		<SAStransmission_spectrum name="can">
-			<Tdata><Lambda unit="Wavelength">2.2385</Lambda><T unit="none">0.860815</T><Tdev unit="none">0.0180986</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.31685</Lambda><T unit="none">0.845167</T><Tdev unit="none">0.0164779</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.39794</Lambda><T unit="none">0.844483</T><Tdev unit="none">0.015598</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.48186</Lambda><T unit="none">0.837217</T><Tdev unit="none">0.0146662</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.56873</Lambda><T unit="none">0.828356</T><Tdev unit="none">0.0140106</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.65864</Lambda><T unit="none">0.858083</T><Tdev unit="none">0.0142075</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.75169</Lambda><T unit="none">0.854147</T><Tdev unit="none">0.0140624</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.848</Lambda><T unit="none">0.840658</T><Tdev unit="none">0.0137717</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.94768</Lambda><T unit="none">0.838745</T><Tdev unit="none">0.0135966</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.05085</Lambda><T unit="none">0.842146</T><Tdev unit="none">0.0136675</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.15763</Lambda><T unit="none">0.825875</T><Tdev unit="none">0.0135082</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.26814</Lambda><T unit="none">0.827836</T><Tdev unit="none">0.0136904</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.38253</Lambda><T unit="none">0.826639</T><Tdev unit="none">0.0138799</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.50092</Lambda><T unit="none">0.820645</T><Tdev unit="none">0.0139414</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.62345</Lambda><T unit="none">0.844024</T><Tdev unit="none">0.014627</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.75027</Lambda><T unit="none">0.846513</T><Tdev unit="none">0.0148914</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.88153</Lambda><T unit="none">0.836232</T><Tdev unit="none">0.0150129</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">4.01738</Lambda><T unit="none">0.800463</T><Tdev unit="none">0.0147561</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">4.15799</Lambda><T unit="none">0.82719</T><Tdev unit="none">0.0150243</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">4.30352</Lambda><T unit="none">0.83271</T><Tdev unit="none">0.015155</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">4.45414</Lambda><T unit="none">0.830733</T><Tdev unit="none">0.0149943</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">4.61004</Lambda><T unit="none">0.824462</T><Tdev unit="none">0.0153427</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">4.77139</Lambda><T unit="none">0.81702</T><Tdev unit="none">0.0147501</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">4.93839</Lambda><T unit="none">0.830968</T><Tdev unit="none">0.0146721</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">5.11123</Lambda><T unit="none">0.805246</T><Tdev unit="none">0.0145375</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">5.29012</Lambda><T unit="none">0.822089</T><Tdev unit="none">0.0149643</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">5.47528</Lambda><T unit="none">0.795149</T><Tdev unit="none">0.0146443</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">5.66691</Lambda><T unit="none">0.821482</T><Tdev unit="none">0.0154357</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">5.86525</Lambda><T unit="none">0.803856</T><Tdev unit="none">0.0154916</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">6.07054</Lambda><T unit="none">0.843663</T><Tdev unit="none">0.016612</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">6.28301</Lambda><T unit="none">0.833172</T><Tdev unit="none">0.017083</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">6.50291</Lambda><T unit="none">0.827066</T><Tdev unit="none">0.0169775</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">6.73051</Lambda><T unit="none">0.818692</T><Tdev unit="none">0.0177961</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">6.96608</Lambda><T unit="none">0.820816</T><Tdev unit="none">0.0191031</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">7.2099</Lambda><T unit="none">0.803188</T><Tdev unit="none">0.0196213</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">7.46224</Lambda><T unit="none">0.842642</T><Tdev unit="none">0.0218106</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">7.72342</Lambda><T unit="none">0.866726</T><Tdev unit="none">0.023796</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">7.99374</Lambda><T unit="none">0.854952</T><Tdev unit="none">0.0254612</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">8.27352</Lambda><T unit="none">0.859841</T><Tdev unit="none">0.027075</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">8.56309</Lambda><T unit="none">0.928333</T><Tdev unit="none">0.0312963</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">8.8628</Lambda><T unit="none">0.877753</T><Tdev unit="none">0.0319304</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">9.173</Lambda><T unit="none">0.871583</T><Tdev unit="none">0.0341375</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">9.49406</Lambda><T unit="none">0.865242</T><Tdev unit="none">0.0369399</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">9.82867</Lambda><T unit="none">0.833197</T><Tdev unit="none">0.0391619</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.2385</Lambda><T unit="none">0.860815</T><Tdev unit="none">0.0180986</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.31685</Lambda><T unit="none">0.845167</T><Tdev unit="none">0.0164779</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.39794</Lambda><T unit="none">0.844483</T><Tdev unit="none">0.015598</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.48186</Lambda><T unit="none">0.837217</T><Tdev unit="none">0.0146662</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.56873</Lambda><T unit="none">0.828356</T><Tdev unit="none">0.0140106</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.65864</Lambda><T unit="none">0.858083</T><Tdev unit="none">0.0142075</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.75169</Lambda><T unit="none">0.854147</T><Tdev unit="none">0.0140624</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.848</Lambda><T unit="none">0.840658</T><Tdev unit="none">0.0137717</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.94768</Lambda><T unit="none">0.838745</T><Tdev unit="none">0.0135966</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.05085</Lambda><T unit="none">0.842146</T><Tdev unit="none">0.0136675</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.15763</Lambda><T unit="none">0.825875</T><Tdev unit="none">0.0135082</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.26814</Lambda><T unit="none">0.827836</T><Tdev unit="none">0.0136904</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.38253</Lambda><T unit="none">0.826639</T><Tdev unit="none">0.0138799</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.50092</Lambda><T unit="none">0.820645</T><Tdev unit="none">0.0139414</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.62345</Lambda><T unit="none">0.844024</T><Tdev unit="none">0.014627</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.75027</Lambda><T unit="none">0.846513</T><Tdev unit="none">0.0148914</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.88153</Lambda><T unit="none">0.836232</T><Tdev unit="none">0.0150129</Tdev></Tdata>
+			<Tdata><Lambda unit="A">4.01738</Lambda><T unit="none">0.800463</T><Tdev unit="none">0.0147561</Tdev></Tdata>
+			<Tdata><Lambda unit="A">4.15799</Lambda><T unit="none">0.82719</T><Tdev unit="none">0.0150243</Tdev></Tdata>
+			<Tdata><Lambda unit="A">4.30352</Lambda><T unit="none">0.83271</T><Tdev unit="none">0.015155</Tdev></Tdata>
+			<Tdata><Lambda unit="A">4.45414</Lambda><T unit="none">0.830733</T><Tdev unit="none">0.0149943</Tdev></Tdata>
+			<Tdata><Lambda unit="A">4.61004</Lambda><T unit="none">0.824462</T><Tdev unit="none">0.0153427</Tdev></Tdata>
+			<Tdata><Lambda unit="A">4.77139</Lambda><T unit="none">0.81702</T><Tdev unit="none">0.0147501</Tdev></Tdata>
+			<Tdata><Lambda unit="A">4.93839</Lambda><T unit="none">0.830968</T><Tdev unit="none">0.0146721</Tdev></Tdata>
+			<Tdata><Lambda unit="A">5.11123</Lambda><T unit="none">0.805246</T><Tdev unit="none">0.0145375</Tdev></Tdata>
+			<Tdata><Lambda unit="A">5.29012</Lambda><T unit="none">0.822089</T><Tdev unit="none">0.0149643</Tdev></Tdata>
+			<Tdata><Lambda unit="A">5.47528</Lambda><T unit="none">0.795149</T><Tdev unit="none">0.0146443</Tdev></Tdata>
+			<Tdata><Lambda unit="A">5.66691</Lambda><T unit="none">0.821482</T><Tdev unit="none">0.0154357</Tdev></Tdata>
+			<Tdata><Lambda unit="A">5.86525</Lambda><T unit="none">0.803856</T><Tdev unit="none">0.0154916</Tdev></Tdata>
+			<Tdata><Lambda unit="A">6.07054</Lambda><T unit="none">0.843663</T><Tdev unit="none">0.016612</Tdev></Tdata>
+			<Tdata><Lambda unit="A">6.28301</Lambda><T unit="none">0.833172</T><Tdev unit="none">0.017083</Tdev></Tdata>
+			<Tdata><Lambda unit="A">6.50291</Lambda><T unit="none">0.827066</T><Tdev unit="none">0.0169775</Tdev></Tdata>
+			<Tdata><Lambda unit="A">6.73051</Lambda><T unit="none">0.818692</T><Tdev unit="none">0.0177961</Tdev></Tdata>
+			<Tdata><Lambda unit="A">6.96608</Lambda><T unit="none">0.820816</T><Tdev unit="none">0.0191031</Tdev></Tdata>
+			<Tdata><Lambda unit="A">7.2099</Lambda><T unit="none">0.803188</T><Tdev unit="none">0.0196213</Tdev></Tdata>
+			<Tdata><Lambda unit="A">7.46224</Lambda><T unit="none">0.842642</T><Tdev unit="none">0.0218106</Tdev></Tdata>
+			<Tdata><Lambda unit="A">7.72342</Lambda><T unit="none">0.866726</T><Tdev unit="none">0.023796</Tdev></Tdata>
+			<Tdata><Lambda unit="A">7.99374</Lambda><T unit="none">0.854952</T><Tdev unit="none">0.0254612</Tdev></Tdata>
+			<Tdata><Lambda unit="A">8.27352</Lambda><T unit="none">0.859841</T><Tdev unit="none">0.027075</Tdev></Tdata>
+			<Tdata><Lambda unit="A">8.56309</Lambda><T unit="none">0.928333</T><Tdev unit="none">0.0312963</Tdev></Tdata>
+			<Tdata><Lambda unit="A">8.8628</Lambda><T unit="none">0.877753</T><Tdev unit="none">0.0319304</Tdev></Tdata>
+			<Tdata><Lambda unit="A">9.173</Lambda><T unit="none">0.871583</T><Tdev unit="none">0.0341375</Tdev></Tdata>
+			<Tdata><Lambda unit="A">9.49406</Lambda><T unit="none">0.865242</T><Tdev unit="none">0.0369399</Tdev></Tdata>
+			<Tdata><Lambda unit="A">9.82867</Lambda><T unit="none">0.833197</T><Tdev unit="none">0.0391619</Tdev></Tdata>
 		</SAStransmission_spectrum>
 		<SASsample>
Index: setup.py
===================================================================
--- setup.py	(revision 785cc657fbffdd03a21fc38a81f1f01753638331)
+++ setup.py	(revision db74ee8a320f0a42c88c2773f8915d72f3ae9f32)
@@ -302,5 +302,5 @@
 
     # 'lxml>=2.2.2',
-    'lxml', 'h5py==2.5',
+    'lxml', 'h5py',
 
     ## The following dependecies won't install automatically, so assume them
Index: src/sas/sasgui/guiframe/data_panel.py
===================================================================
--- src/sas/sasgui/guiframe/data_panel.py	(revision 1941e6a4dc7d7e117ddc9faa4c5eaf341725564c)
+++ src/sas/sasgui/guiframe/data_panel.py	(revision b5c44f0493a2482bb7ea5c39743c7eb7514dd935)
@@ -375,5 +375,5 @@
                              (self.sizer4),
                              ((10, 10)),
-                             (self.bt_help, 0, wx.EXPAND|wx.RIGHT, 5)])
+                             (self.bt_help, 0, wx.RIGHT, 5)])
 
         self.sizer3.AddGrowableCol(1, 1)
