Index: sasview/test/1d_data/AOT_Microemulsion-Core_Contrast.xml
===================================================================
--- sasview/test/1d_data/AOT_Microemulsion-Core_Contrast.xml	(revision 24c41e6ad9e9248b99c36524d45d905400789ffc)
+++ sasview/test/1d_data/AOT_Microemulsion-Core_Contrast.xml	(revision d8ff88ef7952cb1ee50c4e8256c32f616d8630ca)
@@ -149,94 +149,94 @@
 		</SASdata>
 		<SAStransmission_spectrum name="sample">
-			<Tdata><Lambda unit="Wavelength">2.2385</Lambda><T unit="none">0.610444</T><Tdev unit="none">0.0138724</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.31685</Lambda><T unit="none">0.612253</T><Tdev unit="none">0.0129465</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.39794</Lambda><T unit="none">0.601961</T><Tdev unit="none">0.0121393</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.48186</Lambda><T unit="none">0.594699</T><Tdev unit="none">0.0114108</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.56873</Lambda><T unit="none">0.581299</T><Tdev unit="none">0.0107555</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.65864</Lambda><T unit="none">0.597817</T><Tdev unit="none">0.0108499</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.75169</Lambda><T unit="none">0.581161</T><Tdev unit="none">0.010545</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.848</Lambda><T unit="none">0.586095</T><Tdev unit="none">0.0106087</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.94768</Lambda><T unit="none">0.564085</T><Tdev unit="none">0.0101286</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.05085</Lambda><T unit="none">0.58682</T><Tdev unit="none">0.0105088</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.15763</Lambda><T unit="none">0.582492</T><Tdev unit="none">0.0104946</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.26814</Lambda><T unit="none">0.56962</T><Tdev unit="none">0.01039</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.38253</Lambda><T unit="none">0.577885</T><Tdev unit="none">0.0107161</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.50092</Lambda><T unit="none">0.568554</T><Tdev unit="none">0.0106933</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.62345</Lambda><T unit="none">0.562329</T><Tdev unit="none">0.0108427</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.75027</Lambda><T unit="none">0.56802</T><Tdev unit="none">0.0111497</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.88153</Lambda><T unit="none">0.55137</T><Tdev unit="none">0.0111036</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">4.01738</Lambda><T unit="none">0.550267</T><Tdev unit="none">0.0112412</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">4.15799</Lambda><T unit="none">0.556669</T><Tdev unit="none">0.0112476</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">4.30352</Lambda><T unit="none">0.564625</T><Tdev unit="none">0.0114701</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">4.45414</Lambda><T unit="none">0.546676</T><Tdev unit="none">0.0110403</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">4.61004</Lambda><T unit="none">0.563913</T><Tdev unit="none">0.0116905</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">4.77139</Lambda><T unit="none">0.565257</T><Tdev unit="none">0.0113324</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">4.93839</Lambda><T unit="none">0.531083</T><Tdev unit="none">0.010607</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">5.11123</Lambda><T unit="none">0.547702</T><Tdev unit="none">0.0110797</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">5.29012</Lambda><T unit="none">0.528736</T><Tdev unit="none">0.0109244</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">5.47528</Lambda><T unit="none">0.515815</T><Tdev unit="none">0.0107714</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">5.66691</Lambda><T unit="none">0.521177</T><Tdev unit="none">0.0112113</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">5.86525</Lambda><T unit="none">0.513467</T><Tdev unit="none">0.0112435</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">6.07054</Lambda><T unit="none">0.50985</T><Tdev unit="none">0.011532</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">6.28301</Lambda><T unit="none">0.500592</T><Tdev unit="none">0.0118047</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">6.50291</Lambda><T unit="none">0.489196</T><Tdev unit="none">0.0116644</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">6.73051</Lambda><T unit="none">0.484642</T><Tdev unit="none">0.012287</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">6.96608</Lambda><T unit="none">0.475367</T><Tdev unit="none">0.0129754</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">7.2099</Lambda><T unit="none">0.462187</T><Tdev unit="none">0.0133728</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">7.46224</Lambda><T unit="none">0.485149</T><Tdev unit="none">0.014836</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">7.72342</Lambda><T unit="none">0.463923</T><Tdev unit="none">0.0153821</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">7.99374</Lambda><T unit="none">0.465953</T><Tdev unit="none">0.0167117</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">8.27352</Lambda><T unit="none">0.42751</T><Tdev unit="none">0.016616</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">8.56309</Lambda><T unit="none">0.472072</T><Tdev unit="none">0.0193303</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">8.8628</Lambda><T unit="none">0.419659</T><Tdev unit="none">0.0189806</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">9.173</Lambda><T unit="none">0.406705</T><Tdev unit="none">0.019769</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">9.49406</Lambda><T unit="none">0.415105</T><Tdev unit="none">0.0223763</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">9.82867</Lambda><T unit="none">0.411026</T><Tdev unit="none">0.0239931</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.2385</Lambda><T unit="none">0.610444</T><Tdev unit="none">0.0138724</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.31685</Lambda><T unit="none">0.612253</T><Tdev unit="none">0.0129465</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.39794</Lambda><T unit="none">0.601961</T><Tdev unit="none">0.0121393</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.48186</Lambda><T unit="none">0.594699</T><Tdev unit="none">0.0114108</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.56873</Lambda><T unit="none">0.581299</T><Tdev unit="none">0.0107555</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.65864</Lambda><T unit="none">0.597817</T><Tdev unit="none">0.0108499</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.75169</Lambda><T unit="none">0.581161</T><Tdev unit="none">0.010545</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.848</Lambda><T unit="none">0.586095</T><Tdev unit="none">0.0106087</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.94768</Lambda><T unit="none">0.564085</T><Tdev unit="none">0.0101286</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.05085</Lambda><T unit="none">0.58682</T><Tdev unit="none">0.0105088</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.15763</Lambda><T unit="none">0.582492</T><Tdev unit="none">0.0104946</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.26814</Lambda><T unit="none">0.56962</T><Tdev unit="none">0.01039</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.38253</Lambda><T unit="none">0.577885</T><Tdev unit="none">0.0107161</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.50092</Lambda><T unit="none">0.568554</T><Tdev unit="none">0.0106933</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.62345</Lambda><T unit="none">0.562329</T><Tdev unit="none">0.0108427</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.75027</Lambda><T unit="none">0.56802</T><Tdev unit="none">0.0111497</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.88153</Lambda><T unit="none">0.55137</T><Tdev unit="none">0.0111036</Tdev></Tdata>
+			<Tdata><Lambda unit="A">4.01738</Lambda><T unit="none">0.550267</T><Tdev unit="none">0.0112412</Tdev></Tdata>
+			<Tdata><Lambda unit="A">4.15799</Lambda><T unit="none">0.556669</T><Tdev unit="none">0.0112476</Tdev></Tdata>
+			<Tdata><Lambda unit="A">4.30352</Lambda><T unit="none">0.564625</T><Tdev unit="none">0.0114701</Tdev></Tdata>
+			<Tdata><Lambda unit="A">4.45414</Lambda><T unit="none">0.546676</T><Tdev unit="none">0.0110403</Tdev></Tdata>
+			<Tdata><Lambda unit="A">4.61004</Lambda><T unit="none">0.563913</T><Tdev unit="none">0.0116905</Tdev></Tdata>
+			<Tdata><Lambda unit="A">4.77139</Lambda><T unit="none">0.565257</T><Tdev unit="none">0.0113324</Tdev></Tdata>
+			<Tdata><Lambda unit="A">4.93839</Lambda><T unit="none">0.531083</T><Tdev unit="none">0.010607</Tdev></Tdata>
+			<Tdata><Lambda unit="A">5.11123</Lambda><T unit="none">0.547702</T><Tdev unit="none">0.0110797</Tdev></Tdata>
+			<Tdata><Lambda unit="A">5.29012</Lambda><T unit="none">0.528736</T><Tdev unit="none">0.0109244</Tdev></Tdata>
+			<Tdata><Lambda unit="A">5.47528</Lambda><T unit="none">0.515815</T><Tdev unit="none">0.0107714</Tdev></Tdata>
+			<Tdata><Lambda unit="A">5.66691</Lambda><T unit="none">0.521177</T><Tdev unit="none">0.0112113</Tdev></Tdata>
+			<Tdata><Lambda unit="A">5.86525</Lambda><T unit="none">0.513467</T><Tdev unit="none">0.0112435</Tdev></Tdata>
+			<Tdata><Lambda unit="A">6.07054</Lambda><T unit="none">0.50985</T><Tdev unit="none">0.011532</Tdev></Tdata>
+			<Tdata><Lambda unit="A">6.28301</Lambda><T unit="none">0.500592</T><Tdev unit="none">0.0118047</Tdev></Tdata>
+			<Tdata><Lambda unit="A">6.50291</Lambda><T unit="none">0.489196</T><Tdev unit="none">0.0116644</Tdev></Tdata>
+			<Tdata><Lambda unit="A">6.73051</Lambda><T unit="none">0.484642</T><Tdev unit="none">0.012287</Tdev></Tdata>
+			<Tdata><Lambda unit="A">6.96608</Lambda><T unit="none">0.475367</T><Tdev unit="none">0.0129754</Tdev></Tdata>
+			<Tdata><Lambda unit="A">7.2099</Lambda><T unit="none">0.462187</T><Tdev unit="none">0.0133728</Tdev></Tdata>
+			<Tdata><Lambda unit="A">7.46224</Lambda><T unit="none">0.485149</T><Tdev unit="none">0.014836</Tdev></Tdata>
+			<Tdata><Lambda unit="A">7.72342</Lambda><T unit="none">0.463923</T><Tdev unit="none">0.0153821</Tdev></Tdata>
+			<Tdata><Lambda unit="A">7.99374</Lambda><T unit="none">0.465953</T><Tdev unit="none">0.0167117</Tdev></Tdata>
+			<Tdata><Lambda unit="A">8.27352</Lambda><T unit="none">0.42751</T><Tdev unit="none">0.016616</Tdev></Tdata>
+			<Tdata><Lambda unit="A">8.56309</Lambda><T unit="none">0.472072</T><Tdev unit="none">0.0193303</Tdev></Tdata>
+			<Tdata><Lambda unit="A">8.8628</Lambda><T unit="none">0.419659</T><Tdev unit="none">0.0189806</Tdev></Tdata>
+			<Tdata><Lambda unit="A">9.173</Lambda><T unit="none">0.406705</T><Tdev unit="none">0.019769</Tdev></Tdata>
+			<Tdata><Lambda unit="A">9.49406</Lambda><T unit="none">0.415105</T><Tdev unit="none">0.0223763</Tdev></Tdata>
+			<Tdata><Lambda unit="A">9.82867</Lambda><T unit="none">0.411026</T><Tdev unit="none">0.0239931</Tdev></Tdata>
 		</SAStransmission_spectrum>
 		<SAStransmission_spectrum name="can">
