Index: sansdataloader/test/avg_testdata.txt
===================================================================
--- sansdataloader/test/avg_testdata.txt	(revision aab4e1501beed9965c9e6c08d09fcd8e34a20adb)
+++ sansdataloader/test/avg_testdata.txt	(revision b5177928a9a30ffbb3e728b9c6bae8a490858d64)
@@ -1,86 +1,21 @@
-87
-0.000202106299717 -0.027508775 0.082928847514
-0.000551789534483 0.0284421916667 0.0731850536881
-0.000798810493953 1.60736842105e-005 0.0590302471882
-0.00116126782404 0.0438142678571 0.0517950053242
-0.00140714188022 0.064685778125 0.0547626242937
-0.00177124497692 1.07265199091 0.156421969167
-0.00201660336116 36.810534634 0.885116020355
-0.0023850851145 92.1891982143 1.28305716256
-0.00267278050009 84.665209375 1.15017124659
-0.00298274181425 56.7100338028 0.893718563342
-0.00325127626479 37.5359731707 0.676576507407
-0.00357359498717 25.3518046512 0.542944220133
-0.00383959397654 16.5985670833 0.415814550553
-0.0041700170637 11.4996769903 0.334136722646
-0.00443382276153 7.98444159292 0.265817183716
-0.00476991662481 5.6620977193 0.22286211848
-0.00503186595945 4.25155079365 0.183691226291
-0.00539412022968 3.34649076336 0.159830319458
-0.00568671283121 2.65831783099 0.136823053999
-0.00598988289328 2.09287549655 0.120140018787
-0.00626025579568 1.742223725 0.104349883954
-0.00657095900024 1.39967185802 0.0930044848904
-0.00688926719883 1.18864367586 0.0826515909917
-0.00715686844465 0.953296011111 0.0729892127156
-0.0074801022006 0.827779119251 0.0668699693599
-0.00774651148348 0.719786980725 0.0620716112536
-0.00807379933294 0.612540272081 0.0572616304198
-0.00839302584963 0.566606194831 0.0532825833092
-0.00867886586147 0.478724006452 0.047902248102
-0.00897219569306 0.413986979545 0.0454682930801
-0.0092723038804 0.383747495339 0.0429772810607
-0.00957855263679 0.299709392875 0.0379986890102
-0.00989037086379 0.3335908208 0.0393691239425
-0.0101595073016 0.286069857255 0.0370817933172
-0.0104753452352 0.259831640906 0.0348225626354
-0.0107957306999 0.252761626236 0.0343460413844
-0.0110630176098 0.251568055396 0.0336423804744
-0.0113930077886 0.235093004317 0.0328371516903
-0.0116916257614 0.213031539933 0.0306893694272
-0.0119857184654 0.181918172852 0.0294712039203
-0.012284885515 0.209558449686 0.029654495452
-0.0125887644552 0.184974602215 0.028223277554
-0.0128970215248 0.157850908537 0.0269431518661
-0.0131668490761 0.175325451829 0.0276139587923
-0.0134784412725 0.121815444807 0.026429336777
-0.0137937807812 0.16237724087 0.0258899780789
-0.0140622641312 0.135818960632 0.0258645735537
-0.0143930943297 0.129014499722 0.0254960218544
-0.0146864095013 0.142419530685 0.0249695336221
-0.0149988047287 0.143813170789 0.0244766681401
-0.0152973754556 0.122014793995 0.0229128991842
-0.0155997665361 0.128637397727 0.0232999901007
-0.0158704888872 0.126514509848 0.0234398006234
-0.0161759543409 0.125320390268 0.022797589029
-0.0164776012943 0.109229219192 0.0222425678213
-0.0167646754651 0.124861313021 0.0232126170142
-0.0170227523446 0.12825973162 0.0231933098642
-0.0173156876264 0.0947754240896 0.0228973329864
-0.0176417418879 0.122358410056 0.0240616388086
-0.0179991119552 0.0946951700297 0.0223980227203
-0.0182538528641 0.121243864198 0.0251867566004
-0.0185211566597 0.114524376471 0.0254586169395
-0.0188004862436 0.105750747719 0.0248183671151
-0.0190913124594 0.0732775201681 0.0279438273842
-0.0193931167311 0.097700884141 0.0290122599042
-0.0197053932406 0.113561495455 0.0302481661165
-0.0200276506769 0.08421012 0.0293502263012
-0.0203594135936 0.107610352071 0.0327605964871
-0.0205287156218 0.115224884906 0.0344222268277
-0.0208738823951 0.0941588853147 0.0342119909635
-0.0212274412762 0.0870687160305 0.037120278486
-0.0215889783111 0.071684565 0.0385328986423
-0.0217726142518 0.107426831731 0.0435558726696
-0.0221453821308 0.106882672826 0.0445934315513
-0.0223344219011 0.0731600060241 0.042980047662
-0.0227175909983 0.106005602985 0.052102966241
-0.0229116347581 0.0987530476923 0.0533983398452
-0.0233044347998 0.102729822449 0.0601602327345
-0.0235031118611 0.077848535 0.066185247601
-0.0239048296539 0.0854999352941 0.0703156144831
-0.024000069863 0.1014931 0.0797968391526
-0.0243705875591 -0.00442893181818 0.0860634747975
-0.024747558388 0.0889580272727 0.132841659925
-0.024938371921 0.169803994133 0.145644771445
+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: sansdataloader/test/ring_testdata.txt
===================================================================
--- sansdataloader/test/ring_testdata.txt	(revision aab4e1501beed9965c9e6c08d09fcd8e34a20adb)
+++ sansdataloader/test/ring_testdata.txt	(revision b5177928a9a30ffbb3e728b9c6bae8a490858d64)
@@ -1,21 +1,21 @@
 <X>   <Y>   <dY>
