Index: test/sasdataloader/test/avg_testdata.txt
===================================================================
--- test/sasdataloader/test/avg_testdata.txt	(revision 8c9ffde290eafed946f800881bf4901b48445d4c)
+++ 	(revision )
@@ -1,21 +1,0 @@
-0.00019987186878 -0.01196215 0.148605728355
-0.000453772721237 0.02091606 0.0680283029334
-0.000750492390439 -0.01337855 0.0444902910757
-0.00103996394336 0.03062 0.0580312894528
-0.0013420198959 0.0811008333333 0.0540469289108
-0.001652061869 0.167022288372 0.0651891320031
-0.00196086470492 27.5554711176 0.735053300957
-0.00226262401224 105.031578947 1.35744586624
-0.00256734439716 82.1791776119 1.10749938588
-0.0028637128388 54.714657971 0.890486416264
-0.00315257408712 36.8455584416 0.691746880003
-0.00344644126616 24.8938701149 0.534917225468
-0.00374248202229 16.5905619565 0.424655384023
-0.00404393067437 11.4714217925 0.328969543128
-0.004346317814 8.05405805556 0.273083524998
-0.00465162170627 5.5823291129 0.21217630209
-0.00495449803049 4.2574845082 0.186808495528
-0.00525641407066 3.30448963768 0.154743584955
-0.00555735057365 2.6995389781 0.140373302568
-0.00585577429002 2.03298512 0.116418358232
-
Index: test/sasdataloader/test/ring_testdata.txt
===================================================================
--- test/sasdataloader/test/ring_testdata.txt	(revision 400155bab01bdb35b3cf83069f57cf9f47005bca)
+++ 	(revision )
@@ -1,21 +1,0 @@
-<X>   <Y>   <dY>
-0.0 0.974491286452 0.0803843574327
-0.314159265359 0.9046853025 0.0768971192264
-0.628318530718 0.964040908176 0.0790933208542
-0.942477796077 0.922142905769 0.0781616076625
-1.25663706144 1.02710537736 0.080875897538
-1.57079632679 1.01448978075 0.0808313893873
-1.88495559215 1.04677136013 0.0828850195035
-2.19911485751 1.00067189877 0.0790510747578
-2.51327412287 1.06280533013 0.0830643956456
-2.82743338823 1.04313751703 0.0824585190353
-3.14159265359 0.993559460696 0.0803376331443
-3.45575191895 0.998101030127 0.0813124293449
-3.76991118431 1.04589910764 0.0821364674302
-4.08407044967 0.997201556522 0.0797466854806
-4.39822971503 1.07289797405 0.0830165798358
-4.71238898038 1.01212391625 0.0803021745794
-5.02654824574 0.995907123899 0.0804649435453
-5.3407075111 0.991431571613 0.0803765721376
-5.65486677646 0.959020086792 0.0787114622667
-5.96902604182 0.945705788519 0.0767669312314
Index: test/sasdataloader/test/sectorphi_testdata.txt
===================================================================
--- test/sasdataloader/test/sectorphi_testdata.txt	(revision 8c9ffde290eafed946f800881bf4901b48445d4c)
+++ 	(revision )
@@ -1,20 +1,0 @@
-0.0392699081699 1.1493915878 0.168324806231
-0.11780972451 0.782646832432 0.149121962919
-0.196349540849 0.706119607692 0.144012178287
-0.274889357189 0.911901097436 0.15555152836
-0.353429173529 0.974902392683 0.155253089415
-0.431968989869 1.01648397073 0.159026866657
-0.510508806208 1.00543825 0.162897198136
-0.589048622548 0.939649968421 0.160198723543
-0.667588438888 0.9170403625 0.154535441526
-0.746128255228 0.992733432558 0.155251042188
-0.824668071567 0.896487721622 0.158978849014
-0.903207887907 1.0337120475 0.161651279959
-0.981747704247 0.893411561538 0.151685984204
-1.06028752059 0.86231787 0.152618707077
-1.13882733693 1.0607364925 0.164276150316
-1.21736715327 1.0684421475 0.163649496829
-1.29590696961 1.09330437436 0.167871645263
-1.37444678595 0.88759347 0.150974201439
-1.45298660229 1.1352002 0.172191803977
-1.53152641863 0.940182580556 0.16499913089
Index: test/sasdataloader/test/sectorq_testdata.txt
===================================================================
--- test/sasdataloader/test/sectorq_testdata.txt	(revision 8c9ffde290eafed946f800881bf4901b48445d4c)
+++ 	(revision )
@@ -1,20 +1,0 @@
-0.00511441071783 3.62996057692 0.26421001906
-0.00536794842067 3.08426333333 0.226725360048
-0.00563163488481 2.60796274194 0.205094893141
-0.00588490295032 1.9348162623 0.178096320518
-0.00613345857943 1.7733072 0.16517157513
-0.00638164232075 1.47127022727 0.149304966898
-0.00662784449302 1.20943352174 0.132393436598
-0.00687996935062 1.09260586133 0.121129481208
-0.00713177859748 0.920554827027 0.112093900426
-0.0073754295467 0.722179797333 0.0994122997085
-0.00762120465356 0.806428308642 0.101199828878
-0.00787397172531 0.643935 0.0888805845221
-0.00811861136113 0.545498639506 0.0844090307303
-0.008367621478 0.540828518804 0.0775790478399
-0.00862439560875 0.506315036957 0.0759458433673
-0.00887906032589 0.435769230208 0.0692137718457
-0.00913119845523 0.405669568421 0.0705339106673
-0.00938052380065 0.331241946 0.061307573431
-0.00962825731078 0.237315993939 0.0578654769893
-0.00987552050718 0.296916590385 0.0592796733987
Index: test/sasdataloader/test/slabx_testdata.txt
===================================================================
--- test/sasdataloader/test/slabx_testdata.txt	(revision 8c9ffde290eafed946f800881bf4901b48445d4c)
+++ 	(revision )
@@ -1,50 +1,0 @@
--0.00975856539676 0.5172445 0.508549161832
--0.00934923500682 0.237763 0.243804737444
--0.00893990399468 0.12955415 0.254513408291
--0.0086670162536 0.9157545 0.676666276683
--0.00825768406971 0.65937975 0.406011006624
--0.00784835133627 0.8750275 0.661448221707
--0.00743901794994 1.02208225 0.519554195922
--0.00702968406854 1.079005 0.734508338959
--0.00662034960235 1.2496225 0.558932576435
--0.00621101469558 2.006035 1.00150761355
--0.00580167927212 2.4278325 0.779075172881
--0.00539234346255 3.455125 1.31436771871
--0.00498300720441 4.0214125 1.00267299006
--0.00457367061464 4.505215 1.500868915
--0.0041643336444 9.1015275 1.50843689792
--0.00375499639702 12.9323 2.54286256019
--0.00334565883727 24.9572 2.4978590833
--0.00293632105486 40.0841 4.47683481938
--0.00266342906662 60.4813 5.49914993431
--0.00225409091154 76.368475 4.36945291198
--0.00184475260646 2.40154 1.09579651396
--0.00143541414791 0.065281 0.198049867458
--0.00102607559383 -0.04767235 0.154389685536
--0.000616736954402 -0.0090503 0.0960105462957
--0.000207398273925 0.03109325 0.246629023029
-0.000201940423805 -0.027508775 0.082928847514
-0.000611279108096 0.03251315 0.246951260373
-0.00102061774154 -0.00987975 0.144233534589
-0.00142995630705 0.075937 0.19485507435
-0.00183929475361 10.60918375 1.62858709853
-0.00224863307777 106.2485 7.2886384188
-0.00265797121486 69.731775 4.17527768538
-0.00306730917507 37.64245 4.33834357791
-0.00334020101548 29.14025 3.81708331059
-0.00374953854926 16.858125 2.05293235398
-0.00415887583351 7.860455 1.98248013861
-0.00456821277179 4.8616775 1.1024606002
-0.00497754940605 4.619795 1.51983469496
-0.00538688562624 3.1591075 0.888693915249
-0.00579622148792 1.72058 0.927518193892
-0.00620555686743 1.913115 0.69157700222
-0.00661489183396 1.08108 0.735214254486
-0.0070242262502 1.0834955 0.520455449582
-0.00743356019898 0.4708995 0.485231645712
-0.00784289352938 0.774794 0.440111917585
-0.00825222633782 0.7830585 0.625722981838
-0.00866155845978 0.44196625 0.37397468163
-0.0090708900053 0.1305591 0.306123259489
-0.0093437773029 0.1961264 0.341325065004
-0.00975310762291 0.25845 0.280772594817
Index: test/sasdataloader/test/slaby_testdata.txt
===================================================================
--- test/sasdataloader/test/slaby_testdata.txt	(revision 8c9ffde290eafed946f800881bf4901b48445d4c)
+++ 	(revision )
@@ -1,50 +1,0 @@
--0.00981587154747 0.197046827778 0.0872226309261
--0.00940654133769 0.2466434 0.124972263589
--0.0089972103454 0.218745969444 0.0838510368061
--0.00858787875434 0.126093522222 0.107482002513
--0.00817854644886 0.310427366667 0.100945289852
--0.0077692135991 0.0843802722222 0.103942898914
--0.00735988010303 0.246036369444 0.0916479235889
--0.00695054611716 0.217840922222 0.128330031223
--0.00654121155308 0.379668444444 0.103424340152
--0.00613187655368 0.447654644444 0.166575873418
--0.00585898627901 0.419026583333 0.15428551475
--0.00544965048161 0.401599005556 0.107234964701
--0.00504031432153 0.552085055556 0.178458012837
--0.00463097774216 0.623354058333 0.134112874252
--0.0042216408546 0.653190877778 0.199963470429
--0.00381230361585 0.661400280556 0.136616295765
--0.00340296612338 0.714432968889 0.206518400818
--0.00299362834783 0.653196219444 0.137770239209
--0.00258429037305 0.823240055556 0.215465509543
--0.00217495218329 0.9738398 0.165854141631
--0.00176561384878 0.827869716667 0.217884056409
--0.00135627536739 1.01947547778 0.169285496487
--0.000946936795747 1.1655315 0.256453669437
--0.000537598145326 1.06619988306 0.174316381271
--0.000128259459128 1.03232983333 0.243681074459
-0.000144633007054 1.15035461111 0.254186641595
-0.000553971692162 1.14101948333 0.179426295522
-0.000963310340403 1.07222452222 0.244970006982
-0.00137264890851 1.16437213056 0.185866492018
-0.00178198738526 0.852203596111 0.219166988663
-0.00219132571378 0.901962183333 0.160186399428
-0.00260066389646 0.9240665 0.230158379447
-0.00301000186279 0.617907672222 0.137762238147
-0.00341933962881 0.650284455556 0.191734208711
-0.00382867711038 0.578899836111 0.127147693175
-0.00423801433715 0.507045738889 0.172630602733
-0.00464735121136 0.613949591667 0.131836392307
-0.00505668777629 0.593631783333 0.181602707905
-0.00532957859826 0.310741433333 0.143429472495
-0.00573891447198 0.422394166667 0.111503089837
-0.00614824996377 0.342731566667 0.148392724273
-0.0065575849441 0.286779447222 0.0946855610872
-0.00696691948801 0.223022966667 0.134800066857
-0.00737625345237 0.220648719444 0.0901314425104
-0.00778558692582 0.210920222222 0.13171959555
-0.00819491975161 0.206120872222 0.0877029867729
-0.00860425203202 0.26088625 0.127667879068
-0.00901358359666 0.156064891667 0.0817093355086
-0.00942291456144 0.177010094444 0.134301097823
-0.00983224474235 0.130891508333 0.0796420846741
Index: test/sasdataloader/test/test_data/avg_testdata.txt
===================================================================
--- test/sasdataloader/test/test_data/avg_testdata.txt	(revision 7fd5e2abcc660d7481c92bbd68091179ecb0c4a8)
+++ test/sasdataloader/test/test_data/avg_testdata.txt	(revision 7fd5e2abcc660d7481c92bbd68091179ecb0c4a8)
@@ -0,0 +1,21 @@
+0.00019987186878 -0.01196215 0.148605728355
+0.000453772721237 0.02091606 0.23372601
+0.000750492390439 -0.01337855 0.17169562
+0.00103996394336 0.03062 0.13136407
+0.0013420198959 0.0811008333333 0.10681163
+0.001652061869 0.167022288372 0.10098903
+0.00196086470492 27.5554711176 0.7350533
+0.00226262401224 105.031578947 1.35744586624
+0.00256734439716 82.1791776119 1.10749938588
+0.0028637128388 54.714657971 0.890486416264
+0.00315257408712 36.8455584416 0.691746880003
+0.00344644126616 24.8938701149 0.534917225468
+0.00374248202229 16.5905619565 0.424655384023
+0.00404393067437 11.4714217925 0.328969543128
+0.004346317814 8.05405805556 0.273083524998
+0.00465162170627 5.5823291129 0.21217630209
+0.00495449803049 4.2574845082 0.186808495528
+0.00525641407066 3.30448963768 0.154743584955
+0.00555735057365 2.6995389781 0.140373302568
+0.00585577429002 2.03298512 0.116418358232
+
Index: test/sasdataloader/test/test_data/ring_testdata.txt
===================================================================
--- test/sasdataloader/test/test_data/ring_testdata.txt	(revision 7fd5e2abcc660d7481c92bbd68091179ecb0c4a8)
+++ test/sasdataloader/test/test_data/ring_testdata.txt	(revision 7fd5e2abcc660d7481c92bbd68091179ecb0c4a8)
@@ -0,0 +1,21 @@
+<X>   <Y>   <dY>
+0.0 0.974491286452 0.0803843574327
+0.314159265359 0.9046853025 0.0768971192264
+0.628318530718 0.964040908176 0.0790933208542
+0.942477796077 0.922142905769 0.0781616076625
+1.25663706144 1.02710537736 0.08136351514804
+1.57079632679 1.01448978075 0.0808313893873
+1.88495559215 1.04677136013 0.0828850195035
+2.19911485751 1.00067189877 0.0790510747578
+2.51327412287 1.06280533013 0.0830643956456
+2.82743338823 1.04313751703 0.0824585190353
+3.14159265359 0.993559460696 0.0803376331443
+3.45575191895 0.998101030127 0.0813124293449
+3.76991118431 1.04589910764 0.0821364674302
+4.08407044967 0.997201556522 0.0797466854806
+4.39822971503 1.07289797405 0.0830165798358
+4.71238898038 1.01212391625 0.0803021745794
+5.02654824574 0.995907123899 0.0804649435453
+5.3407075111 0.991431571613 0.0803765721376
+5.65486677646 0.959020086792 0.0787114622667
+5.96902604182 0.945705788519 0.0767669312314
Index: test/sasdataloader/test/test_data/sectorphi_testdata.txt
===================================================================
--- test/sasdataloader/test/test_data/sectorphi_testdata.txt	(revision 7fd5e2abcc660d7481c92bbd68091179ecb0c4a8)
+++ test/sasdataloader/test/test_data/sectorphi_testdata.txt	(revision 7fd5e2abcc660d7481c92bbd68091179ecb0c4a8)
@@ -0,0 +1,20 @@
+0.0392699081699 1.1493915878 0.168324806231
+0.11780972451 0.782646832432 0.149121962919
+0.196349540849 0.706119607692 0.144012178287
+0.274889357189 0.911901097436 0.15555152836
+0.353429173529 0.974902392683 0.155253089415
+0.431968989869 1.01648397073 0.159026866657
+0.510508806208 1.00543825 0.162897198136
+0.589048622548 0.939649968421 0.160198723543
+0.667588438888 0.9170403625 0.154535441526
+0.746128255228 0.992733432558 0.155251042188
+0.824668071567 0.896487721622 0.158978849014
+0.903207887907 1.0337120475 0.161651279959
+0.981747704247 0.893411561538 0.151685984204
+1.06028752059 0.86231787 0.152618707077
+1.13882733693 1.0607364925 0.166167546658
+1.21736715327 1.0684421475 0.163649496829
+1.29590696961 1.09330437436 0.16981858402
+1.37444678595 0.88759347 0.150974201439
+1.45298660229 1.1352002 0.172191803977
+1.53152641863 0.940182580556 0.16499913089
Index: test/sasdataloader/test/test_data/sectorq_testdata.txt
===================================================================
--- test/sasdataloader/test/test_data/sectorq_testdata.txt	(revision 7fd5e2abcc660d7481c92bbd68091179ecb0c4a8)
+++ test/sasdataloader/test/test_data/sectorq_testdata.txt	(revision 7fd5e2abcc660d7481c92bbd68091179ecb0c4a8)
@@ -0,0 +1,20 @@
+0.00511441071783 3.62996057692 0.26421001906
+0.00536794842067 3.08426333333 0.226725360048
+0.00563163488481 2.60796274194 0.205094893141
+0.00588490295032 1.9348162623 0.178096320518
+0.00613345857943 1.7733072 0.16517157513
+0.00638164232075 1.47127022727 0.149304966898
+0.00662784449302 1.20943352174 0.132393436598
+0.00687996935062 1.09260586133 0.121129481208
+0.00713177859748 0.920554827027 0.112093900426
+0.0073754295467 0.722179797333 0.0994122997085
+0.00762120465356 0.806428308642 0.101199828878
+0.00787397172531 0.643935 0.0888805845221
+0.00811861136113 0.545498639506 0.0844090307303
+0.008367621478 0.540828518804 0.0775790478399
+0.00862439560875 0.506315036957 0.0759458433673
+0.00887906032589 0.435769230208 0.0692137718457
+0.00913119845523 0.405669568421 0.0705339106673
+0.00938052380065 0.331241946 0.061307573431
+0.00962825731078 0.237315993939 0.059602636160850493
+0.00987552050718 0.296916590385 0.0592796733987
Index: test/sasdataloader/test/test_data/slabx_testdata.txt
===================================================================
--- test/sasdataloader/test/test_data/slabx_testdata.txt	(revision 7fd5e2abcc660d7481c92bbd68091179ecb0c4a8)
+++ test/sasdataloader/test/test_data/slabx_testdata.txt	(revision 7fd5e2abcc660d7481c92bbd68091179ecb0c4a8)
@@ -0,0 +1,50 @@
+-0.00975856539676 0.5172445 0.508549161832
+-0.00934923500682 0.237763 0.243804737444
+-0.00893990399468 0.12955415 0.254513408291
+-0.0086670162536 0.9157545 0.676666276683
+-0.00825768406971 0.65937975 0.406011006624
+-0.00784835133627 0.8750275 0.661448221707
+-0.00743901794994 1.02208225 0.519554195922
+-0.00702968406854 1.079005 0.734508338959
+-0.00662034960235 1.2496225 0.558932576435
+-0.00621101469558 2.006035 1.00150761355
+-0.00580167927212 2.4278325 0.779075172881
+-0.00539234346255 3.455125 1.31436771871
+-0.00498300720441 4.0214125 1.00267299006
+-0.00457367061464 4.505215 1.500868915
+-0.0041643336444 9.1015275 1.50843689792
+-0.00375499639702 12.9323 2.54286256019
+-0.00334565883727 24.9572 2.4978590833
+-0.00293632105486 40.0841 4.47683481938
+-0.00266342906662 60.4813 5.49914993431
+-0.00225409091154 76.368475 4.36945291198
+-0.00184475260646 2.40154 1.09579651396
+-0.00143541414791 0.065281 0.198049867458
+-0.00102607559383 -0.04767235 0.52329358394690839
+-0.000616736954402 -0.0090503 0.36635778277525377
+-0.000207398273925 0.03109325 0.246629023029
+0.000201940423805 -0.027508775 0.36314899662535211
+0.000611279108096 0.03251315 0.246951260373
+0.00102061774154 -0.00987975 0.38184199939241886
+0.00142995630705 0.075937 0.53662696540520582
+0.00183929475361 10.60918375 1.62858709853
+0.00224863307777 106.2485 7.2886384188
+0.00265797121486 69.731775 4.17527768538
+0.00306730917507 37.64245 4.33834357791
+0.00334020101548 29.14025 3.81708331059
+0.00374953854926 16.858125 2.05293235398
+0.00415887583351 7.860455 1.98248013861
+0.00456821277179 4.8616775 1.1024606002
+0.00497754940605 4.619795 1.51983469496
+0.00538688562624 3.1591075 0.888693915249
+0.00579622148792 1.72058 0.927518193892
+0.00620555686743 1.913115 0.69157700222
+0.00661489183396 1.08108 0.735214254486
+0.0070242262502 1.0834955 0.520455449582
+0.00743356019898 0.4708995 0.485231645712
+0.00784289352938 0.774794 0.440111917585
+0.00825222633782 0.7830585 0.625722981838
+0.00866155845978 0.44196625 0.37397468163
+0.0090708900053 0.1305591 0.306123259489
+0.0093437773029 0.1961264 0.341325065004
+0.00975310762291 0.25845 0.280772594817
Index: test/sasdataloader/test/test_data/slaby_testdata.txt
===================================================================
--- test/sasdataloader/test/test_data/slaby_testdata.txt	(revision 7fd5e2abcc660d7481c92bbd68091179ecb0c4a8)
+++ test/sasdataloader/test/test_data/slaby_testdata.txt	(revision 7fd5e2abcc660d7481c92bbd68091179ecb0c4a8)
@@ -0,0 +1,50 @@
+-0.00981587154747 0.197046827778 0.09153902
+-0.00940654133769 0.2466434 0.124972263589
+-0.0089972103454 0.218745969444 0.0838510368061
+-0.00858787875434 0.126093522222 0.107482002513
+-0.00817854644886 0.310427366667 0.10469745
+-0.0077692135991 0.0843802722222 0.103942898914
+-0.00735988010303 0.246036369444 0.0916479235889
+-0.00695054611716 0.217840922222 0.128330031223
+-0.00654121155308 0.379668444444 0.103424340152
+-0.00613187655368 0.447654644444 0.166575873418
+-0.00585898627901 0.419026583333 0.15428551475
+-0.00544965048161 0.401599005556 0.107234964701
+-0.00504031432153 0.552085055556 0.178458012837
+-0.00463097774216 0.623354058333 0.134112874252
+-0.0042216408546 0.653190877778 0.199963470429
+-0.00381230361585 0.661400280556 0.136616295765
+-0.00340296612338 0.714432968889 0.206518400818
+-0.00299362834783 0.653196219444 0.137770239209
+-0.00258429037305 0.823240055556 0.215465509543
+-0.00217495218329 0.9738398 0.165854141631
+-0.00176561384878 0.827869716667 0.217884056409
+-0.00135627536739 1.01947547778 0.169285496487
+-0.000946936795747 1.1655315 0.256453669437
+-0.000537598145326 1.06619988306 0.174316381271
+-0.000128259459128 1.03232983333 0.243681074459
+0.000144633007054 1.15035461111 0.254186641595
+0.000553971692162 1.14101948333 0.179426295522
+0.000963310340403 1.07222452222 0.244970006982
+0.00137264890851 1.16437213056 0.185866492018
+0.00178198738526 0.852203596111 0.219166988663
+0.00219132571378 0.901962183333 0.160186399428
+0.00260066389646 0.9240665 0.230158379447
+0.00301000186279 0.617907672222 0.137762238147
+0.00341933962881 0.650284455556 0.191734208711
+0.00382867711038 0.578899836111 0.127147693175
+0.00423801433715 0.507045738889 0.172630602733
+0.00464735121136 0.613949591667 0.131836392307
+0.00505668777629 0.593631783333 0.181602707905
+0.00532957859826 0.310741433333 0.143429472495
+0.00573891447198 0.422394166667 0.111503089837
+0.00614824996377 0.342731566667 0.148392724273
+0.0065575849441 0.286779447222 0.0946855610872
+0.00696691948801 0.223022966667 0.134800066857
+0.00737625345237 0.220648719444 0.0901314425104
+0.00778558692582 0.210920222222 0.13171959555
+0.00819491975161 0.206120872222 0.0877029867729
+0.00860425203202 0.26088625 0.127667879068
+0.00901358359666 0.156064891667 0.0817093355086
+0.00942291456144 0.177010094444 0.134301097823
+0.00983224474235 0.130891508333 0.0796420846741
Index: test/sasdataloader/test/utest_abs_reader.py
===================================================================
--- test/sasdataloader/test/utest_abs_reader.py	(revision bd5c3b11a604dfd75fa3d6424e1ea40bcafd3727)
+++ test/sasdataloader/test/utest_abs_reader.py	(revision bd5c3b11a604dfd75fa3d6424e1ea40bcafd3727)
@@ -118,5 +118,5 @@
         self.assertEqual(self.data.detector[0].beam_center.y, center_y)
 