-			<Tdata><Lambda unit="Wavelength">2.2385</Lambda><T unit="none">0.614086</T><Tdev unit="none">0.0140173</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.31685</Lambda><T unit="none">0.596305</T><Tdev unit="none">0.0126644</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.39794</Lambda><T unit="none">0.600656</T><Tdev unit="none">0.0120694</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.48186</Lambda><T unit="none">0.608338</T><Tdev unit="none">0.0116281</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.56873</Lambda><T unit="none">0.589727</T><Tdev unit="none">0.010879</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.65864</Lambda><T unit="none">0.58901</T><Tdev unit="none">0.0107415</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.75169</Lambda><T unit="none">0.571872</T><Tdev unit="none">0.0104647</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.848</Lambda><T unit="none">0.585818</T><Tdev unit="none">0.0106229</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.94768</Lambda><T unit="none">0.584634</T><Tdev unit="none">0.0104394</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.05085</Lambda><T unit="none">0.563853</T><Tdev unit="none">0.0101665</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.15763</Lambda><T unit="none">0.558947</T><Tdev unit="none">0.0101742</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.26814</Lambda><T unit="none">0.566372</T><Tdev unit="none">0.0103691</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.38253</Lambda><T unit="none">0.561329</T><Tdev unit="none">0.0104404</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.50092</Lambda><T unit="none">0.545091</T><Tdev unit="none">0.0103348</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.62345</Lambda><T unit="none">0.564537</T><Tdev unit="none">0.0108277</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.75027</Lambda><T unit="none">0.554892</T><Tdev unit="none">0.010935</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.88153</Lambda><T unit="none">0.563159</T><Tdev unit="none">0.0112823</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">4.01738</Lambda><T unit="none">0.546463</T><Tdev unit="none">0.0112086</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">4.15799</Lambda><T unit="none">0.554189</T><Tdev unit="none">0.0112892</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">4.30352</Lambda><T unit="none">0.552752</T><Tdev unit="none">0.011176</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">4.45414</Lambda><T unit="none">0.544004</T><Tdev unit="none">0.0110081</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">4.61004</Lambda><T unit="none">0.551656</T><Tdev unit="none">0.0115384</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">4.77139</Lambda><T unit="none">0.528192</T><Tdev unit="none">0.0108241</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">4.93839</Lambda><T unit="none">0.523481</T><Tdev unit="none">0.010531</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">5.11123</Lambda><T unit="none">0.540405</T><Tdev unit="none">0.0109439</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">5.29012</Lambda><T unit="none">0.533221</T><Tdev unit="none">0.0109315</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">5.47528</Lambda><T unit="none">0.531001</T><Tdev unit="none">0.0110342</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">5.66691</Lambda><T unit="none">0.511213</T><Tdev unit="none">0.0109622</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">5.86525</Lambda><T unit="none">0.513242</T><Tdev unit="none">0.01122</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">6.07054</Lambda><T unit="none">0.498985</T><Tdev unit="none">0.0113154</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">6.28301</Lambda><T unit="none">0.501775</T><Tdev unit="none">0.0118942</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">6.50291</Lambda><T unit="none">0.497405</T><Tdev unit="none">0.0117503</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">6.73051</Lambda><T unit="none">0.475589</T><Tdev unit="none">0.0119766</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">6.96608</Lambda><T unit="none">0.466679</T><Tdev unit="none">0.0127568</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">7.2099</Lambda><T unit="none">0.44318</T><Tdev unit="none">0.0129068</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">7.46224</Lambda><T unit="none">0.479146</T><Tdev unit="none">0.0145887</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">7.72342</Lambda><T unit="none">0.469737</T><Tdev unit="none">0.0153716</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">7.99374</Lambda><T unit="none">0.493053</T><Tdev unit="none">0.0172476</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">8.27352</Lambda><T unit="none">0.461938</T><Tdev unit="none">0.0175651</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">8.56309</Lambda><T unit="none">0.489135</T><Tdev unit="none">0.0197968</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">8.8628</Lambda><T unit="none">0.472699</T><Tdev unit="none">0.0203959</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">9.173</Lambda><T unit="none">0.445105</T><Tdev unit="none">0.0210446</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">9.49406</Lambda><T unit="none">0.432298</T><Tdev unit="none">0.0228459</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">9.82867</Lambda><T unit="none">0.421694</T><Tdev unit="none">0.0244834</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.2385</Lambda><T unit="none">0.614086</T><Tdev unit="none">0.0140173</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.31685</Lambda><T unit="none">0.596305</T><Tdev unit="none">0.0126644</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.39794</Lambda><T unit="none">0.600656</T><Tdev unit="none">0.0120694</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.48186</Lambda><T unit="none">0.608338</T><Tdev unit="none">0.0116281</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.56873</Lambda><T unit="none">0.589727</T><Tdev unit="none">0.010879</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.65864</Lambda><T unit="none">0.58901</T><Tdev unit="none">0.0107415</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.75169</Lambda><T unit="none">0.571872</T><Tdev unit="none">0.0104647</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.848</Lambda><T unit="none">0.585818</T><Tdev unit="none">0.0106229</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.94768</Lambda><T unit="none">0.584634</T><Tdev unit="none">0.0104394</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.05085</Lambda><T unit="none">0.563853</T><Tdev unit="none">0.0101665</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.15763</Lambda><T unit="none">0.558947</T><Tdev unit="none">0.0101742</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.26814</Lambda><T unit="none">0.566372</T><Tdev unit="none">0.0103691</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.38253</Lambda><T unit="none">0.561329</T><Tdev unit="none">0.0104404</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.50092</Lambda><T unit="none">0.545091</T><Tdev unit="none">0.0103348</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.62345</Lambda><T unit="none">0.564537</T><Tdev unit="none">0.0108277</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.75027</Lambda><T unit="none">0.554892</T><Tdev unit="none">0.010935</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.88153</Lambda><T unit="none">0.563159</T><Tdev unit="none">0.0112823</Tdev></Tdata>
+			<Tdata><Lambda unit="A">4.01738</Lambda><T unit="none">0.546463</T><Tdev unit="none">0.0112086</Tdev></Tdata>
+			<Tdata><Lambda unit="A">4.15799</Lambda><T unit="none">0.554189</T><Tdev unit="none">0.0112892</Tdev></Tdata>
+			<Tdata><Lambda unit="A">4.30352</Lambda><T unit="none">0.552752</T><Tdev unit="none">0.011176</Tdev></Tdata>
+			<Tdata><Lambda unit="A">4.45414</Lambda><T unit="none">0.544004</T><Tdev unit="none">0.0110081</Tdev></Tdata>
+			<Tdata><Lambda unit="A">4.61004</Lambda><T unit="none">0.551656</T><Tdev unit="none">0.0115384</Tdev></Tdata>
+			<Tdata><Lambda unit="A">4.77139</Lambda><T unit="none">0.528192</T><Tdev unit="none">0.0108241</Tdev></Tdata>
+			<Tdata><Lambda unit="A">4.93839</Lambda><T unit="none">0.523481</T><Tdev unit="none">0.010531</Tdev></Tdata>
+			<Tdata><Lambda unit="A">5.11123</Lambda><T unit="none">0.540405</T><Tdev unit="none">0.0109439</Tdev></Tdata>
+			<Tdata><Lambda unit="A">5.29012</Lambda><T unit="none">0.533221</T><Tdev unit="none">0.0109315</Tdev></Tdata>
+			<Tdata><Lambda unit="A">5.47528</Lambda><T unit="none">0.531001</T><Tdev unit="none">0.0110342</Tdev></Tdata>
+			<Tdata><Lambda unit="A">5.66691</Lambda><T unit="none">0.511213</T><Tdev unit="none">0.0109622</Tdev></Tdata>
+			<Tdata><Lambda unit="A">5.86525</Lambda><T unit="none">0.513242</T><Tdev unit="none">0.01122</Tdev></Tdata>
+			<Tdata><Lambda unit="A">6.07054</Lambda><T unit="none">0.498985</T><Tdev unit="none">0.0113154</Tdev></Tdata>
+			<Tdata><Lambda unit="A">6.28301</Lambda><T unit="none">0.501775</T><Tdev unit="none">0.0118942</Tdev></Tdata>
+			<Tdata><Lambda unit="A">6.50291</Lambda><T unit="none">0.497405</T><Tdev unit="none">0.0117503</Tdev></Tdata>
+			<Tdata><Lambda unit="A">6.73051</Lambda><T unit="none">0.475589</T><Tdev unit="none">0.0119766</Tdev></Tdata>
+			<Tdata><Lambda unit="A">6.96608</Lambda><T unit="none">0.466679</T><Tdev unit="none">0.0127568</Tdev></Tdata>
+			<Tdata><Lambda unit="A">7.2099</Lambda><T unit="none">0.44318</T><Tdev unit="none">0.0129068</Tdev></Tdata>
+			<Tdata><Lambda unit="A">7.46224</Lambda><T unit="none">0.479146</T><Tdev unit="none">0.0145887</Tdev></Tdata>
+			<Tdata><Lambda unit="A">7.72342</Lambda><T unit="none">0.469737</T><Tdev unit="none">0.0153716</Tdev></Tdata>
+			<Tdata><Lambda unit="A">7.99374</Lambda><T unit="none">0.493053</T><Tdev unit="none">0.0172476</Tdev></Tdata>
+			<Tdata><Lambda unit="A">8.27352</Lambda><T unit="none">0.461938</T><Tdev unit="none">0.0175651</Tdev></Tdata>
+			<Tdata><Lambda unit="A">8.56309</Lambda><T unit="none">0.489135</T><Tdev unit="none">0.0197968</Tdev></Tdata>
+			<Tdata><Lambda unit="A">8.8628</Lambda><T unit="none">0.472699</T><Tdev unit="none">0.0203959</Tdev></Tdata>
+			<Tdata><Lambda unit="A">9.173</Lambda><T unit="none">0.445105</T><Tdev unit="none">0.0210446</Tdev></Tdata>
+			<Tdata><Lambda unit="A">9.49406</Lambda><T unit="none">0.432298</T><Tdev unit="none">0.0228459</Tdev></Tdata>
+			<Tdata><Lambda unit="A">9.82867</Lambda><T unit="none">0.421694</T><Tdev unit="none">0.0244834</Tdev></Tdata>
 		</SAStransmission_spectrum>
 		<SASsample>