-0.15708  0.972421  0.0817009
-0.471239  1.11139  0.0823546
-0.785398  1.09267  0.0823443
-1.09956  1.07895  0.0817159
-1.41372  1.14111  0.0831238
-1.72788  1.07949  0.0840375
-2.04204  1.10197  0.0824725
-2.35619  1.00297  0.0787024
-2.67035  1.02805  0.0804773
-2.98451  0.919877  0.0783511
-3.29867  0.973222  0.0769917
-3.61283  0.915259  0.0760745
-3.92699  0.890996  0.0751355
-4.24115  0.914385  0.0759576
-4.55531  0.980681  0.0791343
-4.86947  0.9385  0.0755147
-5.18363  0.973714  0.0781204
-5.49779  0.968017  0.0781457
-5.81195  1.01289  0.0785441
-6.12611  1.0482  0.0782739
+0.157079632679 0.892216637179 0.0775663414595
+0.471238898038 0.98455818481 0.079657697118
+0.785398163397 0.961797998125 0.0788556980394
+1.09955742876 0.97171642327 0.0791285423182
+1.41371669412 1.0146882474 0.082063426639
+1.72787595947 1.00992701463 0.080353091764
+2.04203522483 1.02880481582 0.0815342153253
+2.35619449019 1.00598046038 0.0798251732283
+2.67035375555 1.07871021115 0.0836335498662
+2.98451302091 0.998456910563 0.079747331585
+3.29867228627 1.04419570592 0.0830428241489
+3.61283155163 1.01232642025 0.0808308513267
+3.92699081699 1.0083937443 0.0810028887009
+4.24115008235 1.03216852956 0.0810389534812
+4.55530934771 1.06499475793 0.0814085230439
+4.86946861306 0.982265097403 0.0805528988046
+5.18362787842 1.00390126667 0.0806633561062
+5.49778714378 0.980815954717 0.0793145659499
+5.81194640914 0.907713166456 0.0765782956648
+6.1261056745 0.983188286879 0.0797444057771
Index: sansdataloader/test/sectorphi_testdata.txt
===================================================================
--- sansdataloader/test/sectorphi_testdata.txt	(revision aab4e1501beed9965c9e6c08d09fcd8e34a20adb)
+++ sansdataloader/test/sectorphi_testdata.txt	(revision b5177928a9a30ffbb3e728b9c6bae8a490858d64)
@@ -1,20 +1,20 @@
-0.0392699081699 1.17011551291 0.194245536643
-0.11780972451 1.00702036435 0.15833831009
-0.196349540849 0.720495528288 0.139457714809
-0.274889357189 1.04665851696 0.168853943548
-0.353429173529 1.13277227588 0.16379429199
-0.431968989869 1.06130576997 0.166925861186
-0.510508806208 1.13347769037 0.162057077746
-0.589048622548 1.11225550557 0.165855813491
-0.667588438888 1.09533180265 0.164835409907
-0.746128255228 1.10213941705 0.162478295782
-0.824668071567 1.02044158661 0.165187569415
-0.903207887907 1.14615084518 0.165822352514
-0.981747704247 0.952913709668 0.154726336649
-1.06028752059 0.946459144917 0.151824506059
-1.13882733693 1.23601572249 0.175965656101
-1.21736715327 1.18990929137 0.17124143576
-1.29590696961 1.2276650882 0.173295377002
-1.37444678595 1.04512596159 0.160699465091
-1.45298660229 1.18745088214 0.173383042523
-1.53152641863 1.10936624389 0.158273843573
+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: sansdataloader/test/sectorq_testdata.txt
===================================================================
--- sansdataloader/test/sectorq_testdata.txt	(revision aab4e1501beed9965c9e6c08d09fcd8e34a20adb)
+++ sansdataloader/test/sectorq_testdata.txt	(revision b5177928a9a30ffbb3e728b9c6bae8a490858d64)
@@ -1,20 +1,20 @@
-0.005125 4.02127205236 0.416045610328
-0.005375 3.456822 0.339451616582
-0.005625 2.88693827586 0.315514810618
-0.005875 2.19392444828 0.275050117582
-0.006125 1.93326715152 0.242041015277
-0.006375 1.56115175 0.208243430602
-0.006625 1.346252875 0.205110707531
-0.006875 1.11982316216 0.173969798727
-0.007125 0.94929915 0.15645917998
-0.007375 0.856048947368 0.150091984723
-0.007625 0.792349027027 0.14932042113
-0.007875 0.753030718182 0.132690754628
-0.008125 0.633578104651 0.123741945015
-0.008375 0.492303623256 0.11017450586
-0.008625 0.491610770213 0.105544246448
-0.008875 0.438532753333 0.102175142057
-0.009125 0.417049091489 0.0985475710833
-0.009375 0.334298295833 0.0918248077183
-0.009625 0.329847168519 0.0825040729343
-0.009875 0.263231283434 0.0844113633186
+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: sansdataloader/test/slabx_testdata.txt
===================================================================
--- sansdataloader/test/slabx_testdata.txt	(revision aab4e1501beed9965c9e6c08d09fcd8e34a20adb)
+++ sansdataloader/test/slabx_testdata.txt	(revision b5177928a9a30ffbb3e728b9c6bae8a490858d64)
@@ -1,50 +1,50 @@
--0.00962159132857 0.336011011698 0.488617721661
--0.00934874822941 0.169341263697 0.349298397763
--0.00880305371584 0.266137690959 0.313454527129
--0.00853020246473 0.53042309512 0.640848517184
--0.0082573486596 0.131506032964 0.344582750407
--0.00771163371395 0.37855077978 0.399878542284
--0.00743877273675 1.22305004732 0.935636337563
--0.00689304418196 1.02510396941 0.58056790098
--0.00662017676773 1.19776697142 0.927276156351
--0.00607443607399 2.14592640815 0.901774646566
--0.00580156295786 1.76245186063 1.08131130719
--0.00525581159553 3.51263196728 1.1534380121
--0.00498293351273 4.61403810461 1.80060761383
--0.00443717295236 6.69224442442 1.57849762651
--0.00416429063819 11.8881503783 2.95751106458
--0.00361852235044 16.0018161184 2.38615115797
--0.00334563654027 31.0490619358 4.80037655086
--0.0030727497282 41.6119181784 5.4639575083
--0.00252697342519 71.8163563059 5.09207979935
--0.0022540840977 68.9541223734 6.96581065982
--0.00170830349931 1.20299985601 0.55602187788
--0.00143541239187 -0.128405536814 0.361476507781
--0.000889628969094 0.0231291411266 0.0980509703716
--0.000616736817209 -0.00597983500599 0.0317586096182
--7.09520410675e-005 0.0373361802828 0.198768805372
-0.000201940419739 0.0242580599324 0.0639653694525
-0.000747725078196 -0.0087954171462 0.243371558064
-0.0010206171124 -0.00564032235597 0.0308438685116
-0.00156640018212 0.120815708312 0.230887528979
-0.0018392910542 21.7610203455 3.89785284026
-0.00238507106417 93.9292971261 5.78185222632
-0.00265796003862 58.9392435113 6.55609779464
-0.00293084821709 37.950776621 5.20451320059
-0.00347662185922 23.7617216423 2.89473033587
-0.00374950715944 14.366068712 3.23457901336
-0.00429527430965 7.2450736643 1.59436243284
-0.00456815599622 4.51699023104 1.75524641669
-0.00511391518373 4.10500397804 1.21069572594
-0.00538679252127 3.24603156387 1.5410611893
-0.00593254227544 1.70186533105 0.772902657452
-0.00620541452867 1.91954073316 1.16236757432
-0.00675115337898 1.53864804114 0.754629321052
-0.00702401981269 0.645836241027 0.678560805804
-0.00756974628881 0.799244089968 0.555296393723
-0.00784260616787 0.291996503792 0.498600259667
-0.00838831879964 1.02382604351 0.624324964568
-0.00866117138903 0.273189896174 0.38726921435
-0.00893402138521 0.301093569069 0.475351425154
-0.00947971327134 0.390765056355 0.387460775789
-0.009752554998 -0.123282440572 0.288906086779
+-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: sansdataloader/test/slaby_testdata.txt
===================================================================
--- sansdataloader/test/slaby_testdata.txt	(revision aab4e1501beed9965c9e6c08d09fcd8e34a20adb)
+++ sansdataloader/test/slaby_testdata.txt	(revision b5177928a9a30ffbb3e728b9c6bae8a490858d64)
@@ -1,50 +1,50 @@
--0.00981530818509 0.173195927461 0.0844172521474
--0.00926962320349 0.210505590753 0.0595361190668
--0.00899677650894 0.244652190359 0.0895850556564
--0.00845107512056 0.265993035634 0.0666080660306
--0.00817822059005 0.289475366563 0.0969882347891
--0.00763250426466 0.216956446732 0.061297641466
--0.00735964263312 0.277331425421 0.0933738803126
--0.00681391284071 0.342725434095 0.0724261717065
--0.00654104484319 0.392190755871 0.109042871956
--0.00626817488704 0.451098964813 0.116550921567
--0.00572242942561 0.379721052239 0.076777026569
--0.0054495540837 0.433801290053 0.110385286078
--0.004903798586 0.508594445542 0.0851650192039
--0.00463091859359 0.66912469559 0.136796594192
--0.0040851545302 0.666639612581 0.0976268706729
--0.00381227062264 0.720316847689 0.14147286728
--0.0032664994643 0.679325124262 0.0989068147202
--0.00299361237696 0.837852009544 0.151796196236
--0.00244783559451 0.89718102713 0.112105037602
--0.00217494606284 1.03946978054 0.170625894622
--0.00162916512721 1.05983563324 0.12375260214
--0.00135627388669 0.834750958983 0.153510704997
--0.000810490268858 1.09975110023 0.124203411212
--0.000537598054997 1.24420235765 0.185462933977
--0.000264705680137 1.34991530032 0.193521832628
-0.000281079225678 1.20557718686 0.129412513236
-0.000553971593183 1.21112766832 0.183621560056
-0.00109975574876 1.27182919665 0.133242114799
-0.00137264737339 1.09335671556 0.176749528981
-0.00191842930769 1.02445153724 0.119230433073
-0.00219131945392 0.850946924462 0.153617640862
-0.00273709769594 0.791470959296 0.107464292498
-0.00300998562829 0.701643527447 0.139845645016
-0.00355575870709 0.63143127987 0.093594419565
-0.0038286436901 0.632079990389 0.131442574167
-0.00437441013479 0.59655095652 0.0916924511775
-0.00464729143306 0.594690488652 0.131146805216
-0.00519304977289 0.463676357535 0.0821774481155
-0.00546592665105 0.46676750257 0.117880857587
-0.00573880189245 0.410666655107 0.110910802531
-0.00628454713816 0.331947656254 0.0715186428864
-0.00655741697909 0.309823313461 0.10101066015
-0.00710315068867 0.255464454284 0.0663090097757
-0.00737601439397 0.221117625971 0.0848258256613
-0.00792173509717 0.312394128941 0.0708509004541
-0.00819459193174 0.188273445935 0.086184613514
-0.00874029815851 0.22540410608 0.0607480009671
-0.00901314738739 0.149537864138 0.0815039441345
-0.00955883766788 0.163658449578 0.0598329441459
-0.0098316785562 0.130573569595 0.0762388059779
+-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: sansdataloader/test/utest_averaging.py
===================================================================
--- sansdataloader/test/utest_averaging.py	(revision ca3b9c5d50642f889b5e4ad215325ebc3352ea06)
+++ sansdataloader/test/utest_averaging.py	(revision b5177928a9a30ffbb3e728b9c6bae8a490858d64)
@@ -125,4 +125,5 @@
         
         o = r(self.data)