-        self.assertEqual(self.data.I_unit, '1/cm')
+        self.assertEqual(self.data.I_unit, 'cm^{-1}')
         self.assertEqual(self.data.data[0], 1.57831)
         self.assertEqual(self.data.data[1], 2.70983)
Index: test/sasdataloader/test/utest_averaging.py
===================================================================
--- test/sasdataloader/test/utest_averaging.py	(revision f53d684ed4a54de3601e5f4bc601f78376d98e83)
+++ test/sasdataloader/test/utest_averaging.py	(revision 7fd5e2abcc660d7481c92bbd68091179ecb0c4a8)
@@ -106,5 +106,5 @@
 
     def setUp(self):
-        filepath = find('MAR07232_rest.h5')
+        filepath = find('test_data//MAR07232_rest.h5')
         self.data_list = Loader().load(filepath)
         self.data = self.data_list[0]
@@ -121,5 +121,5 @@
 
         o = r(self.data)
-        filepath = find('ring_testdata.txt')
+        filepath = find('test_data//ring_testdata.txt')
         answer_list = Loader().load(filepath)
         answer = answer_list[0]
@@ -142,5 +142,5 @@
         o = r(self.data)
 
-        filepath = find('avg_testdata.txt')
+        filepath = find('test_data//avg_testdata.txt')
         answer = Loader().load(filepath)[0]
         for i in range(r.nbins_phi):