Index: sasview/test/1d_data/AOT_Microemulsion-Drop_Contrast.xml
===================================================================
--- sasview/test/1d_data/AOT_Microemulsion-Drop_Contrast.xml	(revision 24c41e6ad9e9248b99c36524d45d905400789ffc)
+++ sasview/test/1d_data/AOT_Microemulsion-Drop_Contrast.xml	(revision d8ff88ef7952cb1ee50c4e8256c32f616d8630ca)
@@ -149,94 +149,94 @@
 		</SASdata>
 		<SAStransmission_spectrum name="sample">
-			<Tdata><Lambda unit="Wavelength">2.2385</Lambda><T unit="none">0.819694</T><Tdev unit="none">0.0173904</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.31685</Lambda><T unit="none">0.810634</T><Tdev unit="none">0.0159153</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.39794</Lambda><T unit="none">0.819248</T><Tdev unit="none">0.0153098</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.48186</Lambda><T unit="none">0.801687</T><Tdev unit="none">0.0142842</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.56873</Lambda><T unit="none">0.803288</T><Tdev unit="none">0.0136704</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.65864</Lambda><T unit="none">0.793648</T><Tdev unit="none">0.013379</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.75169</Lambda><T unit="none">0.776281</T><Tdev unit="none">0.0129965</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.848</Lambda><T unit="none">0.783533</T><Tdev unit="none">0.0130491</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.94768</Lambda><T unit="none">0.771663</T><Tdev unit="none">0.0127326</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.05085</Lambda><T unit="none">0.801568</T><Tdev unit="none">0.0132133</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.15763</Lambda><T unit="none">0.795389</T><Tdev unit="none">0.0131378</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.26814</Lambda><T unit="none">0.792805</T><Tdev unit="none">0.0132988</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.38253</Lambda><T unit="none">0.775422</T><Tdev unit="none">0.0132466</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.50092</Lambda><T unit="none">0.765651</T><Tdev unit="none">0.0132327</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.62345</Lambda><T unit="none">0.772605</T><Tdev unit="none">0.0137014</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.75027</Lambda><T unit="none">0.773491</T><Tdev unit="none">0.0138988</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.88153</Lambda><T unit="none">0.761529</T><Tdev unit="none">0.0139473</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">4.01738</Lambda><T unit="none">0.751399</T><Tdev unit="none">0.0140118</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">4.15799</Lambda><T unit="none">0.763442</T><Tdev unit="none">0.0141382</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">4.30352</Lambda><T unit="none">0.767297</T><Tdev unit="none">0.0142654</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">4.45414</Lambda><T unit="none">0.784231</T><Tdev unit="none">0.0143856</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">4.61004</Lambda><T unit="none">0.769107</T><Tdev unit="none">0.0146035</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">4.77139</Lambda><T unit="none">0.757246</T><Tdev unit="none">0.0139629</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">4.93839</Lambda><T unit="none">0.738684</T><Tdev unit="none">0.0134561</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">5.11123</Lambda><T unit="none">0.723877</T><Tdev unit="none">0.0134185</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">5.29012</Lambda><T unit="none">0.729377</T><Tdev unit="none">0.0136514</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">5.47528</Lambda><T unit="none">0.745767</T><Tdev unit="none">0.0139968</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">5.66691</Lambda><T unit="none">0.727438</T><Tdev unit="none">0.0141024</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">5.86525</Lambda><T unit="none">0.720169</T><Tdev unit="none">0.0142801</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">6.07054</Lambda><T unit="none">0.700916</T><Tdev unit="none">0.0143901</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">6.28301</Lambda><T unit="none">0.700467</T><Tdev unit="none">0.014954</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">6.50291</Lambda><T unit="none">0.695642</T><Tdev unit="none">0.0149197</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">6.73051</Lambda><T unit="none">0.692368</T><Tdev unit="none">0.0157957</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">6.96608</Lambda><T unit="none">0.680097</T><Tdev unit="none">0.0166894</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">7.2099</Lambda><T unit="none">0.655191</T><Tdev unit="none">0.0170089</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">7.46224</Lambda><T unit="none">0.67293</T><Tdev unit="none">0.0185647</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">7.72342</Lambda><T unit="none">0.672394</T><Tdev unit="none">0.0197761</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">7.99374</Lambda><T unit="none">0.627719</T><Tdev unit="none">0.020306</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">8.27352</Lambda><T unit="none">0.62152</T><Tdev unit="none">0.0212956</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">8.56309</Lambda><T unit="none">0.661799</T><Tdev unit="none">0.0240782</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">8.8628</Lambda><T unit="none">0.577478</T><Tdev unit="none">0.0233108</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">9.173</Lambda><T unit="none">0.581624</T><Tdev unit="none">0.0251497</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">9.49406</Lambda><T unit="none">0.587706</T><Tdev unit="none">0.0279994</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">9.82867</Lambda><T unit="none">0.602308</T><Tdev unit="none">0.0305026</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.2385</Lambda><T unit="none">0.819694</T><Tdev unit="none">0.0173904</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.31685</Lambda><T unit="none">0.810634</T><Tdev unit="none">0.0159153</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.39794</Lambda><T unit="none">0.819248</T><Tdev unit="none">0.0153098</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.48186</Lambda><T unit="none">0.801687</T><Tdev unit="none">0.0142842</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.56873</Lambda><T unit="none">0.803288</T><Tdev unit="none">0.0136704</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.65864</Lambda><T unit="none">0.793648</T><Tdev unit="none">0.013379</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.75169</Lambda><T unit="none">0.776281</T><Tdev unit="none">0.0129965</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.848</Lambda><T unit="none">0.783533</T><Tdev unit="none">0.0130491</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.94768</Lambda><T unit="none">0.771663</T><Tdev unit="none">0.0127326</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.05085</Lambda><T unit="none">0.801568</T><Tdev unit="none">0.0132133</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.15763</Lambda><T unit="none">0.795389</T><Tdev unit="none">0.0131378</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.26814</Lambda><T unit="none">0.792805</T><Tdev unit="none">0.0132988</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.38253</Lambda><T unit="none">0.775422</T><Tdev unit="none">0.0132466</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.50092</Lambda><T unit="none">0.765651</T><Tdev unit="none">0.0132327</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.62345</Lambda><T unit="none">0.772605</T><Tdev unit="none">0.0137014</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.75027</Lambda><T unit="none">0.773491</T><Tdev unit="none">0.0138988</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.88153</Lambda><T unit="none">0.761529</T><Tdev unit="none">0.0139473</Tdev></Tdata>
+			<Tdata><Lambda unit="A">4.01738</Lambda><T unit="none">0.751399</T><Tdev unit="none">0.0140118</Tdev></Tdata>
+			<Tdata><Lambda unit="A">4.15799</Lambda><T unit="none">0.763442</T><Tdev unit="none">0.0141382</Tdev></Tdata>
+			<Tdata><Lambda unit="A">4.30352</Lambda><T unit="none">0.767297</T><Tdev unit="none">0.0142654</Tdev></Tdata>
+			<Tdata><Lambda unit="A">4.45414</Lambda><T unit="none">0.784231</T><Tdev unit="none">0.0143856</Tdev></Tdata>
+			<Tdata><Lambda unit="A">4.61004</Lambda><T unit="none">0.769107</T><Tdev unit="none">0.0146035</Tdev></Tdata>
+			<Tdata><Lambda unit="A">4.77139</Lambda><T unit="none">0.757246</T><Tdev unit="none">0.0139629</Tdev></Tdata>
+			<Tdata><Lambda unit="A">4.93839</Lambda><T unit="none">0.738684</T><Tdev unit="none">0.0134561</Tdev></Tdata>
+			<Tdata><Lambda unit="A">5.11123</Lambda><T unit="none">0.723877</T><Tdev unit="none">0.0134185</Tdev></Tdata>
+			<Tdata><Lambda unit="A">5.29012</Lambda><T unit="none">0.729377</T><Tdev unit="none">0.0136514</Tdev></Tdata>
+			<Tdata><Lambda unit="A">5.47528</Lambda><T unit="none">0.745767</T><Tdev unit="none">0.0139968</Tdev></Tdata>
+			<Tdata><Lambda unit="A">5.66691</Lambda><T unit="none">0.727438</T><Tdev unit="none">0.0141024</Tdev></Tdata>
+			<Tdata><Lambda unit="A">5.86525</Lambda><T unit="none">0.720169</T><Tdev unit="none">0.0142801</Tdev></Tdata>
+			<Tdata><Lambda unit="A">6.07054</Lambda><T unit="none">0.700916</T><Tdev unit="none">0.0143901</Tdev></Tdata>
+			<Tdata><Lambda unit="A">6.28301</Lambda><T unit="none">0.700467</T><Tdev unit="none">0.014954</Tdev></Tdata>
+			<Tdata><Lambda unit="A">6.50291</Lambda><T unit="none">0.695642</T><Tdev unit="none">0.0149197</Tdev></Tdata>
+			<Tdata><Lambda unit="A">6.73051</Lambda><T unit="none">0.692368</T><Tdev unit="none">0.0157957</Tdev></Tdata>
+			<Tdata><Lambda unit="A">6.96608</Lambda><T unit="none">0.680097</T><Tdev unit="none">0.0166894</Tdev></Tdata>
+			<Tdata><Lambda unit="A">7.2099</Lambda><T unit="none">0.655191</T><Tdev unit="none">0.0170089</Tdev></Tdata>
+			<Tdata><Lambda unit="A">7.46224</Lambda><T unit="none">0.67293</T><Tdev unit="none">0.0185647</Tdev></Tdata>
+			<Tdata><Lambda unit="A">7.72342</Lambda><T unit="none">0.672394</T><Tdev unit="none">0.0197761</Tdev></Tdata>
+			<Tdata><Lambda unit="A">7.99374</Lambda><T unit="none">0.627719</T><Tdev unit="none">0.020306</Tdev></Tdata>
+			<Tdata><Lambda unit="A">8.27352</Lambda><T unit="none">0.62152</T><Tdev unit="none">0.0212956</Tdev></Tdata>
+			<Tdata><Lambda unit="A">8.56309</Lambda><T unit="none">0.661799</T><Tdev unit="none">0.0240782</Tdev></Tdata>
+			<Tdata><Lambda unit="A">8.8628</Lambda><T unit="none">0.577478</T><Tdev unit="none">0.0233108</Tdev></Tdata>
+			<Tdata><Lambda unit="A">9.173</Lambda><T unit="none">0.581624</T><Tdev unit="none">0.0251497</Tdev></Tdata>
+			<Tdata><Lambda unit="A">9.49406</Lambda><T unit="none">0.587706</T><Tdev unit="none">0.0279994</Tdev></Tdata>
+			<Tdata><Lambda unit="A">9.82867</Lambda><T unit="none">0.602308</T><Tdev unit="none">0.0305026</Tdev></Tdata>
 		</SAStransmission_spectrum>
 		<SAStransmission_spectrum name="can">