+
         answer = Loader().load('avg_testdata.txt')
         for i in range(r.nbins_phi):
@@ -140,11 +141,11 @@
         r = Boxsum(x_min=.01, x_max=.015, y_min=0.01, y_max=0.015)
         s, ds = r(self.data)
-        self.assertAlmostEqual(s, 151.81809601016641, 4)
-        self.assertAlmostEqual(ds, 16.245399156009537, 4)
+        self.assertAlmostEqual(s, 34.278990899999997, 4)
+        self.assertAlmostEqual(ds, 7.8007981835194293, 4)
     
         r = Boxavg(x_min=.01, x_max=.015, y_min=0.01, y_max=0.015)
         s, ds = r(self.data)
-        self.assertAlmostEqual(s, 0.11195555855955155, 4)
-        self.assertAlmostEqual(ds, 0.011979881083557541, 4)
+        self.assertAlmostEqual(s, 0.10579935462962962, 4)
+        self.assertAlmostEqual(ds, 0.024076537603455028, 4)
             
     def test_slabX(self):
@@ -158,5 +159,5 @@
         r.fold = False
         o = r(self.data)
-    
+
         answer = Loader().load('slabx_testdata.txt')
         for i in range(len(o.x)):
@@ -175,5 +176,5 @@
         r.fold = False
         o = r(self.data)