@@ -158,5 +158,5 @@
         s, ds, npoints = r(self.data)
         self.assertAlmostEqual(s, 34.278990899999997, 4)
-        self.assertAlmostEqual(ds, 7.8007981835194293, 4)
+        self.assertAlmostEqual(ds, 8.237259999538685, 4)
         self.assertAlmostEqual(npoints, 324.0000, 4)
 
@@ -164,5 +164,5 @@
         s, ds = r(self.data)
         self.assertAlmostEqual(s, 0.10579935462962962, 4)
-        self.assertAlmostEqual(ds, 0.024076537603455028, 4)
+        self.assertAlmostEqual(ds, 0.02542364197388483, 4)
 
     def test_slabX(self):
@@ -177,5 +177,5 @@
         o = r(self.data)
 
-        filepath = find('slabx_testdata.txt')
+        filepath = find('test_data//slabx_testdata.txt')
         answer = Loader().load(filepath)[0]
         for i in range(len(o.x)):
@@ -195,5 +195,5 @@
         o = r(self.data)
 
-        filepath = find('slaby_testdata.txt')
+        filepath = find('test_data//slaby_testdata.txt')
         answer = Loader().load(filepath)[0]
         for i in range(len(o.x)):
@@ -221,5 +221,5 @@
         o = r(self.data)
 