-			<Tdata><Lambda unit="Wavelength">2.2385</Lambda><T unit="none">0.822129</T><Tdev unit="none">0.0173323</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.31685</Lambda><T unit="none">0.845515</T><Tdev unit="none">0.0164878</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.39794</Lambda><T unit="none">0.816808</T><Tdev unit="none">0.015174</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.48186</Lambda><T unit="none">0.830173</T><Tdev unit="none">0.0145918</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.56873</Lambda><T unit="none">0.851374</T><Tdev unit="none">0.0143224</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.65864</Lambda><T unit="none">0.841204</T><Tdev unit="none">0.0139286</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.75169</Lambda><T unit="none">0.840502</T><Tdev unit="none">0.0138532</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.848</Lambda><T unit="none">0.834207</T><Tdev unit="none">0.0136892</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.94768</Lambda><T unit="none">0.829282</T><Tdev unit="none">0.0134304</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.05085</Lambda><T unit="none">0.842545</T><Tdev unit="none">0.0137226</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.15763</Lambda><T unit="none">0.84418</T><Tdev unit="none">0.0138088</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.26814</Lambda><T unit="none">0.814072</T><Tdev unit="none">0.013433</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.38253</Lambda><T unit="none">0.817536</T><Tdev unit="none">0.0137297</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.50092</Lambda><T unit="none">0.800998</T><Tdev unit="none">0.0136996</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.62345</Lambda><T unit="none">0.792305</T><Tdev unit="none">0.01388</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.75027</Lambda><T unit="none">0.817957</T><Tdev unit="none">0.0145088</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.88153</Lambda><T unit="none">0.831011</T><Tdev unit="none">0.0149245</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">4.01738</Lambda><T unit="none">0.83775</T><Tdev unit="none">0.0152348</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">4.15799</Lambda><T unit="none">0.833825</T><Tdev unit="none">0.0151152</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">4.30352</Lambda><T unit="none">0.851385</T><Tdev unit="none">0.0154299</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">4.45414</Lambda><T unit="none">0.837144</T><Tdev unit="none">0.0150596</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">4.61004</Lambda><T unit="none">0.844617</T><Tdev unit="none">0.015643</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">4.77139</Lambda><T unit="none">0.822439</T><Tdev unit="none">0.0148799</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">4.93839</Lambda><T unit="none">0.820479</T><Tdev unit="none">0.0145397</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">5.11123</Lambda><T unit="none">0.822857</T><Tdev unit="none">0.0147626</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">5.29012</Lambda><T unit="none">0.8194</T><Tdev unit="none">0.0149288</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">5.47528</Lambda><T unit="none">0.818558</T><Tdev unit="none">0.0150553</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">5.66691</Lambda><T unit="none">0.81581</T><Tdev unit="none">0.015393</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">5.86525</Lambda><T unit="none">0.810869</T><Tdev unit="none">0.0155707</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">6.07054</Lambda><T unit="none">0.79084</T><Tdev unit="none">0.0157624</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">6.28301</Lambda><T unit="none">0.800632</T><Tdev unit="none">0.016511</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">6.50291</Lambda><T unit="none">0.804662</T><Tdev unit="none">0.0166698</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">6.73051</Lambda><T unit="none">0.791929</T><Tdev unit="none">0.0173615</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">6.96608</Lambda><T unit="none">0.787914</T><Tdev unit="none">0.0184799</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">7.2099</Lambda><T unit="none">0.766851</T><Tdev unit="none">0.0189018</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">7.46224</Lambda><T unit="none">0.782944</T><Tdev unit="none">0.0206348</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">7.72342</Lambda><T unit="none">0.814948</T><Tdev unit="none">0.0227538</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">7.99374</Lambda><T unit="none">0.80979</T><Tdev unit="none">0.0245837</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">8.27352</Lambda><T unit="none">0.766938</T><Tdev unit="none">0.0247973</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">8.56309</Lambda><T unit="none">0.78171</T><Tdev unit="none">0.0273093</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">8.8628</Lambda><T unit="none">0.78682</T><Tdev unit="none">0.0292675</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">9.173</Lambda><T unit="none">0.695609</T><Tdev unit="none">0.0284922</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">9.49406</Lambda><T unit="none">0.821645</T><Tdev unit="none">0.0357011</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">9.82867</Lambda><T unit="none">0.750056</T><Tdev unit="none">0.0359214</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.2385</Lambda><T unit="none">0.822129</T><Tdev unit="none">0.0173323</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.31685</Lambda><T unit="none">0.845515</T><Tdev unit="none">0.0164878</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.39794</Lambda><T unit="none">0.816808</T><Tdev unit="none">0.015174</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.48186</Lambda><T unit="none">0.830173</T><Tdev unit="none">0.0145918</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.56873</Lambda><T unit="none">0.851374</T><Tdev unit="none">0.0143224</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.65864</Lambda><T unit="none">0.841204</T><Tdev unit="none">0.0139286</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.75169</Lambda><T unit="none">0.840502</T><Tdev unit="none">0.0138532</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.848</Lambda><T unit="none">0.834207</T><Tdev unit="none">0.0136892</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.94768</Lambda><T unit="none">0.829282</T><Tdev unit="none">0.0134304</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.05085</Lambda><T unit="none">0.842545</T><Tdev unit="none">0.0137226</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.15763</Lambda><T unit="none">0.84418</T><Tdev unit="none">0.0138088</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.26814</Lambda><T unit="none">0.814072</T><Tdev unit="none">0.013433</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.38253</Lambda><T unit="none">0.817536</T><Tdev unit="none">0.0137297</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.50092</Lambda><T unit="none">0.800998</T><Tdev unit="none">0.0136996</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.62345</Lambda><T unit="none">0.792305</T><Tdev unit="none">0.01388</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.75027</Lambda><T unit="none">0.817957</T><Tdev unit="none">0.0145088</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.88153</Lambda><T unit="none">0.831011</T><Tdev unit="none">0.0149245</Tdev></Tdata>
+			<Tdata><Lambda unit="A">4.01738</Lambda><T unit="none">0.83775</T><Tdev unit="none">0.0152348</Tdev></Tdata>
+			<Tdata><Lambda unit="A">4.15799</Lambda><T unit="none">0.833825</T><Tdev unit="none">0.0151152</Tdev></Tdata>
+			<Tdata><Lambda unit="A">4.30352</Lambda><T unit="none">0.851385</T><Tdev unit="none">0.0154299</Tdev></Tdata>
+			<Tdata><Lambda unit="A">4.45414</Lambda><T unit="none">0.837144</T><Tdev unit="none">0.0150596</Tdev></Tdata>
+			<Tdata><Lambda unit="A">4.61004</Lambda><T unit="none">0.844617</T><Tdev unit="none">0.015643</Tdev></Tdata>
+			<Tdata><Lambda unit="A">4.77139</Lambda><T unit="none">0.822439</T><Tdev unit="none">0.0148799</Tdev></Tdata>
+			<Tdata><Lambda unit="A">4.93839</Lambda><T unit="none">0.820479</T><Tdev unit="none">0.0145397</Tdev></Tdata>
+			<Tdata><Lambda unit="A">5.11123</Lambda><T unit="none">0.822857</T><Tdev unit="none">0.0147626</Tdev></Tdata>
+			<Tdata><Lambda unit="A">5.29012</Lambda><T unit="none">0.8194</T><Tdev unit="none">0.0149288</Tdev></Tdata>
+			<Tdata><Lambda unit="A">5.47528</Lambda><T unit="none">0.818558</T><Tdev unit="none">0.0150553</Tdev></Tdata>
+			<Tdata><Lambda unit="A">5.66691</Lambda><T unit="none">0.81581</T><Tdev unit="none">0.015393</Tdev></Tdata>
+			<Tdata><Lambda unit="A">5.86525</Lambda><T unit="none">0.810869</T><Tdev unit="none">0.0155707</Tdev></Tdata>
+			<Tdata><Lambda unit="A">6.07054</Lambda><T unit="none">0.79084</T><Tdev unit="none">0.0157624</Tdev></Tdata>
+			<Tdata><Lambda unit="A">6.28301</Lambda><T unit="none">0.800632</T><Tdev unit="none">0.016511</Tdev></Tdata>
+			<Tdata><Lambda unit="A">6.50291</Lambda><T unit="none">0.804662</T><Tdev unit="none">0.0166698</Tdev></Tdata>
+			<Tdata><Lambda unit="A">6.73051</Lambda><T unit="none">0.791929</T><Tdev unit="none">0.0173615</Tdev></Tdata>
+			<Tdata><Lambda unit="A">6.96608</Lambda><T unit="none">0.787914</T><Tdev unit="none">0.0184799</Tdev></Tdata>
+			<Tdata><Lambda unit="A">7.2099</Lambda><T unit="none">0.766851</T><Tdev unit="none">0.0189018</Tdev></Tdata>
+			<Tdata><Lambda unit="A">7.46224</Lambda><T unit="none">0.782944</T><Tdev unit="none">0.0206348</Tdev></Tdata>
+			<Tdata><Lambda unit="A">7.72342</Lambda><T unit="none">0.814948</T><Tdev unit="none">0.0227538</Tdev></Tdata>
+			<Tdata><Lambda unit="A">7.99374</Lambda><T unit="none">0.80979</T><Tdev unit="none">0.0245837</Tdev></Tdata>
+			<Tdata><Lambda unit="A">8.27352</Lambda><T unit="none">0.766938</T><Tdev unit="none">0.0247973</Tdev></Tdata>
+			<Tdata><Lambda unit="A">8.56309</Lambda><T unit="none">0.78171</T><Tdev unit="none">0.0273093</Tdev></Tdata>
+			<Tdata><Lambda unit="A">8.8628</Lambda><T unit="none">0.78682</T><Tdev unit="none">0.0292675</Tdev></Tdata>
+			<Tdata><Lambda unit="A">9.173</Lambda><T unit="none">0.695609</T><Tdev unit="none">0.0284922</Tdev></Tdata>
+			<Tdata><Lambda unit="A">9.49406</Lambda><T unit="none">0.821645</T><Tdev unit="none">0.0357011</Tdev></Tdata>
+			<Tdata><Lambda unit="A">9.82867</Lambda><T unit="none">0.750056</T><Tdev unit="none">0.0359214</Tdev></Tdata>
 		</SAStransmission_spectrum>
 		<SASsample>
