Index: DataLoader/test/cansas1d.xml
===================================================================
--- DataLoader/test/cansas1d.xml	(revision 8780e9a7e98f59c06b1819f1e068b7e84f496efc)
+++ DataLoader/test/cansas1d.xml	(revision 8780e9a7e98f59c06b1819f1e068b7e84f496efc)
@@ -0,0 +1,136 @@
+<?xml version="1.0"?>
+<?xml-stylesheet type="text/xsl" href="example.xsl" ?>
+<SASroot version="1.0"
+    xmlns="cansas1d/1.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="cansas1d/1.0 http://svn.smallangles.net/svn/canSAS/1dwg/trunk/cansas1d.xsd"
+    >
+	<SASentry>
+		<Title>Test title</Title>
+		<Run>1234</Run>
+		<SASdata>
+			<Idata>
+				<Q unit="1/A">0.02</Q>
+				<I unit="1/cm">1000</I>
+				<Idev unit="1/cm">3</Idev>
+				<Qdev unit="1/A">0.01</Qdev>
+				<Qmean unit="1/A"><!-- Qmean is optional --></Qmean>
+				<Shadowfactor><!-- Shadowfactor is optional --></Shadowfactor>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">0.02</Q>
+				<I unit="1/cm">1000</I>
+				<Idev unit="1/cm">3</Idev>
+				<Qdev unit="1/A">0.01</Qdev>
+				<Qmean unit="1/A"><!-- Qmean is optional --></Qmean>
+				<Shadowfactor><!-- Shadowfactor is optional --></Shadowfactor>
+			</Idata>
+		</SASdata>
+		<SASsample>
+			<ID>SI600-new-long</ID>
+			<thickness unit="mm">1.03</thickness>
+			<transmission>0.327</transmission>
+			<temperature unit="C">0.0000</temperature>
+			<position>
+				<x unit="mm">10.00</x>
+				<y unit="mm">0.00</y>
+			</position>
+			<orientation>
+				<roll unit="degree">22.5<!-- was: sample_orientation --></roll>
+				<pitch unit="degree">0.020<!-- was: sample_offset_angle --></pitch>
+			</orientation>
+			<details>
+				<!-- was: sample_prep -->
+				http://chemtools.chem.soton.ac.uk/projects/blog/blogs.php/bit_id/2720
+			</details>
+			<details>
+				Some text here
+			</details>
+			
+		</SASsample>
+		<SASinstrument name="TEST instrument">
+			<name>canSAS instrument</name>
+			<SASsource>
+				<radiation>neutron</radiation>
+				<beam_size>
+					<x unit="mm">12.00</x>
+					<y unit="mm">12.00</y>
+				</beam_size>
+				<beam_shape>disc</beam_shape>
+				<wavelength unit="A">6.00</wavelength>
+				<wavelength_min unit="nm">0.22</wavelength_min>
+				<wavelength_max unit="nm">1.00</wavelength_max>
+				<wavelength_spread unit="percent">
+					14.3
+				</wavelength_spread>
+			</SASsource>
+			<SAScollimation>
+				<aperture name="source" type="radius">
+					<size>
+						<x unit="mm">50</x>
+					</size>
+					<distance unit="m">11.000<!-- was: distance_coll --></distance>
+				</aperture>
+				<aperture name="sample" type="radius">
+					<size>
+						<x unit="mm">1</x>
+					</size>
+				</aperture>
+			</SAScollimation>
+			<SASdetector>
+				<name>fictional hybrid</name>
+				<SDD unit="m">
+					<!-- sample-to-detector distance -->
+					4.150
+				</SDD>
+				<orientation>
+					<roll unit="degree">1.00</roll>
+					<pitch unit="degree">0.00</pitch>
+					<yaw unit="degree">0.00</yaw>
+				</orientation>
+				<beam_center>
+					<x unit="mm">322.64</x>
+					<y unit="mm">327.68</y>
+				</beam_center>
+				<pixel_size>
+					<x unit="mm">5.00</x>
+					<y unit="mm">5.00</y>
+				</pixel_size>
+			</SASdetector>
+		</SASinstrument>
+		<SASprocess>
+			<name>spol</name>
+			<date>04-Sep-2007 18:35:02</date>
+			<term name="radialstep" unit="mm">10.000</term>
+			<term name="sector_width" unit="degree">180.0</term>
+			<term name="sector_orient" unit="degree">0.0</term>
+			<term name="MASK_file">USER:MASK.COM</term>
+			<SASprocessnote>
+				AvA1 0.0000E+00 AsA2 1.0000E+00 XvA3 1.0526E+03 XsA4
+				5.2200E-02 XfA5 0.0000E+00
+			</SASprocessnote>
+			<SASprocessnote>
+				S... 13597 0 2.26E+02 2A 5mM 0%D2O Sbak 13594 0 1.13E+02
+				H2O Buffer
+			</SASprocessnote>
+			<SASprocessnote>V... 13552 3 1.00E+00 H2O5m</SASprocessnote>
+		</SASprocess>
+		<SASprocess>
+			<name>NCNR-IGOR</name>
+			<date>03-SEP-2006 11:42:47</date>
+			<description />
+			<term name="average_type">Circular</term>
+			<term name="SAM_file">SEP06064.SA3_AJJ_L205</term>
+			<term name="BKD_file">SEP06064.SA3_AJJ_L205</term>
+			<term name="EMP_file">SEP06064.SA3_AJJ_L205</term>
+			<term name="DIV_file">SEP06064.SA3_AJJ_L205</term>
+			<term name="MASK_file">SEP06064.SA3_AJJ_L205</term>
+			<term name="ABS:TSTAND">1</term>
+			<term name="ABS:DSTAND" unit="mm">1</term>
+			<term name="ABS:IZERO">230.09</term>
+			<term name="ABS:XSECT" unit="mm">1</term>
+			<SASprocessnote/>
+		</SASprocess>
+		<SASnote />
+	</SASentry>
+</SASroot>
Index: DataLoader/test/cansas_test.xml
===================================================================
--- DataLoader/test/cansas_test.xml	(revision 8780e9a7e98f59c06b1819f1e068b7e84f496efc)
+++ DataLoader/test/cansas_test.xml	(revision 8780e9a7e98f59c06b1819f1e068b7e84f496efc)
@@ -0,0 +1,106 @@
+<?xml version="1.0"?>
+<?xml-stylesheet type="text/xsl" href="example.xsl" ?>
+<SASroot version="1.0"
+    xmlns="cansas1d/1.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="cansas1d/1.0 http://svn.smallangles.net/svn/canSAS/1dwg/trunk/cansas1d.xsd"
+    >
+	<SASentry>
+		<Title>ILL-D11 example1: 2A 5mM 0%D2O</Title>
+		<Run>g013586.001</Run>
+		<SASdata>
+			<Idata><Q unit="1/A">  0.000E+00 </Q><I unit="1/cm">  0.0000E+00 </I><Idev unit="1/cm">  0.000E+00 </Idev><Qdev unit="1/A">  0.00E+00 </Qdev></Idata>
+			<Idata><Q unit="1/A">  1.047E-03 </Q><I unit="1/cm">  0.0000E+00 </I><Idev unit="1/cm">  0.000E+00 </Idev><Qdev unit="1/A">  9.14E-04 </Qdev></Idata>
+			<Idata><Q unit="1/A">  2.094E-03 </Q><I unit="1/cm">  0.0000E+00 </I><Idev unit="1/cm">  0.000E+00 </Idev><Qdev unit="1/A">  9.32E-04 </Qdev></Idata>
+			<Idata><Q unit="1/A">  3.142E-03 </Q><I unit="1/cm">  0.0000E+00 </I><Idev unit="1/cm">  0.000E+00 </Idev><Qdev unit="1/A">  9.61E-04 </Qdev></Idata>
+			<Idata><Q unit="1/A">  4.189E-03 </Q><I unit="1/cm">  0.0000E+00 </I><Idev unit="1/cm">  0.000E+00 </Idev><Qdev unit="1/A">  1.00E-03 </Qdev></Idata>
+			<Idata><Q unit="1/A">  5.364E-03 </Q><I unit="1/cm">  5.4484E+00 </I><Idev unit="1/cm">  1.647E-01 </Idev><Qdev unit="1/A">  1.05E-03 </Qdev></Idata>
+			<Idata><Q unit="1/A">  6.255E-03 </Q><I unit="1/cm">  4.9963E+00 </I><Idev unit="1/cm">  9.122E-02 </Idev><Qdev unit="1/A">  1.10E-03 </Qdev></Idata>
+			<Idata><Q unit="1/A">  7.299E-03 </Q><I unit="1/cm">  4.6705E+00 </I><Idev unit="1/cm">  7.450E-02 </Idev><Qdev unit="1/A">  1.17E-03 </Qdev></Idata>
+			<Idata><Q unit="1/A">  8.340E-03 </Q><I unit="1/cm">  4.2690E+00 </I><Idev unit="1/cm">  5.745E-02 </Idev><Qdev unit="1/A">  1.23E-03 </Qdev></Idata>
+			<Idata><Q unit="1/A">  9.395E-03 </Q><I unit="1/cm">  4.0078E+00 </I><Idev unit="1/cm">  5.484E-02 </Idev><Qdev unit="1/A">  1.31E-03 </Qdev></Idata>
+			<Idata><Q unit="1/A">  1.045E-02 </Q><I unit="1/cm">  3.8409E+00 </I><Idev unit="1/cm">  4.939E-02 </Idev><Qdev unit="1/A">  1.38E-03 </Qdev></Idata>
+			<Idata><Q unit="1/A">  1.151E-02 </Q><I unit="1/cm">  3.6579E+00 </I><Idev unit="1/cm">  4.750E-02 </Idev><Qdev unit="1/A">  1.47E-03 </Qdev></Idata>
+			<Idata><Q unit="1/A">  1.258E-02 </Q><I unit="1/cm">  3.4413E+00 </I><Idev unit="1/cm">  4.344E-02 </Idev><Qdev unit="1/A">  1.55E-03 </Qdev></Idata>
+			<Idata><Q unit="1/A">  1.362E-02 </Q><I unit="1/cm">  3.2571E+00 </I><Idev unit="1/cm">  4.197E-02 </Idev><Qdev unit="1/A">  1.64E-03 </Qdev></Idata>
+			<Idata><Q unit="1/A">  1.465E-02 </Q><I unit="1/cm">  3.0475E+00 </I><Idev unit="1/cm">  4.016E-02 </Idev><Qdev unit="1/A">  1.72E-03 </Qdev></Idata>
+			<Idata><Q unit="1/A">  1.570E-02 </Q><I unit="1/cm">  2.9447E+00 </I><Idev unit="1/cm">  3.703E-02 </Idev><Qdev unit="1/A">  1.81E-03 </Qdev></Idata>
+			<Idata><Q unit="1/A">  1.674E-02 </Q><I unit="1/cm">  2.8542E+00 </I><Idev unit="1/cm">  3.706E-02 </Idev><Qdev unit="1/A">  1.90E-03 </Qdev></Idata>
+			<Idata><Q unit="1/A">  1.779E-02 </Q><I unit="1/cm">  2.6221E+00 </I><Idev unit="1/cm">  3.293E-02 </Idev><Qdev unit="1/A">  2.00E-03 </Qdev></Idata>
+			<Idata><Q unit="1/A">  1.886E-02 </Q><I unit="1/cm">  2.5466E+00 </I><Idev unit="1/cm">  3.318E-02 </Idev><Qdev unit="1/A">  2.09E-03 </Qdev></Idata>
+			<Idata><Q unit="1/A">  1.989E-02 </Q><I unit="1/cm">  2.4346E+00 </I><Idev unit="1/cm">  3.203E-02 </Idev><Qdev unit="1/A">  2.19E-03 </Qdev></Idata>
+			<Idata><Q unit="1/A">  2.093E-02 </Q><I unit="1/cm">  2.2702E+00 </I><Idev unit="1/cm">  3.034E-02 </Idev><Qdev unit="1/A">  2.28E-03 </Qdev></Idata>
+			<Idata><Q unit="1/A">  2.198E-02 </Q><I unit="1/cm">  2.2182E+00 </I><Idev unit="1/cm">  3.011E-02 </Idev><Qdev unit="1/A">  2.38E-03 </Qdev></Idata>
+			<Idata><Q unit="1/A">  2.303E-02 </Q><I unit="1/cm">  2.0914E+00 </I><Idev unit="1/cm">  2.798E-02 </Idev><Qdev unit="1/A">  2.48E-03 </Qdev></Idata>
+			<Idata><Q unit="1/A">  2.408E-02 </Q><I unit="1/cm">  2.0097E+00 </I><Idev unit="1/cm">  2.795E-02 </Idev><Qdev unit="1/A">  2.57E-03 </Qdev></Idata>
+			<Idata><Q unit="1/A">  2.511E-02 </Q><I unit="1/cm">  1.9056E+00 </I><Idev unit="1/cm">  2.684E-02 </Idev><Qdev unit="1/A">  2.67E-03 </Qdev></Idata>
+			<Idata><Q unit="1/A">  2.617E-02 </Q><I unit="1/cm">  1.8275E+00 </I><Idev unit="1/cm">  2.559E-02 </Idev><Qdev unit="1/A">  2.77E-03 </Qdev></Idata>
+			<Idata><Q unit="1/A">  2.724E-02 </Q><I unit="1/cm">  1.7406E+00 </I><Idev unit="1/cm">  2.508E-02 </Idev><Qdev unit="1/A">  2.87E-03 </Qdev></Idata>
+			<Idata><Q unit="1/A">  2.828E-02 </Q><I unit="1/cm">  1.6591E+00 </I><Idev unit="1/cm">  2.441E-02 </Idev><Qdev unit="1/A">  2.97E-03 </Qdev></Idata>
+			<Idata><Q unit="1/A">  2.932E-02 </Q><I unit="1/cm">  1.5903E+00 </I><Idev unit="1/cm">  2.451E-02 </Idev><Qdev unit="1/A">  3.07E-03 </Qdev></Idata>
+			<Idata><Q unit="1/A">  3.035E-02 </Q><I unit="1/cm">  1.4810E+00 </I><Idev unit="1/cm">  2.289E-02 </Idev><Qdev unit="1/A">  3.17E-03 </Qdev></Idata>
+			<Idata><Q unit="1/A">  3.140E-02 </Q><I unit="1/cm">  1.4093E+00 </I><Idev unit="1/cm">  2.279E-02 </Idev><Qdev unit="1/A">  3.27E-03 </Qdev></Idata>
+			<Idata><Q unit="1/A">  3.242E-02 </Q><I unit="1/cm">  1.3394E+00 </I><Idev unit="1/cm">  2.281E-02 </Idev><Qdev unit="1/A">  3.37E-03 </Qdev></Idata>
+			<Idata><Q unit="1/A">  3.349E-02 </Q><I unit="1/cm">  1.2679E+00 </I><Idev unit="1/cm">  2.555E-02 </Idev><Qdev unit="1/A">  3.47E-03 </Qdev></Idata>
+			<Idata><Q unit="1/A">  3.454E-02 </Q><I unit="1/cm">  1.2336E+00 </I><Idev unit="1/cm">  2.911E-02 </Idev><Qdev unit="1/A">  3.57E-03 </Qdev></Idata>
+			<Idata><Q unit="1/A">  3.560E-02 </Q><I unit="1/cm">  1.1766E+00 </I><Idev unit="1/cm">  2.880E-02 </Idev><Qdev unit="1/A">  3.67E-03 </Qdev></Idata>
+			<Idata><Q unit="1/A">  3.666E-02 </Q><I unit="1/cm">  1.0849E+00 </I><Idev unit="1/cm">  3.269E-02 </Idev><Qdev unit="1/A">  3.78E-03 </Qdev></Idata>
+			<Idata><Q unit="1/A">  3.750E-02 </Q><I unit="1/cm">  1.0130E+00 </I><Idev unit="1/cm">  5.246E-02 </Idev><Qdev unit="1/A">  3.86E-03 </Qdev></Idata>
+		</SASdata>
+		<SASsample>
+			<thickness unit="mm">0.0000</thickness>
+			<transmission>0.0000</transmission>
+			<temperature unit="C">32.0000</temperature>
+			<position>
+				<x unit="mm">10.00</x>
+				<y unit="mm">0.00</y>
+			</position>
+			<orientation>
+				<roll unit="degree">0.020<!-- was: sample_offset_angle_deg --></roll>
+			</orientation>
+		</SASsample>
+		<SASinstrument name="D11">
+			<SASsource>
+				<radiation>neutron</radiation>
+				<beam_size>
+					<x unit="mm">30.00</x>
+					<y unit="mm">0.00</y>
+				</beam_size>
+				<wavelength unit="A">6.00</wavelength>
+				<wavelength_spread unit="A">0.00</wavelength_spread>
+			</SASsource>
+			<SAScollimation>
+				<distance unit="m">10.000</distance>
+			</SAScollimation>
+			<SASdetector>
+				<name />
+				<SDD unit="m">10.000</SDD>
+				<orientation>
+					<roll unit="degree">0.00<!-- was: offset_angle_deg --></roll>
+				</orientation>
+				<beam_center>
+					<x unit="mm">311.00</x>
+					<y unit="mm">315.00</y>
+				</beam_center>
+				<pixel_size>
+					<x unit="mm">10.00</x>
+					<y unit="mm">10.00</y>
+				</pixel_size>
+			</SASdetector>
+		</SASinstrument>
+		<SASprocess name="spol" >
+			<name>spol</name>
+			<date>04-Sep-2007 18:12:27</date>
+			<term name="radialstep" unit="mm">10.000</term>
+			<term name="sector_width" unit="deg">180.0</term>
+			<term name="sector_orient" unit="deg">0.0</term>
+			<term name="Flux_monitor">1.00</term>
+			<term name="Count_time" unit="s">900.000</term>
+			<term name="Q_resolution">estimated</term>
+			<SASprocessnote name="01">  AvA1 0.0000E+00 AsA2 1.0000E+00 XvA3 1.1111E+01 XsA4 5.2200E-02 XfA5 0.0000E+00 </SASprocessnote>
+			<SASprocessnote name="02"> S... 13586  0  5.63E+01 2A 5mM 0%D2O    Sbak 13567  0  1.88E+01 H2O buffer       </SASprocessnote>
+			<SASprocessnote name="03"> Sbak 13533  0  7.49E+00 H2O buffer      V... 13552  1  1.00E+00 Normal 10m from  </SASprocessnote>
+			<SASprocessnote name="04" />
+</SASprocess>
+	</SASentry>
+</SASroot>