-        filepath = find('ring_testdata.txt')
+        filepath = find('test_data//ring_testdata.txt')
         answer = Loader().load(filepath)[0]
         for i in range(len(o.x)):
@@ -238,5 +238,5 @@
         o = r(self.data)
 
-        filepath = find('sectorphi_testdata.txt')
+        filepath = find('test_data//sectorphi_testdata.txt')
         answer = Loader().load(filepath)[0]
         for i in range(len(o.x)):
@@ -255,5 +255,5 @@
         o = r(self.data)
 
-        filepath = find('sectorq_testdata.txt')
+        filepath = find('test_data//sectorq_testdata.txt')
         answer = Loader().load(filepath)[0]
         for i in range(len(o.x)):
Index: test/sasdataloader/test/utest_cansas.py
===================================================================
--- test/sasdataloader/test/utest_cansas.py	(revision f53d684ed4a54de3601e5f4bc601f78376d98e83)
+++ test/sasdataloader/test/utest_cansas.py	(revision 7fd5e2abcc660d7481c92bbd68091179ecb0c4a8)
@@ -91,8 +91,5 @@
         reader = XMLreader(self.xml_valid, self.schema_1_0)
         valid = reader.validate_xml()
-        if valid:
-            self.assertTrue(valid)
-        else:
-            self.assertFalse(valid)
+        self.assertTrue(valid)
 
     def _check_data(self, data):