Index: sasview/test/1d_data/AOT_Microemulsion-Shell_Contrast.xml
===================================================================
--- sasview/test/1d_data/AOT_Microemulsion-Shell_Contrast.xml	(revision 24c41e6ad9e9248b99c36524d45d905400789ffc)
+++ sasview/test/1d_data/AOT_Microemulsion-Shell_Contrast.xml	(revision d8ff88ef7952cb1ee50c4e8256c32f616d8630ca)
@@ -149,94 +149,94 @@
 		</SASdata>
 		<SAStransmission_spectrum name="sample">
-			<Tdata><Lambda unit="Wavelength">2.2385</Lambda><T unit="none">0.814019</T><Tdev unit="none">0.017223</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.31685</Lambda><T unit="none">0.822634</T><Tdev unit="none">0.0160814</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.39794</Lambda><T unit="none">0.818705</T><Tdev unit="none">0.0152182</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.48186</Lambda><T unit="none">0.809856</T><Tdev unit="none">0.0143624</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.56873</Lambda><T unit="none">0.826314</T><Tdev unit="none">0.0140208</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.65864</Lambda><T unit="none">0.822783</T><Tdev unit="none">0.0137717</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.75169</Lambda><T unit="none">0.802642</T><Tdev unit="none">0.0133671</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.848</Lambda><T unit="none">0.803377</T><Tdev unit="none">0.0133922</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.94768</Lambda><T unit="none">0.794139</T><Tdev unit="none">0.0130707</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.05085</Lambda><T unit="none">0.815364</T><Tdev unit="none">0.0134187</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.15763</Lambda><T unit="none">0.800309</T><Tdev unit="none">0.0132246</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.26814</Lambda><T unit="none">0.80871</T><Tdev unit="none">0.0135129</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.38253</Lambda><T unit="none">0.820682</T><Tdev unit="none">0.0138617</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.50092</Lambda><T unit="none">0.797915</T><Tdev unit="none">0.0137452</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.62345</Lambda><T unit="none">0.816615</T><Tdev unit="none">0.0142663</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.75027</Lambda><T unit="none">0.802533</T><Tdev unit="none">0.0143034</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.88153</Lambda><T unit="none">0.808749</T><Tdev unit="none">0.0146802</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">4.01738</Lambda><T unit="none">0.783133</T><Tdev unit="none">0.0145092</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">4.15799</Lambda><T unit="none">0.793325</T><Tdev unit="none">0.0146153</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">4.30352</Lambda><T unit="none">0.797473</T><Tdev unit="none">0.0146883</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">4.45414</Lambda><T unit="none">0.785519</T><Tdev unit="none">0.0143282</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">4.61004</Lambda><T unit="none">0.803396</T><Tdev unit="none">0.0150633</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">4.77139</Lambda><T unit="none">0.770051</T><Tdev unit="none">0.0141638</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">4.93839</Lambda><T unit="none">0.787241</T><Tdev unit="none">0.0141665</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">5.11123</Lambda><T unit="none">0.794205</T><Tdev unit="none">0.0144122</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">5.29012</Lambda><T unit="none">0.782283</T><Tdev unit="none">0.014437</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">5.47528</Lambda><T unit="none">0.758284</T><Tdev unit="none">0.0141906</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">5.66691</Lambda><T unit="none">0.782988</T><Tdev unit="none">0.0149732</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">5.86525</Lambda><T unit="none">0.75032</T><Tdev unit="none">0.0146516</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">6.07054</Lambda><T unit="none">0.745702</T><Tdev unit="none">0.0150213</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">6.28301</Lambda><T unit="none">0.73731</T><Tdev unit="none">0.0156016</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">6.50291</Lambda><T unit="none">0.720698</T><Tdev unit="none">0.0153645</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">6.73051</Lambda><T unit="none">0.714051</T><Tdev unit="none">0.0160739</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">6.96608</Lambda><T unit="none">0.737957</T><Tdev unit="none">0.0177617</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">7.2099</Lambda><T unit="none">0.734146</T><Tdev unit="none">0.0185221</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">7.46224</Lambda><T unit="none">0.747312</T><Tdev unit="none">0.0201097</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">7.72342</Lambda><T unit="none">0.76747</T><Tdev unit="none">0.0218622</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">7.99374</Lambda><T unit="none">0.740056</T><Tdev unit="none">0.0229787</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">8.27352</Lambda><T unit="none">0.736972</T><Tdev unit="none">0.0242986</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">8.56309</Lambda><T unit="none">0.726686</T><Tdev unit="none">0.0260432</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">8.8628</Lambda><T unit="none">0.708884</T><Tdev unit="none">0.0272203</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">9.173</Lambda><T unit="none">0.687348</T><Tdev unit="none">0.0286628</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">9.49406</Lambda><T unit="none">0.68835</T><Tdev unit="none">0.0313235</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">9.82867</Lambda><T unit="none">0.665124</T><Tdev unit="none">0.0332689</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.2385</Lambda><T unit="none">0.814019</T><Tdev unit="none">0.017223</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.31685</Lambda><T unit="none">0.822634</T><Tdev unit="none">0.0160814</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.39794</Lambda><T unit="none">0.818705</T><Tdev unit="none">0.0152182</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.48186</Lambda><T unit="none">0.809856</T><Tdev unit="none">0.0143624</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.56873</Lambda><T unit="none">0.826314</T><Tdev unit="none">0.0140208</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.65864</Lambda><T unit="none">0.822783</T><Tdev unit="none">0.0137717</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.75169</Lambda><T unit="none">0.802642</T><Tdev unit="none">0.0133671</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.848</Lambda><T unit="none">0.803377</T><Tdev unit="none">0.0133922</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.94768</Lambda><T unit="none">0.794139</T><Tdev unit="none">0.0130707</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.05085</Lambda><T unit="none">0.815364</T><Tdev unit="none">0.0134187</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.15763</Lambda><T unit="none">0.800309</T><Tdev unit="none">0.0132246</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.26814</Lambda><T unit="none">0.80871</T><Tdev unit="none">0.0135129</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.38253</Lambda><T unit="none">0.820682</T><Tdev unit="none">0.0138617</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.50092</Lambda><T unit="none">0.797915</T><Tdev unit="none">0.0137452</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.62345</Lambda><T unit="none">0.816615</T><Tdev unit="none">0.0142663</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.75027</Lambda><T unit="none">0.802533</T><Tdev unit="none">0.0143034</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.88153</Lambda><T unit="none">0.808749</T><Tdev unit="none">0.0146802</Tdev></Tdata>
+			<Tdata><Lambda unit="A">4.01738</Lambda><T unit="none">0.783133</T><Tdev unit="none">0.0145092</Tdev></Tdata>
+			<Tdata><Lambda unit="A">4.15799</Lambda><T unit="none">0.793325</T><Tdev unit="none">0.0146153</Tdev></Tdata>
+			<Tdata><Lambda unit="A">4.30352</Lambda><T unit="none">0.797473</T><Tdev unit="none">0.0146883</Tdev></Tdata>
+			<Tdata><Lambda unit="A">4.45414</Lambda><T unit="none">0.785519</T><Tdev unit="none">0.0143282</Tdev></Tdata>
+			<Tdata><Lambda unit="A">4.61004</Lambda><T unit="none">0.803396</T><Tdev unit="none">0.0150633</Tdev></Tdata>
+			<Tdata><Lambda unit="A">4.77139</Lambda><T unit="none">0.770051</T><Tdev unit="none">0.0141638</Tdev></Tdata>
+			<Tdata><Lambda unit="A">4.93839</Lambda><T unit="none">0.787241</T><Tdev unit="none">0.0141665</Tdev></Tdata>
+			<Tdata><Lambda unit="A">5.11123</Lambda><T unit="none">0.794205</T><Tdev unit="none">0.0144122</Tdev></Tdata>
+			<Tdata><Lambda unit="A">5.29012</Lambda><T unit="none">0.782283</T><Tdev unit="none">0.014437</Tdev></Tdata>
+			<Tdata><Lambda unit="A">5.47528</Lambda><T unit="none">0.758284</T><Tdev unit="none">0.0141906</Tdev></Tdata>
+			<Tdata><Lambda unit="A">5.66691</Lambda><T unit="none">0.782988</T><Tdev unit="none">0.0149732</Tdev></Tdata>
+			<Tdata><Lambda unit="A">5.86525</Lambda><T unit="none">0.75032</T><Tdev unit="none">0.0146516</Tdev></Tdata>
+			<Tdata><Lambda unit="A">6.07054</Lambda><T unit="none">0.745702</T><Tdev unit="none">0.0150213</Tdev></Tdata>
+			<Tdata><Lambda unit="A">6.28301</Lambda><T unit="none">0.73731</T><Tdev unit="none">0.0156016</Tdev></Tdata>
+			<Tdata><Lambda unit="A">6.50291</Lambda><T unit="none">0.720698</T><Tdev unit="none">0.0153645</Tdev></Tdata>
+			<Tdata><Lambda unit="A">6.73051</Lambda><T unit="none">0.714051</T><Tdev unit="none">0.0160739</Tdev></Tdata>
+			<Tdata><Lambda unit="A">6.96608</Lambda><T unit="none">0.737957</T><Tdev unit="none">0.0177617</Tdev></Tdata>
+			<Tdata><Lambda unit="A">7.2099</Lambda><T unit="none">0.734146</T><Tdev unit="none">0.0185221</Tdev></Tdata>
+			<Tdata><Lambda unit="A">7.46224</Lambda><T unit="none">0.747312</T><Tdev unit="none">0.0201097</Tdev></Tdata>
+			<Tdata><Lambda unit="A">7.72342</Lambda><T unit="none">0.76747</T><Tdev unit="none">0.0218622</Tdev></Tdata>
+			<Tdata><Lambda unit="A">7.99374</Lambda><T unit="none">0.740056</T><Tdev unit="none">0.0229787</Tdev></Tdata>
+			<Tdata><Lambda unit="A">8.27352</Lambda><T unit="none">0.736972</T><Tdev unit="none">0.0242986</Tdev></Tdata>
+			<Tdata><Lambda unit="A">8.56309</Lambda><T unit="none">0.726686</T><Tdev unit="none">0.0260432</Tdev></Tdata>
+			<Tdata><Lambda unit="A">8.8628</Lambda><T unit="none">0.708884</T><Tdev unit="none">0.0272203</Tdev></Tdata>
+			<Tdata><Lambda unit="A">9.173</Lambda><T unit="none">0.687348</T><Tdev unit="none">0.0286628</Tdev></Tdata>
+			<Tdata><Lambda unit="A">9.49406</Lambda><T unit="none">0.68835</T><Tdev unit="none">0.0313235</Tdev></Tdata>
+			<Tdata><Lambda unit="A">9.82867</Lambda><T unit="none">0.665124</T><Tdev unit="none">0.0332689</Tdev></Tdata>
 		</SAStransmission_spectrum>
 		<SAStransmission_spectrum name="can">