-    
+
         answer = Loader().load('slaby_testdata.txt')
         for i in range(len(o.x)):
@@ -195,5 +196,5 @@
         r.nbins_phi = 20
         o = r(self.data)
-    
+
         answer = Loader().load('ring_testdata.txt')
         for i in range(len(o.x)):
@@ -213,5 +214,5 @@
         r.nbins_phi = 20
         o = r(self.data)
-    
+
         answer = Loader().load('sectorphi_testdata.txt')
         for i in range(len(o.x)):
@@ -231,5 +232,5 @@
         r.nbins_phi = 20
         o = r(self.data)
-    
+
         answer = Loader().load('sectorq_testdata.txt')
         for i in range(len(o.x)):
Index: sansdataloader/test/write_test.xml
===================================================================
--- sansdataloader/test/write_test.xml	(revision aab4e1501beed9965c9e6c08d09fcd8e34a20adb)
+++ sansdataloader/test/write_test.xml	(revision b5177928a9a30ffbb3e728b9c6bae8a490858d64)
@@ -19,4 +19,10 @@
 					0.01
 				</Qdev>
+				<dQl unit="1/A">
+					0.0
+				</dQl>
+				<dQw unit="1/A">
+					0.0
+				</dQw>
 				<Idev unit="1/cm">
 					3.0
@@ -33,4 +39,10 @@
 					0.02
 				</Qdev>
+				<dQl unit="1/A">
+					0.0
+				</dQl>
+				<dQw unit="1/A">
+					0.0
+				</dQw>
 				<Idev unit="1/cm">
 					4.0