@@ -193,6 +190,5 @@
     def test_save_cansas_v1_0(self):
         xmlreader = XMLreader(self.isis_1_0, self.schema_1_0)
-        valid = xmlreader.validate_xml()
-        self.assertTrue(valid)
+        self.assertTrue(xmlreader.validate_xml())
         reader_generic = Loader()
         dataloader = reader_generic.load(self.isis_1_0)
@@ -207,7 +203,6 @@
             return_data = reader2.read(self.write_1_0_filename)
             written_data = return_data[0]
-            XMLreader(self.write_1_0_filename, self.schema_1_0)
-            valid = xmlreader.validate_xml()
-            self.assertTrue(valid)
+            xmlreader = XMLreader(self.write_1_0_filename, self.schema_1_0)
+            self.assertTrue(xmlreader.validate_xml())
             self._check_data(written_data)
         if os.path.isfile(self.write_1_0_filename):
@@ -260,7 +255,10 @@
         self.loader = Loader()
         self.datafile_basic = find("simpleexamplefile.h5")
-        self.datafile_multiplesasentry = find("cansas_1Dand2D_samedatafile.h5")
-        self.datafile_multiplesasdata = find("cansas_1Dand2D_samesasentry.h5")
-        self.datafile_multiplesasdata_multiplesasentry = find("cansas_1Dand2D_multiplesasentry_multiplesasdata.h5")
+        self.datafile_multiplesasentry = find(
+            "test_data//nxcansas_1Dand2D_multisasdata.h5")
+        self.datafile_multiplesasdata = find(
+            "test_data//nxcansas_1Dand2D_multisasentry.h5")
+        self.datafile_multiplesasdata_multiplesasentry = find(
+            "test_data//nxcansas_1Dand2D_multisasentry_multisasdata.h5")
 
     def test_real_data(self):