-			<Tdata><Lambda unit="Wavelength">2.2385</Lambda><T unit="none">0.822129</T><Tdev unit="none">0.0173323</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.31685</Lambda><T unit="none">0.845515</T><Tdev unit="none">0.0164878</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.39794</Lambda><T unit="none">0.816808</T><Tdev unit="none">0.015174</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.48186</Lambda><T unit="none">0.830173</T><Tdev unit="none">0.0145918</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.56873</Lambda><T unit="none">0.851374</T><Tdev unit="none">0.0143224</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.65864</Lambda><T unit="none">0.841204</T><Tdev unit="none">0.0139286</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.75169</Lambda><T unit="none">0.840502</T><Tdev unit="none">0.0138532</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.848</Lambda><T unit="none">0.834207</T><Tdev unit="none">0.0136892</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.94768</Lambda><T unit="none">0.829282</T><Tdev unit="none">0.0134304</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.05085</Lambda><T unit="none">0.842545</T><Tdev unit="none">0.0137226</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.15763</Lambda><T unit="none">0.84418</T><Tdev unit="none">0.0138088</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.26814</Lambda><T unit="none">0.814072</T><Tdev unit="none">0.013433</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.38253</Lambda><T unit="none">0.817536</T><Tdev unit="none">0.0137297</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.50092</Lambda><T unit="none">0.800998</T><Tdev unit="none">0.0136996</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.62345</Lambda><T unit="none">0.792305</T><Tdev unit="none">0.01388</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.75027</Lambda><T unit="none">0.817957</T><Tdev unit="none">0.0145088</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.88153</Lambda><T unit="none">0.831011</T><Tdev unit="none">0.0149245</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">4.01738</Lambda><T unit="none">0.83775</T><Tdev unit="none">0.0152348</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">4.15799</Lambda><T unit="none">0.833825</T><Tdev unit="none">0.0151152</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">4.30352</Lambda><T unit="none">0.851385</T><Tdev unit="none">0.0154299</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">4.45414</Lambda><T unit="none">0.837144</T><Tdev unit="none">0.0150596</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">4.61004</Lambda><T unit="none">0.844617</T><Tdev unit="none">0.015643</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">4.77139</Lambda><T unit="none">0.822439</T><Tdev unit="none">0.0148799</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">4.93839</Lambda><T unit="none">0.820479</T><Tdev unit="none">0.0145397</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">5.11123</Lambda><T unit="none">0.822857</T><Tdev unit="none">0.0147626</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">5.29012</Lambda><T unit="none">0.8194</T><Tdev unit="none">0.0149288</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">5.47528</Lambda><T unit="none">0.818558</T><Tdev unit="none">0.0150553</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">5.66691</Lambda><T unit="none">0.81581</T><Tdev unit="none">0.015393</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">5.86525</Lambda><T unit="none">0.810869</T><Tdev unit="none">0.0155707</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">6.07054</Lambda><T unit="none">0.79084</T><Tdev unit="none">0.0157624</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">6.28301</Lambda><T unit="none">0.800632</T><Tdev unit="none">0.016511</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">6.50291</Lambda><T unit="none">0.804662</T><Tdev unit="none">0.0166698</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">6.73051</Lambda><T unit="none">0.791929</T><Tdev unit="none">0.0173615</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">6.96608</Lambda><T unit="none">0.787914</T><Tdev unit="none">0.0184799</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">7.2099</Lambda><T unit="none">0.766851</T><Tdev unit="none">0.0189018</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">7.46224</Lambda><T unit="none">0.782944</T><Tdev unit="none">0.0206348</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">7.72342</Lambda><T unit="none">0.814948</T><Tdev unit="none">0.0227538</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">7.99374</Lambda><T unit="none">0.80979</T><Tdev unit="none">0.0245837</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">8.27352</Lambda><T unit="none">0.766938</T><Tdev unit="none">0.0247973</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">8.56309</Lambda><T unit="none">0.78171</T><Tdev unit="none">0.0273093</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">8.8628</Lambda><T unit="none">0.78682</T><Tdev unit="none">0.0292675</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">9.173</Lambda><T unit="none">0.695609</T><Tdev unit="none">0.0284922</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">9.49406</Lambda><T unit="none">0.821645</T><Tdev unit="none">0.0357011</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">9.82867</Lambda><T unit="none">0.750056</T><Tdev unit="none">0.0359214</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.2385</Lambda><T unit="none">0.822129</T><Tdev unit="none">0.0173323</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.31685</Lambda><T unit="none">0.845515</T><Tdev unit="none">0.0164878</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.39794</Lambda><T unit="none">0.816808</T><Tdev unit="none">0.015174</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.48186</Lambda><T unit="none">0.830173</T><Tdev unit="none">0.0145918</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.56873</Lambda><T unit="none">0.851374</T><Tdev unit="none">0.0143224</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.65864</Lambda><T unit="none">0.841204</T><Tdev unit="none">0.0139286</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.75169</Lambda><T unit="none">0.840502</T><Tdev unit="none">0.0138532</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.848</Lambda><T unit="none">0.834207</T><Tdev unit="none">0.0136892</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.94768</Lambda><T unit="none">0.829282</T><Tdev unit="none">0.0134304</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.05085</Lambda><T unit="none">0.842545</T><Tdev unit="none">0.0137226</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.15763</Lambda><T unit="none">0.84418</T><Tdev unit="none">0.0138088</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.26814</Lambda><T unit="none">0.814072</T><Tdev unit="none">0.013433</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.38253</Lambda><T unit="none">0.817536</T><Tdev unit="none">0.0137297</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.50092</Lambda><T unit="none">0.800998</T><Tdev unit="none">0.0136996</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.62345</Lambda><T unit="none">0.792305</T><Tdev unit="none">0.01388</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.75027</Lambda><T unit="none">0.817957</T><Tdev unit="none">0.0145088</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.88153</Lambda><T unit="none">0.831011</T><Tdev unit="none">0.0149245</Tdev></Tdata>
+			<Tdata><Lambda unit="A">4.01738</Lambda><T unit="none">0.83775</T><Tdev unit="none">0.0152348</Tdev></Tdata>
+			<Tdata><Lambda unit="A">4.15799</Lambda><T unit="none">0.833825</T><Tdev unit="none">0.0151152</Tdev></Tdata>
+			<Tdata><Lambda unit="A">4.30352</Lambda><T unit="none">0.851385</T><Tdev unit="none">0.0154299</Tdev></Tdata>
+			<Tdata><Lambda unit="A">4.45414</Lambda><T unit="none">0.837144</T><Tdev unit="none">0.0150596</Tdev></Tdata>
+			<Tdata><Lambda unit="A">4.61004</Lambda><T unit="none">0.844617</T><Tdev unit="none">0.015643</Tdev></Tdata>
+			<Tdata><Lambda unit="A">4.77139</Lambda><T unit="none">0.822439</T><Tdev unit="none">0.0148799</Tdev></Tdata>
+			<Tdata><Lambda unit="A">4.93839</Lambda><T unit="none">0.820479</T><Tdev unit="none">0.0145397</Tdev></Tdata>
+			<Tdata><Lambda unit="A">5.11123</Lambda><T unit="none">0.822857</T><Tdev unit="none">0.0147626</Tdev></Tdata>
+			<Tdata><Lambda unit="A">5.29012</Lambda><T unit="none">0.8194</T><Tdev unit="none">0.0149288</Tdev></Tdata>
+			<Tdata><Lambda unit="A">5.47528</Lambda><T unit="none">0.818558</T><Tdev unit="none">0.0150553</Tdev></Tdata>
+			<Tdata><Lambda unit="A">5.66691</Lambda><T unit="none">0.81581</T><Tdev unit="none">0.015393</Tdev></Tdata>
+			<Tdata><Lambda unit="A">5.86525</Lambda><T unit="none">0.810869</T><Tdev unit="none">0.0155707</Tdev></Tdata>
+			<Tdata><Lambda unit="A">6.07054</Lambda><T unit="none">0.79084</T><Tdev unit="none">0.0157624</Tdev></Tdata>
+			<Tdata><Lambda unit="A">6.28301</Lambda><T unit="none">0.800632</T><Tdev unit="none">0.016511</Tdev></Tdata>
+			<Tdata><Lambda unit="A">6.50291</Lambda><T unit="none">0.804662</T><Tdev unit="none">0.0166698</Tdev></Tdata>
+			<Tdata><Lambda unit="A">6.73051</Lambda><T unit="none">0.791929</T><Tdev unit="none">0.0173615</Tdev></Tdata>
+			<Tdata><Lambda unit="A">6.96608</Lambda><T unit="none">0.787914</T><Tdev unit="none">0.0184799</Tdev></Tdata>
+			<Tdata><Lambda unit="A">7.2099</Lambda><T unit="none">0.766851</T><Tdev unit="none">0.0189018</Tdev></Tdata>
+			<Tdata><Lambda unit="A">7.46224</Lambda><T unit="none">0.782944</T><Tdev unit="none">0.0206348</Tdev></Tdata>
+			<Tdata><Lambda unit="A">7.72342</Lambda><T unit="none">0.814948</T><Tdev unit="none">0.0227538</Tdev></Tdata>
+			<Tdata><Lambda unit="A">7.99374</Lambda><T unit="none">0.80979</T><Tdev unit="none">0.0245837</Tdev></Tdata>
+			<Tdata><Lambda unit="A">8.27352</Lambda><T unit="none">0.766938</T><Tdev unit="none">0.0247973</Tdev></Tdata>
+			<Tdata><Lambda unit="A">8.56309</Lambda><T unit="none">0.78171</T><Tdev unit="none">0.0273093</Tdev></Tdata>
+			<Tdata><Lambda unit="A">8.8628</Lambda><T unit="none">0.78682</T><Tdev unit="none">0.0292675</Tdev></Tdata>
+			<Tdata><Lambda unit="A">9.173</Lambda><T unit="none">0.695609</T><Tdev unit="none">0.0284922</Tdev></Tdata>
+			<Tdata><Lambda unit="A">9.49406</Lambda><T unit="none">0.821645</T><Tdev unit="none">0.0357011</Tdev></Tdata>
+			<Tdata><Lambda unit="A">9.82867</Lambda><T unit="none">0.750056</T><Tdev unit="none">0.0359214</Tdev></Tdata>
 		</SAStransmission_spectrum>
 		<SASsample>