@@ -273,5 +271,10 @@
         self._check_multiple_data(self.data[0])
         self._check_multiple_data(self.data[1])
-        self._check_1d_data(self.data[0])
+        if isinstance(self.data[0], Data1D):
+            self._check_1d_data(self.data[0])
+            self._check_2d_data(self.data[1])
+        else:
+            self._check_1d_data(self.data[1])
+            self._check_2d_data(self.data[0])
 
     def _check_multiple_data(self, data):
@@ -281,25 +284,30 @@
         self.assertTrue(data.instrument == "SANS2D")
         self.assertTrue(data.source.radiation == "Spallation Neutron Source")
-        self.assertTrue(len(data.detector) == 1)
-        self.assertTrue(data.detector[0].name == "rear-detector")
-        self.assertTrue(data.detector[0].distance == 4.385281)
-        self.assertTrue(data.detector[0].distance_unit == 'm')
+        self.assertTrue(len(data.detector) == 2)
+        self.assertTrue(data.detector[0].name == "rear-detector"
+                        or data.detector[1].name == "rear-detector")
+        self.assertTrue(data.detector[0].name == "front-detector"
+                        or data.detector[1].name == "front-detector")
+        self.assertAlmostEqual(data.detector[0].distance +
+                               data.detector[1].distance, 7230.54, 2)
+        self.assertTrue(data.detector[0].distance_unit == 'mm')
         self.assertTrue(len(data.trans_spectrum) == 1)
 
     def _check_1d_data(self, data):
-        self.assertTrue(isinstance(data, Data1D))
         self.assertTrue(len(data.x) == 66)
         self.assertTrue(len(data.x) == len(data.y))
-        self.assertTrue(data.dy[10] == 0.20721350111248701)
-        self.assertTrue(data.y[10] == 24.193889608153476)
-        self.assertTrue(data.x[10] == 0.008981127988654792)
+        self.assertTrue(data.dy[10] == 0.207214)
+        self.assertTrue(data.y[10] == 24.1939)
+        self.assertTrue(data.x[10] == 0.00898113)
 
     def _check_2d_data(self, data):
         self.assertTrue(isinstance(data, Data2D))
-        self.assertTrue(len(data.x) == 66)
-        self.assertTrue(len(data.x) == len(data.y))
-        self.assertTrue(data.dy[10] == 0.20721350111248701)
-        self.assertTrue(data.y[10] == 24.193889608153476)
-        self.assertTrue(data.x[10] == 0.008981127988654792)
+        self.assertTrue(len(data.q_data) == 150*150)
+        self.assertTrue(len(data.q_data) == len(data.data))
+        print(data.err_data[10])
+        self.assertAlmostEqual(data.err_data[10], 0.186723989418)
+        self.assertAlmostEqual(data.data[10], 0.465181425808)
+        self.assertAlmostEqual(data.qx_data[10], -0.129)
+        self.assertAlmostEqual(data.qy_data[10], -0.149)
 
     def _check_example_data(self, data):
Index: test/sasdataloader/test/utest_red2d_reader.py
===================================================================
--- test/sasdataloader/test/utest_red2d_reader.py	(revision f53d684ed4a54de3601e5f4bc601f78376d98e83)
+++ test/sasdataloader/test/utest_red2d_reader.py	(revision fc51d06ca61c96f09100f834da5f2bd421f461f7)
@@ -31,6 +31,6 @@
         self.assertEqual(f.qx_data[0],-0.03573497)
         self.assertEqual(f.qx_data[36863],0.2908819)
-        self.assertEqual(f.Q_unit, '1/A')
-        self.assertEqual(f.I_unit, '1/cm')
+        self.assertEqual(f.Q_unit, 'A^{-1}')
+        self.assertEqual(f.I_unit, 'cm^{-1}')
 
         self.assertEqual(f.meta_data['loader'],"IGOR/DAT 2D Q_map")