Index: sasview/test/1d_data/ISIS_Polymer_Blend_TK49.xml
===================================================================
--- sasview/test/1d_data/ISIS_Polymer_Blend_TK49.xml	(revision 24c41e6ad9e9248b99c36524d45d905400789ffc)
+++ sasview/test/1d_data/ISIS_Polymer_Blend_TK49.xml	(revision d8ff88ef7952cb1ee50c4e8256c32f616d8630ca)
@@ -114,94 +114,94 @@
 		</SASdata>
 		<SAStransmission_spectrum name="sample">
-			<Tdata><Lambda unit="Wavelength">2.2385</Lambda><T unit="none">0.786163</T><Tdev unit="none">0.0096642</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.31685</Lambda><T unit="none">0.770235</T><Tdev unit="none">0.00879212</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.39794</Lambda><T unit="none">0.777495</T><Tdev unit="none">0.00841517</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.48186</Lambda><T unit="none">0.786306</T><Tdev unit="none">0.00806143</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.56873</Lambda><T unit="none">0.797545</T><Tdev unit="none">0.00785792</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.65864</Lambda><T unit="none">0.79782</T><Tdev unit="none">0.00773675</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.75169</Lambda><T unit="none">0.805833</T><Tdev unit="none">0.00775174</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.848</Lambda><T unit="none">0.809999</T><Tdev unit="none">0.00776142</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.94768</Lambda><T unit="none">0.79051</T><Tdev unit="none">0.00745639</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.05085</Lambda><T unit="none">0.791241</T><Tdev unit="none">0.00750012</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.15763</Lambda><T unit="none">0.799274</T><Tdev unit="none">0.00762256</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.26814</Lambda><T unit="none">0.797936</T><Tdev unit="none">0.00766708</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.38253</Lambda><T unit="none">0.797587</T><Tdev unit="none">0.00783051</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.50092</Lambda><T unit="none">0.798112</T><Tdev unit="none">0.00792609</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.62345</Lambda><T unit="none">0.798475</T><Tdev unit="none">0.00807027</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.75027</Lambda><T unit="none">0.785898</T><Tdev unit="none">0.00808905</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.88153</Lambda><T unit="none">0.789056</T><Tdev unit="none">0.00828522</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">4.01738</Lambda><T unit="none">0.778539</T><Tdev unit="none">0.00837451</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">4.15799</Lambda><T unit="none">0.776566</T><Tdev unit="none">0.00825541</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">4.30352</Lambda><T unit="none">0.774642</T><Tdev unit="none">0.00823145</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">4.45414</Lambda><T unit="none">0.768346</T><Tdev unit="none">0.00811786</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">4.61004</Lambda><T unit="none">0.743393</T><Tdev unit="none">0.00815077</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">4.77139</Lambda><T unit="none">0.751847</T><Tdev unit="none">0.00800671</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">4.93839</Lambda><T unit="none">0.763461</T><Tdev unit="none">0.00793343</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">5.11123</Lambda><T unit="none">0.764236</T><Tdev unit="none">0.00806267</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">5.29012</Lambda><T unit="none">0.761627</T><Tdev unit="none">0.00812499</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">5.47528</Lambda><T unit="none">0.747197</T><Tdev unit="none">0.00804089</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">5.66691</Lambda><T unit="none">0.740239</T><Tdev unit="none">0.00815523</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">5.86525</Lambda><T unit="none">0.731485</T><Tdev unit="none">0.00828484</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">6.07054</Lambda><T unit="none">0.72041</T><Tdev unit="none">0.00844256</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">6.28301</Lambda><T unit="none">0.714519</T><Tdev unit="none">0.00872015</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">6.50291</Lambda><T unit="none">0.725497</T><Tdev unit="none">0.0088641</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">6.73051</Lambda><T unit="none">0.718226</T><Tdev unit="none">0.00931959</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">6.96608</Lambda><T unit="none">0.709528</T><Tdev unit="none">0.00989624</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">7.2099</Lambda><T unit="none">0.700741</T><Tdev unit="none">0.0102942</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">7.46224</Lambda><T unit="none">0.695703</T><Tdev unit="none">0.0108481</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">7.72342</Lambda><T unit="none">0.697085</T><Tdev unit="none">0.0116567</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">7.99374</Lambda><T unit="none">0.70513</T><Tdev unit="none">0.0127117</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">8.27352</Lambda><T unit="none">0.693742</T><Tdev unit="none">0.0133701</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">8.56309</Lambda><T unit="none">0.685712</T><Tdev unit="none">0.0142133</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">8.8628</Lambda><T unit="none">0.686759</T><Tdev unit="none">0.0154522</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">9.173</Lambda><T unit="none">0.671511</T><Tdev unit="none">0.0161653</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">9.49406</Lambda><T unit="none">0.681778</T><Tdev unit="none">0.0182229</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">9.82867</Lambda><T unit="none">0.678599</T><Tdev unit="none">0.0197393</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.2385</Lambda><T unit="none">0.786163</T><Tdev unit="none">0.0096642</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.31685</Lambda><T unit="none">0.770235</T><Tdev unit="none">0.00879212</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.39794</Lambda><T unit="none">0.777495</T><Tdev unit="none">0.00841517</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.48186</Lambda><T unit="none">0.786306</T><Tdev unit="none">0.00806143</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.56873</Lambda><T unit="none">0.797545</T><Tdev unit="none">0.00785792</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.65864</Lambda><T unit="none">0.79782</T><Tdev unit="none">0.00773675</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.75169</Lambda><T unit="none">0.805833</T><Tdev unit="none">0.00775174</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.848</Lambda><T unit="none">0.809999</T><Tdev unit="none">0.00776142</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.94768</Lambda><T unit="none">0.79051</T><Tdev unit="none">0.00745639</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.05085</Lambda><T unit="none">0.791241</T><Tdev unit="none">0.00750012</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.15763</Lambda><T unit="none">0.799274</T><Tdev unit="none">0.00762256</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.26814</Lambda><T unit="none">0.797936</T><Tdev unit="none">0.00766708</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.38253</Lambda><T unit="none">0.797587</T><Tdev unit="none">0.00783051</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.50092</Lambda><T unit="none">0.798112</T><Tdev unit="none">0.00792609</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.62345</Lambda><T unit="none">0.798475</T><Tdev unit="none">0.00807027</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.75027</Lambda><T unit="none">0.785898</T><Tdev unit="none">0.00808905</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.88153</Lambda><T unit="none">0.789056</T><Tdev unit="none">0.00828522</Tdev></Tdata>
+			<Tdata><Lambda unit="A">4.01738</Lambda><T unit="none">0.778539</T><Tdev unit="none">0.00837451</Tdev></Tdata>
+			<Tdata><Lambda unit="A">4.15799</Lambda><T unit="none">0.776566</T><Tdev unit="none">0.00825541</Tdev></Tdata>
+			<Tdata><Lambda unit="A">4.30352</Lambda><T unit="none">0.774642</T><Tdev unit="none">0.00823145</Tdev></Tdata>
+			<Tdata><Lambda unit="A">4.45414</Lambda><T unit="none">0.768346</T><Tdev unit="none">0.00811786</Tdev></Tdata>
+			<Tdata><Lambda unit="A">4.61004</Lambda><T unit="none">0.743393</T><Tdev unit="none">0.00815077</Tdev></Tdata>
+			<Tdata><Lambda unit="A">4.77139</Lambda><T unit="none">0.751847</T><Tdev unit="none">0.00800671</Tdev></Tdata>
+			<Tdata><Lambda unit="A">4.93839</Lambda><T unit="none">0.763461</T><Tdev unit="none">0.00793343</Tdev></Tdata>
+			<Tdata><Lambda unit="A">5.11123</Lambda><T unit="none">0.764236</T><Tdev unit="none">0.00806267</Tdev></Tdata>
+			<Tdata><Lambda unit="A">5.29012</Lambda><T unit="none">0.761627</T><Tdev unit="none">0.00812499</Tdev></Tdata>
+			<Tdata><Lambda unit="A">5.47528</Lambda><T unit="none">0.747197</T><Tdev unit="none">0.00804089</Tdev></Tdata>
+			<Tdata><Lambda unit="A">5.66691</Lambda><T unit="none">0.740239</T><Tdev unit="none">0.00815523</Tdev></Tdata>
+			<Tdata><Lambda unit="A">5.86525</Lambda><T unit="none">0.731485</T><Tdev unit="none">0.00828484</Tdev></Tdata>
+			<Tdata><Lambda unit="A">6.07054</Lambda><T unit="none">0.72041</T><Tdev unit="none">0.00844256</Tdev></Tdata>
+			<Tdata><Lambda unit="A">6.28301</Lambda><T unit="none">0.714519</T><Tdev unit="none">0.00872015</Tdev></Tdata>
+			<Tdata><Lambda unit="A">6.50291</Lambda><T unit="none">0.725497</T><Tdev unit="none">0.0088641</Tdev></Tdata>
+			<Tdata><Lambda unit="A">6.73051</Lambda><T unit="none">0.718226</T><Tdev unit="none">0.00931959</Tdev></Tdata>
+			<Tdata><Lambda unit="A">6.96608</Lambda><T unit="none">0.709528</T><Tdev unit="none">0.00989624</Tdev></Tdata>
+			<Tdata><Lambda unit="A">7.2099</Lambda><T unit="none">0.700741</T><Tdev unit="none">0.0102942</Tdev></Tdata>
+			<Tdata><Lambda unit="A">7.46224</Lambda><T unit="none">0.695703</T><Tdev unit="none">0.0108481</Tdev></Tdata>
+			<Tdata><Lambda unit="A">7.72342</Lambda><T unit="none">0.697085</T><Tdev unit="none">0.0116567</Tdev></Tdata>
+			<Tdata><Lambda unit="A">7.99374</Lambda><T unit="none">0.70513</T><Tdev unit="none">0.0127117</Tdev></Tdata>
+			<Tdata><Lambda unit="A">8.27352</Lambda><T unit="none">0.693742</T><Tdev unit="none">0.0133701</Tdev></Tdata>
+			<Tdata><Lambda unit="A">8.56309</Lambda><T unit="none">0.685712</T><Tdev unit="none">0.0142133</Tdev></Tdata>
+			<Tdata><Lambda unit="A">8.8628</Lambda><T unit="none">0.686759</T><Tdev unit="none">0.0154522</Tdev></Tdata>
+			<Tdata><Lambda unit="A">9.173</Lambda><T unit="none">0.671511</T><Tdev unit="none">0.0161653</Tdev></Tdata>
+			<Tdata><Lambda unit="A">9.49406</Lambda><T unit="none">0.681778</T><Tdev unit="none">0.0182229</Tdev></Tdata>
+			<Tdata><Lambda unit="A">9.82867</Lambda><T unit="none">0.678599</T><Tdev unit="none">0.0197393</Tdev></Tdata>
 		</SAStransmission_spectrum>
 		<SAStransmission_spectrum name="can">
-			<Tdata><Lambda unit="Wavelength">2.2385</Lambda><T unit="none">0.969003</T><Tdev unit="none">0.0115026</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.31685</Lambda><T unit="none">0.937114</T><Tdev unit="none">0.0103312</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.39794</Lambda><T unit="none">0.939149</T><Tdev unit="none">0.00980353</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.48186</Lambda><T unit="none">0.966476</T><Tdev unit="none">0.00956116</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.56873</Lambda><T unit="none">0.972652</T><Tdev unit="none">0.00924508</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.65864</Lambda><T unit="none">0.982579</T><Tdev unit="none">0.00919878</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.75169</Lambda><T unit="none">0.977831</T><Tdev unit="none">0.00909291</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.848</Lambda><T unit="none">0.985245</T><Tdev unit="none">0.00910727</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">2.94768</Lambda><T unit="none">0.962623</T><Tdev unit="none">0.00878271</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.05085</Lambda><T unit="none">0.974295</T><Tdev unit="none">0.00890757</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.15763</Lambda><T unit="none">0.992708</T><Tdev unit="none">0.00911479</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.26814</Lambda><T unit="none">0.983888</T><Tdev unit="none">0.00910172</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.38253</Lambda><T unit="none">0.998147</T><Tdev unit="none">0.00940118</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.50092</Lambda><T unit="none">0.99722</T><Tdev unit="none">0.00950691</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.62345</Lambda><T unit="none">0.987507</T><Tdev unit="none">0.0095792</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.75027</Lambda><T unit="none">0.988708</T><Tdev unit="none">0.00974798</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">3.88153</Lambda><T unit="none">0.980361</T><Tdev unit="none">0.00987494</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">4.01738</Lambda><T unit="none">0.986074</T><Tdev unit="none">0.0101361</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">4.15799</Lambda><T unit="none">0.976943</T><Tdev unit="none">0.00994774</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">4.30352</Lambda><T unit="none">0.984789</T><Tdev unit="none">0.00998696</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">4.45414</Lambda><T unit="none">0.983989</T><Tdev unit="none">0.00991497</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">4.61004</Lambda><T unit="none">0.943819</T><Tdev unit="none">0.0098634</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">4.77139</Lambda><T unit="none">0.963577</T><Tdev unit="none">0.00978712</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">4.93839</Lambda><T unit="none">0.983849</T><Tdev unit="none">0.00975665</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">5.11123</Lambda><T unit="none">1.00344</T><Tdev unit="none">0.0100637</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">5.29012</Lambda><T unit="none">0.983783</T><Tdev unit="none">0.00998654</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">5.47528</Lambda><T unit="none">0.977166</T><Tdev unit="none">0.0100031</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">5.66691</Lambda><T unit="none">0.974179</T><Tdev unit="none">0.0101862</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">5.86525</Lambda><T unit="none">0.988987</T><Tdev unit="none">0.0105942</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">6.07054</Lambda><T unit="none">0.975504</T><Tdev unit="none">0.0107968</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">6.28301</Lambda><T unit="none">0.975647</T><Tdev unit="none">0.011231</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">6.50291</Lambda><T unit="none">0.974633</T><Tdev unit="none">0.0113013</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">6.73051</Lambda><T unit="none">0.976703</T><Tdev unit="none">0.011987</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">6.96608</Lambda><T unit="none">0.967614</T><Tdev unit="none">0.0126815</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">7.2099</Lambda><T unit="none">0.978361</T><Tdev unit="none">0.0134068</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">7.46224</Lambda><T unit="none">0.958873</T><Tdev unit="none">0.0139943</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">7.72342</Lambda><T unit="none">0.97319</T><Tdev unit="none">0.015212</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">7.99374</Lambda><T unit="none">0.99698</T><Tdev unit="none">0.0167777</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">8.27352</Lambda><T unit="none">1.00513</T><Tdev unit="none">0.0180262</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">8.56309</Lambda><T unit="none">0.986528</T><Tdev unit="none">0.0190389</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">8.8628</Lambda><T unit="none">0.996815</T><Tdev unit="none">0.0208194</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">9.173</Lambda><T unit="none">0.957622</T><Tdev unit="none">0.0214354</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">9.49406</Lambda><T unit="none">1.00279</T><Tdev unit="none">0.0247042</Tdev></Tdata>
-			<Tdata><Lambda unit="Wavelength">9.82867</Lambda><T unit="none">0.993793</T><Tdev unit="none">0.0267795</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.2385</Lambda><T unit="none">0.969003</T><Tdev unit="none">0.0115026</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.31685</Lambda><T unit="none">0.937114</T><Tdev unit="none">0.0103312</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.39794</Lambda><T unit="none">0.939149</T><Tdev unit="none">0.00980353</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.48186</Lambda><T unit="none">0.966476</T><Tdev unit="none">0.00956116</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.56873</Lambda><T unit="none">0.972652</T><Tdev unit="none">0.00924508</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.65864</Lambda><T unit="none">0.982579</T><Tdev unit="none">0.00919878</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.75169</Lambda><T unit="none">0.977831</T><Tdev unit="none">0.00909291</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.848</Lambda><T unit="none">0.985245</T><Tdev unit="none">0.00910727</Tdev></Tdata>
+			<Tdata><Lambda unit="A">2.94768</Lambda><T unit="none">0.962623</T><Tdev unit="none">0.00878271</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.05085</Lambda><T unit="none">0.974295</T><Tdev unit="none">0.00890757</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.15763</Lambda><T unit="none">0.992708</T><Tdev unit="none">0.00911479</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.26814</Lambda><T unit="none">0.983888</T><Tdev unit="none">0.00910172</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.38253</Lambda><T unit="none">0.998147</T><Tdev unit="none">0.00940118</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.50092</Lambda><T unit="none">0.99722</T><Tdev unit="none">0.00950691</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.62345</Lambda><T unit="none">0.987507</T><Tdev unit="none">0.0095792</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.75027</Lambda><T unit="none">0.988708</T><Tdev unit="none">0.00974798</Tdev></Tdata>
+			<Tdata><Lambda unit="A">3.88153</Lambda><T unit="none">0.980361</T><Tdev unit="none">0.00987494</Tdev></Tdata>
+			<Tdata><Lambda unit="A">4.01738</Lambda><T unit="none">0.986074</T><Tdev unit="none">0.0101361</Tdev></Tdata>
+			<Tdata><Lambda unit="A">4.15799</Lambda><T unit="none">0.976943</T><Tdev unit="none">0.00994774</Tdev></Tdata>
+			<Tdata><Lambda unit="A">4.30352</Lambda><T unit="none">0.984789</T><Tdev unit="none">0.00998696</Tdev></Tdata>
+			<Tdata><Lambda unit="A">4.45414</Lambda><T unit="none">0.983989</T><Tdev unit="none">0.00991497</Tdev></Tdata>
+			<Tdata><Lambda unit="A">4.61004</Lambda><T unit="none">0.943819</T><Tdev unit="none">0.0098634</Tdev></Tdata>
+			<Tdata><Lambda unit="A">4.77139</Lambda><T unit="none">0.963577</T><Tdev unit="none">0.00978712</Tdev></Tdata>
+			<Tdata><Lambda unit="A">4.93839</Lambda><T unit="none">0.983849</T><Tdev unit="none">0.00975665</Tdev></Tdata>
+			<Tdata><Lambda unit="A">5.11123</Lambda><T unit="none">1.00344</T><Tdev unit="none">0.0100637</Tdev></Tdata>
+			<Tdata><Lambda unit="A">5.29012</Lambda><T unit="none">0.983783</T><Tdev unit="none">0.00998654</Tdev></Tdata>
+			<Tdata><Lambda unit="A">5.47528</Lambda><T unit="none">0.977166</T><Tdev unit="none">0.0100031</Tdev></Tdata>
+			<Tdata><Lambda unit="A">5.66691</Lambda><T unit="none">0.974179</T><Tdev unit="none">0.0101862</Tdev></Tdata>
+			<Tdata><Lambda unit="A">5.86525</Lambda><T unit="none">0.988987</T><Tdev unit="none">0.0105942</Tdev></Tdata>
+			<Tdata><Lambda unit="A">6.07054</Lambda><T unit="none">0.975504</T><Tdev unit="none">0.0107968</Tdev></Tdata>
+			<Tdata><Lambda unit="A">6.28301</Lambda><T unit="none">0.975647</T><Tdev unit="none">0.011231</Tdev></Tdata>
+			<Tdata><Lambda unit="A">6.50291</Lambda><T unit="none">0.974633</T><Tdev unit="none">0.0113013</Tdev></Tdata>
+			<Tdata><Lambda unit="A">6.73051</Lambda><T unit="none">0.976703</T><Tdev unit="none">0.011987</Tdev></Tdata>
+			<Tdata><Lambda unit="A">6.96608</Lambda><T unit="none">0.967614</T><Tdev unit="none">0.0126815</Tdev></Tdata>
+			<Tdata><Lambda unit="A">7.2099</Lambda><T unit="none">0.978361</T><Tdev unit="none">0.0134068</Tdev></Tdata>
+			<Tdata><Lambda unit="A">7.46224</Lambda><T unit="none">0.958873</T><Tdev unit="none">0.0139943</Tdev></Tdata>
+			<Tdata><Lambda unit="A">7.72342</Lambda><T unit="none">0.97319</T><Tdev unit="none">0.015212</Tdev></Tdata>
+			<Tdata><Lambda unit="A">7.99374</Lambda><T unit="none">0.99698</T><Tdev unit="none">0.0167777</Tdev></Tdata>
+			<Tdata><Lambda unit="A">8.27352</Lambda><T unit="none">1.00513</T><Tdev unit="none">0.0180262</Tdev></Tdata>
+			<Tdata><Lambda unit="A">8.56309</Lambda><T unit="none">0.986528</T><Tdev unit="none">0.0190389</Tdev></Tdata>
+			<Tdata><Lambda unit="A">8.8628</Lambda><T unit="none">0.996815</T><Tdev unit="none">0.0208194</Tdev></Tdata>
+			<Tdata><Lambda unit="A">9.173</Lambda><T unit="none">0.957622</T><Tdev unit="none">0.0214354</Tdev></Tdata>
+			<Tdata><Lambda unit="A">9.49406</Lambda><T unit="none">1.00279</T><Tdev unit="none">0.0247042</Tdev></Tdata>
+			<Tdata><Lambda unit="A">9.82867</Lambda><T unit="none">0.993793</T><Tdev unit="none">0.0267795</Tdev></Tdata>
 		</SAStransmission_spectrum>
 		<SASsample>
