diff --git a/Tests/ReferenceData/MiniExamples/scatter2d/BoxesWithSpecularPeak.int b/Tests/ReferenceData/MiniExamples/scatter2d/BoxesWithSpecularPeak.int
index ab7975c146fedd597f6ca391cded6240e9a710e2..661f712e0bb47dbbfbdaa91dc33700cd5a8d8b0f 100644
--- a/Tests/ReferenceData/MiniExamples/scatter2d/BoxesWithSpecularPeak.int
+++ b/Tests/ReferenceData/MiniExamples/scatter2d/BoxesWithSpecularPeak.int
@@ -1,21 +1,21 @@
 # BornAgain Intensity Data
 
 # axis-0
-EquiDivision("phi_f (rad)", 11, -0.0349065850398866, 0.0349065850398866)
+EquiDivision("q_y (1/nm)", 11, 0, 140)
 
 # axis-1
-EquiDivision("alpha_f (rad)", 11, 0, 0.0349065850398866)
+EquiDivision("q_z (1/nm)", 11, 0, 70)
 
 # data
-1.347273512061e+02 2.209591919155e+03 4.520283785143e+02 1.242439689040e+02 1.437557985395e+02 7.157108013217e+01 2.847205908234e+01 4.582436491342e+01 3.120699842867e+01 1.217686517769e+01 2.102869419390e+01
-7.646619812735e+04 1.212280180880e+06 2.315475457448e+05 5.732329296129e+04 5.759619824224e+04 2.402707722809e+04 7.748930711866e+03 9.827095250529e+03 5.155476875674e+03 1.524659891435e+03 1.975406802376e+03
-9.042487865154e+00 1.483919360813e+02 3.039456546165e+01 8.369571585865e+00 9.707694510782e+00 4.847919310451e+00 1.935649129265e+00 3.128635190674e+00 2.141011016474e+00 8.399710630608e-01 1.459321110770e+00
-3.637250906700e+06 5.766502289565e+07 1.091227481462e+07 2.612330965335e+06 2.444078587944e+06 9.102953362178e+05 2.532357844771e+05 2.717500445537e+05 1.202279080038e+05 3.023670156189e+04 3.381806941400e+04
-2.518462359638e+03 4.131729205494e+04 8.457961973844e+03 2.326997222826e+03 2.695918265337e+03 1.344372861562e+03 5.358473627497e+02 8.643634561764e+02 5.901529869060e+02 2.309359118726e+02 4.000701469304e+02
-7.687457773994e+07 9.840396718387e+08 2.489866333907e+08 5.985764248571e+07 5.181271432767e+07 1.642181344807e+07 3.726346487473e+06 3.270992948949e+06 1.216526633933e+06 2.658630480290e+05 2.662597327874e+05
-2.518462359638e+03 4.131729205494e+04 8.457961973844e+03 2.326997222826e+03 2.695918265337e+03 1.344372861562e+03 5.358473627497e+02 8.643634561764e+02 5.901529869060e+02 2.309359118726e+02 4.000701469304e+02
-3.637250906700e+06 5.766502289565e+07 1.091227481462e+07 2.612330965335e+06 2.444078587944e+06 9.102953362178e+05 2.532357844771e+05 2.717500445537e+05 1.202279080038e+05 3.023670156189e+04 3.381806941400e+04
-9.042487865154e+00 1.483919360813e+02 3.039456546165e+01 8.369571585865e+00 9.707694510782e+00 4.847919310451e+00 1.935649129265e+00 3.128635190674e+00 2.141011016474e+00 8.399710630608e-01 1.459321110770e+00
-7.646619812735e+04 1.212280180880e+06 2.315475457448e+05 5.732329296129e+04 5.759619824224e+04 2.402707722809e+04 7.748930711866e+03 9.827095250529e+03 5.155476875674e+03 1.524659891435e+03 1.975406802376e+03
-1.347273512061e+02 2.209591919155e+03 4.520283785143e+02 1.242439689040e+02 1.437557985395e+02 7.157108013217e+01 2.847205908234e+01 4.582436491342e+01 3.120699842867e+01 1.217686517769e+01 2.102869419390e+01
+1.354632909708e+02 2.220130398118e+03 4.465271532152e+02 1.239897381432e+02 1.437917974647e+02 7.056768995875e+01 2.851322834319e+01 4.597639705817e+01 3.069142847962e+01 1.215088219361e+01 2.117919899723e+01
+5.996332730392e+04 9.550427035210e+05 1.809796051026e+05 4.599979761642e+04 4.723088530965e+04 1.982663308503e+04 6.656063742808e+03 8.655002169965e+03 4.539800763839e+03 1.391155597747e+03 1.852234538795e+03
+8.225759179345e+00 1.348868829639e+02 2.709538159147e+01 7.550056465577e+00 8.781568147318e+00 4.313975235461e+00 1.754256875498e+00 2.842242741960e+00 1.900801275477e+00 7.588539313721e-01 1.333249523966e+00
+2.750981895955e+06 4.382450513615e+07 8.228317148951e+06 2.035790463267e+06 1.965471958611e+06 7.441543145716e+05 2.182981150610e+05 2.421014972785e+05 1.072097619615e+05 2.799503817763e+04 3.214094505236e+04
+2.542461130928e+03 4.167647939000e+04 8.355924657388e+03 2.328004963146e+03 2.704854384974e+03 1.325245382918e+03 5.385940227282e+02 8.708787516616e+02 5.800352840839e+02 2.312377903208e+02 4.053518743592e+02
+7.773219756553e+07 9.840396718387e+08 2.462167292352e+08 5.986126773291e+07 5.183520698730e+07 1.609227435643e+07 3.714759113734e+06 3.263401606999e+06 1.182659306375e+06 2.632543226983e+05 2.667910471254e+05
+2.542461130928e+03 4.167647939000e+04 8.355924657388e+03 2.328004963146e+03 2.704854384974e+03 1.325245382918e+03 5.385940227282e+02 8.708787516616e+02 5.800352840839e+02 2.312377903208e+02 4.053518743592e+02
+2.750981895955e+06 4.382450513615e+07 8.228317148951e+06 2.035790463267e+06 1.965471958611e+06 7.441543145716e+05 2.182981150610e+05 2.421014972785e+05 1.072097619615e+05 2.799503817763e+04 3.214094505236e+04
+8.225759179345e+00 1.348868829639e+02 2.709538159147e+01 7.550056465577e+00 8.781568147318e+00 4.313975235461e+00 1.754256875498e+00 2.842242741960e+00 1.900801275477e+00 7.588539313721e-01 1.333249523966e+00
+5.996332730392e+04 9.550427035210e+05 1.809796051026e+05 4.599979761642e+04 4.723088530965e+04 1.982663308503e+04 6.656063742808e+03 8.655002169965e+03 4.539800763839e+03 1.391155597747e+03 1.852234538795e+03
+1.354632909708e+02 2.220130398118e+03 4.465271532152e+02 1.239897381432e+02 1.437917974647e+02 7.056768995875e+01 2.851322834319e+01 4.597639705817e+01 3.069142847962e+01 1.215088219361e+01 2.117919899723e+01
 
diff --git a/Tests/ReferenceData/MiniExamples/scatter2d/CylindersInAverageLayer.int b/Tests/ReferenceData/MiniExamples/scatter2d/CylindersInAverageLayer.int
index 82cb9db2befa2df84a678da401d58c11bb426bd5..fe085bebfd687932762a19d4dccf4591666db196 100644
--- a/Tests/ReferenceData/MiniExamples/scatter2d/CylindersInAverageLayer.int
+++ b/Tests/ReferenceData/MiniExamples/scatter2d/CylindersInAverageLayer.int
@@ -1,21 +1,21 @@
 # BornAgain Intensity Data
 
 # axis-0
-EquiDivision("phi_f (rad)", 11, -0.0349065850398866, 0.0349065850398866)
+EquiDivision("q_y (1/nm)", 11, 0, 140)
 
 # axis-1
-EquiDivision("alpha_f (rad)", 11, 0, 0.0349065850398866)
+EquiDivision("q_z (1/nm)", 11, 0, 70)
 
 # data
-1.744653276986e+00 1.600927252285e+01 1.163457207964e+01 5.528498931705e+00 1.898848064692e+00 3.846320664213e-01 1.197998791752e-01 3.638879969098e-01 5.741243998772e-01 5.216271577195e-01 2.941073102367e-01
-1.063540090417e+02 9.748333245461e+02 7.067483270008e+02 3.344872329415e+02 1.141902639713e+02 2.293144292318e+01 7.058882685647e+00 2.111466912638e+01 3.267908324682e+01 2.901059662552e+01 1.592319508849e+01
-6.608338147523e+02 6.055308344469e+03 4.385439198340e+03 2.070013875882e+03 7.028306043329e+02 1.397810113264e+02 4.237267959965e+01 1.239546948380e+02 1.861750418283e+02 1.591269644063e+02 8.347001554187e+01
-2.419658924367e+02 2.216009930171e+03 1.601437867481e+03 7.514368373715e+02 2.519412273950e+02 4.899803812325e+01 1.434623259316e+01 3.999416290642e+01 5.653871731724e+01 4.506989892128e+01 2.195588387262e+01
-6.729241441670e+05 6.164217559264e+06 4.427810644873e+06 2.027455058162e+06 6.415731453376e+05 1.125339905376e+05 2.832697246632e+04 6.535392832422e+04 7.492872404772e+04 4.834552141279e+04 1.927426434549e+04
-4.546790934944e+08 4.182684047362e+09 2.285913323393e+09 4.942176637611e+08 5.977528479268e+07 4.349451789586e+06 5.436169708531e+05 7.450590948037e+05 5.882450042453e+05 2.920233084970e+05 9.692585660029e+04
-6.729241441670e+05 6.164217559264e+06 4.427810644873e+06 2.027455058162e+06 6.415731453376e+05 1.125339905376e+05 2.832697246632e+04 6.535392832422e+04 7.492872404772e+04 4.834552141279e+04 1.927426434549e+04
-2.419658924367e+02 2.216009930171e+03 1.601437867481e+03 7.514368373715e+02 2.519412273950e+02 4.899803812325e+01 1.434623259316e+01 3.999416290642e+01 5.653871731724e+01 4.506989892128e+01 2.195588387262e+01
-6.608338147523e+02 6.055308344469e+03 4.385439198340e+03 2.070013875882e+03 7.028306043329e+02 1.397810113264e+02 4.237267959965e+01 1.239546948380e+02 1.861750418283e+02 1.591269644063e+02 8.347001554187e+01
-1.063540090417e+02 9.748333245461e+02 7.067483270008e+02 3.344872329415e+02 1.141902639713e+02 2.293144292318e+01 7.058882685647e+00 2.111466912638e+01 3.267908324682e+01 2.901059662552e+01 1.592319508849e+01
-1.744653276986e+00 1.600927252285e+01 1.163457207964e+01 5.528498931705e+00 1.898848064692e+00 3.846320664213e-01 1.197998791752e-01 3.638879969098e-01 5.741243998772e-01 5.216271577195e-01 2.941073102367e-01
+1.538157004713e+00 1.404338178886e+01 1.016215260811e+01 4.804046631758e+00 1.637470242169e+00 3.273752308384e-01 1.050659320231e-01 3.179769182199e-01 4.943905871174e-01 4.428762620173e-01 2.456494122998e-01
+1.248248432988e+02 1.137792509736e+03 8.209007125706e+02 3.862214341185e+02 1.306966731724e+02 2.585687809058e+01 8.216044675859e+00 2.445139804815e+01 3.719554822027e+01 3.246855442971e+01 1.747996146127e+01
+7.522250972834e+02 6.852099157371e+03 4.936612540962e+03 2.315041784288e+03 7.783185267547e+02 1.522195305856e+02 4.766572603720e+01 1.384418878963e+02 2.037185827056e+02 1.706350320143e+02 8.748334464788e+01
+3.223518956793e+02 2.934096171472e+03 2.108540821167e+03 9.821240616426e+02 3.254882187875e+02 6.205699719950e+01 1.873045262066e+01 5.160103652381e+01 7.106738684991e+01 5.521965746554e+01 2.616813302235e+01
+7.913410744730e+05 7.203363811200e+06 5.140687748564e+06 2.329548539027e+06 7.240205903048e+05 1.232778282491e+05 3.167171865221e+04 7.153143356348e+04 7.942566151497e+04 4.987838886572e+04 1.938608444525e+04
+4.597731989139e+08 4.204388377167e+09 2.280904108419e+09 4.882886351431e+08 5.845511381441e+07 4.193555344337e+06 5.463663833639e+05 7.495156240371e+05 5.848919570654e+05 2.874302214699e+05 9.423971298585e+04
+7.913410744730e+05 7.203363811200e+06 5.140687748564e+06 2.329548539027e+06 7.240205903048e+05 1.232778282491e+05 3.167171865221e+04 7.153143356348e+04 7.942566151497e+04 4.987838886572e+04 1.938608444525e+04
+3.223518956793e+02 2.934096171472e+03 2.108540821167e+03 9.821240616426e+02 3.254882187875e+02 6.205699719950e+01 1.873045262066e+01 5.160103652381e+01 7.106738684991e+01 5.521965746554e+01 2.616813302235e+01
+7.522250972834e+02 6.852099157371e+03 4.936612540962e+03 2.315041784288e+03 7.783185267547e+02 1.522195305856e+02 4.766572603720e+01 1.384418878963e+02 2.037185827056e+02 1.706350320143e+02 8.748334464788e+01
+1.248248432988e+02 1.137792509736e+03 8.209007125706e+02 3.862214341185e+02 1.306966731724e+02 2.585687809058e+01 8.216044675859e+00 2.445139804815e+01 3.719554822027e+01 3.246855442971e+01 1.747996146127e+01
+1.538157004713e+00 1.404338178886e+01 1.016215260811e+01 4.804046631758e+00 1.637470242169e+00 3.273752308384e-01 1.050659320231e-01 3.179769182199e-01 4.943905871174e-01 4.428762620173e-01 2.456494122998e-01
 
diff --git a/Tests/ReferenceData/MiniExamples/scatter2d/HalfSpheresInAverageTopLayer.int b/Tests/ReferenceData/MiniExamples/scatter2d/HalfSpheresInAverageTopLayer.int
index cb0cdafe40bce7e472830a0be4326647f785923f..f5c10e11c605bb22f60cd50d6801d1ae1584d7f7 100644
--- a/Tests/ReferenceData/MiniExamples/scatter2d/HalfSpheresInAverageTopLayer.int
+++ b/Tests/ReferenceData/MiniExamples/scatter2d/HalfSpheresInAverageTopLayer.int
@@ -1,21 +1,21 @@
 # BornAgain Intensity Data
 
 # axis-0
-EquiDivision("phi_f (rad)", 11, -0.0349065850398866, 0.0349065850398866)
+EquiDivision("q_y (1/nm)", 11, 0, 140)
 
 # axis-1
-EquiDivision("alpha_f (rad)", 11, 0, 0.0349065850398866)
+EquiDivision("q_z (1/nm)", 11, 0, 70)
 
 # data
-7.547524704166e+00 1.269971118609e+02 2.374872148133e+02 2.780509996012e+02 2.789426908366e+02 2.580666191818e+02 2.252758823201e+02 1.926079642220e+02 1.654958998159e+02 1.408237814796e+02 1.167327405017e+02
-7.241567010195e-01 5.111664186868e+00 1.979029787068e+01 4.137922969371e+01 6.780001356384e+01 9.323902584574e+01 1.058127610145e+02 9.752215887129e+01 7.314010577330e+01 4.589508737497e+01 2.639232918617e+01
-1.944814161403e+02 5.917017287268e+03 1.464979722974e+04 1.937739751777e+04 1.839226475960e+04 1.356885064627e+04 7.987428593012e+03 3.965999641624e+03 1.932834942443e+03 1.294686394208e+03 1.322674515801e+03
-6.176161630045e+02 4.632034736632e+03 4.480225967774e+03 2.587497691019e+03 1.840034379189e+03 1.608457101286e+03 1.236174826674e+03 7.842748439927e+02 4.652208753739e+02 2.953902372559e+02 2.082345882542e+02
-3.571296858853e+03 3.603817117228e+04 4.065841690487e+04 2.395569123242e+04 1.033597034504e+04 3.303173930311e+03 5.420284581588e+02 2.232933018380e+01 4.194382032001e+02 8.398076290994e+02 8.614053899790e+02
-5.563030653834e+07 5.905588157245e+08 6.658037187852e+08 3.614531146366e+08 1.249691478817e+08 2.800394488218e+07 3.343279591728e+06 1.220271255547e+05 3.806529638216e+05 4.784701946512e+05 3.102508777155e+05
-3.571296858853e+03 3.603817117228e+04 4.065841690487e+04 2.395569123242e+04 1.033597034504e+04 3.303173930311e+03 5.420284581588e+02 2.232933018380e+01 4.194382032001e+02 8.398076290994e+02 8.614053899790e+02
-6.176161630045e+02 4.632034736632e+03 4.480225967774e+03 2.587497691019e+03 1.840034379189e+03 1.608457101286e+03 1.236174826674e+03 7.842748439927e+02 4.652208753739e+02 2.953902372559e+02 2.082345882542e+02
-1.944814161403e+02 5.917017287268e+03 1.464979722974e+04 1.937739751777e+04 1.839226475960e+04 1.356885064627e+04 7.987428593012e+03 3.965999641624e+03 1.932834942443e+03 1.294686394208e+03 1.322674515801e+03
-7.241567010195e-01 5.111664186868e+00 1.979029787068e+01 4.137922969371e+01 6.780001356384e+01 9.323902584574e+01 1.058127610145e+02 9.752215887129e+01 7.314010577330e+01 4.589508737497e+01 2.639232918617e+01
-7.547524704166e+00 1.269971118609e+02 2.374872148133e+02 2.780509996012e+02 2.789426908366e+02 2.580666191818e+02 2.252758823201e+02 1.926079642220e+02 1.654958998159e+02 1.408237814796e+02 1.167327405017e+02
+6.723740081661e+00 1.117965150894e+02 2.082829449258e+02 2.432331580836e+02 2.439371145664e+02 2.263757971678e+02 1.992654104649e+02 1.726636668864e+02 1.503903745723e+02 1.290925314916e+02 1.073431508443e+02
+6.738502597856e-01 4.762350525975e+00 1.973394542524e+01 4.211825506480e+01 6.930467269099e+01 9.504479553884e+01 1.072324533233e+02 9.812458434138e+01 7.302582226183e+01 4.547636485319e+01 2.603749417188e+01
+2.357109588534e+02 6.974983079862e+03 1.702328206251e+04 2.225384500702e+04 2.089990141583e+04 1.525483236772e+04 8.890017143806e+03 4.386240218922e+03 2.142066325832e+03 1.442944854565e+03 1.459475249611e+03
+5.928611440651e+02 4.415683687040e+03 4.247114254564e+03 2.461664349758e+03 1.778979197122e+03 1.566237756419e+03 1.201126106146e+03 7.582010239656e+02 4.470907958548e+02 2.824469523739e+02 1.995790259197e+02
+3.627079668159e+03 3.648055953743e+04 4.095970184525e+04 2.401482514411e+04 1.030698947555e+04 3.266807218767e+03 5.239840134958e+02 2.558340325744e+01 4.348323006745e+02 8.529860397309e+02 8.639737101436e+02
+5.624561829080e+07 5.953124713402e+08 6.678802596966e+08 3.604877461237e+08 1.237535379390e+08 2.745582723526e+07 3.216378908510e+06 1.186895968245e+05 3.886704412173e+05 4.785694181178e+05 3.066630204036e+05
+3.627079668159e+03 3.648055953743e+04 4.095970184525e+04 2.401482514411e+04 1.030698947555e+04 3.266807218767e+03 5.239840134958e+02 2.558340325744e+01 4.348323006745e+02 8.529860397309e+02 8.639737101436e+02
+5.928611440651e+02 4.415683687040e+03 4.247114254564e+03 2.461664349758e+03 1.778979197122e+03 1.566237756419e+03 1.201126106146e+03 7.582010239656e+02 4.470907958548e+02 2.824469523739e+02 1.995790259197e+02
+2.357109588534e+02 6.974983079862e+03 1.702328206251e+04 2.225384500702e+04 2.089990141583e+04 1.525483236772e+04 8.890017143806e+03 4.386240218921e+03 2.142066325832e+03 1.442944854565e+03 1.459475249611e+03
+6.738502597856e-01 4.762350525975e+00 1.973394542524e+01 4.211825506480e+01 6.930467269099e+01 9.504479553884e+01 1.072324533233e+02 9.812458434138e+01 7.302582226183e+01 4.547636485319e+01 2.603749417188e+01
+6.723740081661e+00 1.117965150894e+02 2.082829449258e+02 2.432331580836e+02 2.439371145664e+02 2.263757971678e+02 1.992654104649e+02 1.726636668864e+02 1.503903745723e+02 1.290925314916e+02 1.073431508443e+02
 
diff --git a/Tests/ReferenceData/MiniExamples/scatter2d/Interference1DRadialParacrystal.int b/Tests/ReferenceData/MiniExamples/scatter2d/Interference1DRadialParacrystal.int
index 0a430fcd93c1a5ba4c11209d9473aa7a8bad69b8..330ee048b1894153b73792b37cfd6eb026502da7 100644
--- a/Tests/ReferenceData/MiniExamples/scatter2d/Interference1DRadialParacrystal.int
+++ b/Tests/ReferenceData/MiniExamples/scatter2d/Interference1DRadialParacrystal.int
@@ -1,21 +1,21 @@
 # BornAgain Intensity Data
 
 # axis-0
-EquiDivision("phi_f (rad)", 11, -0.0349065850398866, 0.0349065850398866)
+EquiDivision("q_y (1/nm)", 11, 0, 140)
 
 # axis-1
-EquiDivision("alpha_f (rad)", 11, 0, 0.0349065850398866)
+EquiDivision("q_z (1/nm)", 11, 0, 70)
 
 # data
-4.606328285588e+05 2.584199743070e+05 1.486067345773e+05 8.415976508330e+04 3.614368277863e+04 9.688811748024e+03 2.912062956422e+03 6.407073947860e+03 1.041946474616e+04 1.020675589162e+04 6.446368882565e+03
-1.461923045713e+07 8.197116930894e+06 4.708897394636e+06 2.662813935498e+06 1.141506797811e+06 3.053792888242e+05 9.159660799360e+04 2.011510885899e+05 3.266395157597e+05 3.197164071778e+05 2.019624172922e+05
-3.825342559392e+07 2.145098693553e+07 1.232482106585e+07 6.971104042855e+06 2.989141437845e+06 7.998360800997e+05 2.399348983488e+05 5.268848585027e+05 8.553229376973e+05 8.366422161814e+05 5.279045527640e+05
-4.122260154797e+06 2.310925312708e+06 1.327117051240e+06 7.502781430485e+05 3.216548867306e+05 8.611325146686e+04 2.587640415691e+04 5.702154235051e+04 9.311751127141e+04 9.192079203905e+04 5.877010524394e+04
-1.451358658236e+09 8.138328645858e+08 4.675526461067e+08 2.644122765463e+08 1.133468738344e+08 3.031653445839e+07 9.088546466607e+06 1.993956460500e+07 3.232735590586e+07 3.156611767601e+07 1.987170301839e+07
-3.987214678338e+11 2.203424183983e+11 3.966549419467e+10 6.090193601879e+09 9.517123291858e+08 1.175783167220e+08 1.946595395327e+07 2.718281456173e+07 3.148000994752e+07 2.408848492051e+07 1.277878362551e+07
-1.451358658236e+09 8.138328645858e+08 4.675526461067e+08 2.644122765463e+08 1.133468738344e+08 3.031653445839e+07 9.088546466607e+06 1.993956460500e+07 3.232735590586e+07 3.156611767601e+07 1.987170301839e+07
-4.122260154797e+06 2.310925312708e+06 1.327117051240e+06 7.502781430485e+05 3.216548867306e+05 8.611325146686e+04 2.587640415691e+04 5.702154235051e+04 9.311751127141e+04 9.192079203905e+04 5.877010524394e+04
-3.825342559392e+07 2.145098693553e+07 1.232482106585e+07 6.971104042855e+06 2.989141437845e+06 7.998360800997e+05 2.399348983488e+05 5.268848585027e+05 8.553229376973e+05 8.366422161814e+05 5.279045527640e+05
-1.461923045713e+07 8.197116930894e+06 4.708897394636e+06 2.662813935498e+06 1.141506797811e+06 3.053792888242e+05 9.159660799360e+04 2.011510885899e+05 3.266395157597e+05 3.197164071778e+05 2.019624172922e+05
-4.606328285588e+05 2.584199743070e+05 1.486067345773e+05 8.415976508330e+04 3.614368277863e+04 9.688811748024e+03 2.912062956422e+03 6.407073947860e+03 1.041946474616e+04 1.020675589162e+04 6.446368882565e+03
+3.629598458831e+05 2.023179751048e+05 1.163700808723e+05 6.575154262624e+04 2.810563216432e+04 7.473010194341e+03 2.290520934594e+03 5.092656668256e+03 8.213869956483e+03 7.984481575484e+03 4.997334559013e+03
+1.503637256212e+07 8.371807039851e+06 4.809725083005e+06 2.712503469647e+06 1.156605386550e+06 3.066042107629e+05 9.392390142442e+04 2.085772135615e+05 3.355962186576e+05 3.256825593127e+05 2.036831768442e+05
+3.759682832842e+07 2.092586110646e+07 1.202436171297e+07 6.781712109455e+06 2.891450725697e+06 7.662105309290e+05 2.350661103022e+05 5.223565356273e+05 8.397039333582e+05 8.138847676431e+05 5.080620347763e+05
+4.696365126134e+06 2.612411761776e+06 1.500449199819e+06 8.457609186755e+05 3.604488457400e+05 9.552208225040e+04 2.938099394008e+04 6.553732972959e+04 1.059002972298e+05 1.034918045727e+05 6.538024680711e+04
+1.455236565756e+09 8.095396039634e+08 4.651367086090e+08 2.622434495079e+08 1.117369028052e+08 2.957696502857e+07 9.082311545698e+06 2.018011673776e+07 3.237659769159e+07 3.130589833027e+07 1.948171507049e+07
+4.027948987993e+11 2.202629721514e+11 3.937324119588e+10 6.019477106115e+09 9.352276243395e+08 1.144232417171e+08 1.942790328481e+07 2.751295264005e+07 3.157020555046e+07 2.395128104657e+07 1.257377701298e+07
+1.455236565756e+09 8.095396039634e+08 4.651367086090e+08 2.622434495079e+08 1.117369028052e+08 2.957696502857e+07 9.082311545698e+06 2.018011673776e+07 3.237659769159e+07 3.130589833027e+07 1.948171507049e+07
+4.696365126134e+06 2.612411761776e+06 1.500449199819e+06 8.457609186755e+05 3.604488457400e+05 9.552208225040e+04 2.938099394008e+04 6.553732972959e+04 1.059002972298e+05 1.034918045727e+05 6.538024680711e+04
+3.759682832842e+07 2.092586110646e+07 1.202436171297e+07 6.781712109455e+06 2.891450725697e+06 7.662105309290e+05 2.350661103022e+05 5.223565356273e+05 8.397039333582e+05 8.138847676431e+05 5.080620347763e+05
+1.503637256212e+07 8.371807039851e+06 4.809725083005e+06 2.712503469647e+06 1.156605386550e+06 3.066042107629e+05 9.392390142442e+04 2.085772135615e+05 3.355962186576e+05 3.256825593127e+05 2.036831768442e+05
+3.629598458831e+05 2.023179751048e+05 1.163700808723e+05 6.575154262624e+04 2.810563216432e+04 7.473010194341e+03 2.290520934594e+03 5.092656668256e+03 8.213869956483e+03 7.984481575484e+03 4.997334559013e+03
 
diff --git a/Tests/ReferenceData/MiniExamples/scatter2d/Interference2DCenteredSquareLattice.int b/Tests/ReferenceData/MiniExamples/scatter2d/Interference2DCenteredSquareLattice.int
index 2317d0c1a57b6a6b21cdca2fed055e562c5c73ce..f7a5d9e48be2c4b1e29c953a4d34be74a3d24ecf 100644
--- a/Tests/ReferenceData/MiniExamples/scatter2d/Interference2DCenteredSquareLattice.int
+++ b/Tests/ReferenceData/MiniExamples/scatter2d/Interference2DCenteredSquareLattice.int
@@ -1,21 +1,21 @@
 # BornAgain Intensity Data
 
 # axis-0
-EquiDivision("phi_f (rad)", 11, -0.0349065850398866, 0.0349065850398866)
+EquiDivision("q_y (1/nm)", 11, 0, 140)
 
 # axis-1
-EquiDivision("alpha_f (rad)", 11, 0, 0.0349065850398866)
+EquiDivision("q_z (1/nm)", 11, 0, 70)
 
 # data
-1.742902048660e+06 1.486054881922e+06 9.637783936028e+05 6.856304762022e+05 4.547045413914e+05 2.718214301103e+05 1.425519499246e+05 6.274736419210e+04 2.103692765784e+04 4.059234031859e+03 3.419842051517e+02
-2.625244529984e+06 2.289038629508e+06 1.549365045071e+06 1.169503407032e+06 8.324245900046e+05 5.372281125411e+05 3.043933346713e+05 1.443048653515e+05 5.183080195381e+04 1.065407092018e+04 9.519497691974e+02
-2.215430124302e+05 1.953707439911e+05 1.350208342277e+05 1.047157099648e+05 7.677388163686e+04 5.100572444210e+04 2.968703160861e+04 1.443419723822e+04 5.319849938365e+03 1.125581048152e+03 1.040522188272e+02
-6.749530330491e+06 5.701949470680e+06 3.603538705448e+06 2.422044506272e+06 1.442472636219e+06 7.188539278667e+05 2.840873015226e+05 8.231473365909e+04 1.491682997484e+04 1.083222815119e+03 1.085672933975e+01
-1.014995945911e+08 8.910460778515e+07 6.107163008912e+07 4.683620100030e+07 3.384919679256e+07 2.204162719108e+07 1.243401380011e+07 5.748608377994e+06 1.959857661501e+06 3.705853615486e+05 2.946144493962e+04
-1.123067394235e+09 9.931387456565e+08 6.864528865641e+08 5.252120147670e+08 3.688653312982e+08 2.242832421346e+08 1.130767301594e+08 4.520563527944e+07 1.318836761655e+07 2.166729746039e+06 1.551432959547e+05
-1.033690739660e+08 9.184218315475e+07 6.447877284968e+07 5.126548317079e+07 3.887905408341e+07 2.689346864364e+07 1.631773751425e+07 8.219190060954e+06 3.094116766659e+06 6.553316966158e+05 5.927503999443e+04
-1.035533310513e+07 9.266586256958e+06 6.575977015963e+06 5.271173714473e+06 3.992414922515e+06 2.719658800418e+06 1.603295967994e+06 7.792731363999e+05 2.842107516543e+05 5.921304484673e+04 5.392092969355e+03
-1.092090701047e+05 9.241411917986e+04 5.877835437009e+04 4.018963761329e+04 2.483018487328e+04 1.323461929268e+04 5.843546141504e+03 2.013940091237e+03 4.812054877862e+02 5.791054433377e+01 2.432718110817e+00
-1.938363079123e+06 1.673818911438e+06 1.111160724973e+06 8.145972943803e+05 5.575799445560e+05 3.425831947485e+05 1.828904084375e+05 8.081788017886e+04 2.675114343315e+04 5.005807693398e+03 4.017081345176e+02
-1.897748664990e+06 1.621106886385e+06 1.055322925698e+06 7.550381356947e+05 5.046002462817e+05 3.046154687898e+05 1.616808990203e+05 7.220043937343e+04 2.462201037274e+04 4.846687349079e+03 4.179180278069e+02
+1.750238248732e+06 1.482628986195e+06 9.620730076208e+05 6.836654124694e+05 4.526844174442e+05 2.700918534738e+05 1.413102424864e+05 6.199802526315e+04 2.066616180912e+04 3.928710213536e+03 3.448068631392e+02
+2.518196995480e+06 2.183080131540e+06 1.482209274020e+06 1.121449878742e+06 8.003114425689e+05 5.178860555551e+05 2.940890193930e+05 1.395393350180e+05 4.998685801003e+04 1.013507523396e+04 9.490017490506e+02
+1.996939179285e+05 1.747937410427e+05 1.208558551577e+05 9.355231762270e+04 6.836922456880e+04 4.521854441160e+04 2.616788654298e+04 1.263132745510e+04 4.607834756844e+03 9.547958446615e+02 9.239432282585e+01
+7.162750166528e+06 6.017206326964e+06 3.822529493380e+06 2.584631763373e+06 1.552910244743e+06 7.839212607056e+05 3.157097089115e+05 9.415594887247e+04 1.791807687280e+04 1.443181847555e+03 2.525602454596e+01
+1.043447489872e+08 9.090402803670e+07 6.237756944652e+07 4.779624877994e+07 3.448141398143e+07 2.238943337293e+07 1.257634264813e+07 5.777244209664e+06 1.948948015184e+06 3.601462938660e+05 3.004070478840e+04
+1.134619232842e+09 9.956212861919e+08 6.889124814374e+08 5.265098156372e+08 3.689502195478e+08 2.235548476940e+08 1.121580949397e+08 4.453611085508e+07 1.285782813916e+07 2.065256408958e+06 1.553513853499e+05
+1.062542995763e+08 9.367647361843e+07 6.582974758572e+07 5.227803704109e+07 3.955970665911e+07 2.727197003440e+07 1.646610261485e+07 8.234486626027e+06 3.064517052588e+06 6.336250617393e+05 6.005637925686e+04
+1.078829719701e+07 9.575554190435e+06 6.795089184579e+06 5.435328185774e+06 4.105743441932e+06 2.788376714285e+06 1.637846522332e+06 7.920272494454e+05 2.863093298695e+05 5.839758880576e+04 5.574580843267e+03
+9.397109782320e+04 7.870595306198e+04 4.979571644298e+04 3.368189195760e+04 2.048447008211e+04 1.068604501602e+04 4.584105292681e+03 1.518674676653e+03 3.423593586991e+02 3.727633443669e+01 1.396943676951e+00
+1.824768958028e+06 1.565725430391e+06 1.041351791214e+06 7.638251610613e+05 5.229138373415e+05 3.211491046525e+05 1.711839720360e+05 7.537064380080e+04 2.475129563990e+04 4.540428627070e+03 3.790973853245e+02
+1.862384352011e+06 1.579823641329e+06 1.028016991793e+06 7.336364730029e+05 4.885768180832e+05 2.936570147911e+05 1.550367458090e+05 6.876623966698e+04 2.322095340056e+04 4.482130960495e+03 4.004526253291e+02
 
diff --git a/Tests/ReferenceData/MiniExamples/scatter2d/Interference2DParacrystal.int b/Tests/ReferenceData/MiniExamples/scatter2d/Interference2DParacrystal.int
index 421091b16c9fe555f343099244b478fb952f54e5..c598b68480a3a45bc1bf87fc3ab0010f50ddeae8 100644
--- a/Tests/ReferenceData/MiniExamples/scatter2d/Interference2DParacrystal.int
+++ b/Tests/ReferenceData/MiniExamples/scatter2d/Interference2DParacrystal.int
@@ -1,21 +1,21 @@
 # BornAgain Intensity Data
 
 # axis-0
-EquiDivision("phi_f (rad)", 11, -0.0349065850398866, 0.0349065850398866)
+EquiDivision("q_y (1/nm)", 11, 0, 140)
 
 # axis-1
-EquiDivision("alpha_f (rad)", 11, 0, 0.0349065850398866)
+EquiDivision("q_z (1/nm)", 11, 0, 70)
 
 # data
-6.344411523187e+06 3.557374826453e+06 2.043573881737e+06 1.155617447943e+06 4.953946669080e+05 1.325276562976e+05 3.974947934224e+04 8.728634167416e+04 1.417249296015e+05 1.386986369700e+05 8.759460933976e+04
-5.463437570907e+06 3.063843578115e+06 1.760543076456e+06 9.959469293718e+05 4.271395592839e+05 1.143222461945e+05 3.430396999342e+04 7.535275529820e+04 1.223638558291e+05 1.197305436369e+05 7.557186107552e+04
-2.674980982272e+07 1.499883205176e+07 8.616226152321e+06 4.872414824618e+06 2.088793113490e+06 5.588343594626e+05 1.676366955532e+05 3.682015433883e+05 5.980559469189e+05 5.855911437908e+05 3.700962622757e+05
-5.065121193022e+07 2.840314478931e+07 1.631903701883e+07 9.229884962116e+06 3.957259142583e+06 1.058660456804e+06 3.174596395736e+05 6.967143283538e+05 1.130019243640e+06 1.103948012516e+06 6.953650395313e+05
-1.192305845405e+08 6.685593108837e+07 3.840884589793e+07 2.172238330565e+07 9.313800374718e+06 2.492324558395e+06 7.478344357655e+05 1.643106215187e+06 2.669925587914e+06 2.615585068935e+06 1.654068189583e+06
-7.433720498473e+13 1.296165869140e+13 9.573171525272e+10 9.854120335143e+09 1.707337023258e+09 2.264519729880e+08 3.556035899847e+07 4.162884350840e+07 3.829699286053e+07 2.406586881292e+07 1.102026806595e+07
-1.192305845405e+08 6.685593108837e+07 3.840884589793e+07 2.172238330565e+07 9.313800374718e+06 2.492324558395e+06 7.478344357655e+05 1.643106215187e+06 2.669925587914e+06 2.615585068935e+06 1.654068189583e+06
-5.065121193022e+07 2.840314478931e+07 1.631903701883e+07 9.229884962116e+06 3.957259142583e+06 1.058660456804e+06 3.174596395736e+05 6.967143283538e+05 1.130019243640e+06 1.103948012516e+06 6.953650395313e+05
-2.674980982272e+07 1.499883205176e+07 8.616226152321e+06 4.872414824618e+06 2.088793113490e+06 5.588343594626e+05 1.676366955532e+05 3.682015433883e+05 5.980559469189e+05 5.855911437908e+05 3.700962622757e+05
-5.463437570907e+06 3.063843578115e+06 1.760543076456e+06 9.959469293718e+05 4.271395592839e+05 1.143222461945e+05 3.430396999342e+04 7.535275529820e+04 1.223638558291e+05 1.197305436369e+05 7.557186107552e+04
-6.344411523187e+06 3.557374826453e+06 2.043573881737e+06 1.155617447943e+06 4.953946669080e+05 1.325276562976e+05 3.974947934224e+04 8.728634167416e+04 1.417249296015e+05 1.386986369700e+05 8.759460933976e+04
+6.501723457540e+06 3.621955318711e+06 2.080861889573e+06 1.173782074901e+06 5.007122448799e+05 1.328313060730e+05 4.061852795040e+04 9.011310802890e+04 1.450849540992e+05 1.408813367266e+05 8.816937588714e+04
+5.228668039902e+06 2.911600107978e+06 1.673230461569e+06 9.440068762281e+05 4.027055401129e+05 1.068026516156e+05 3.273070230141e+04 7.270408995862e+04 1.169814691260e+05 1.134879007232e+05 7.091826381856e+04
+2.755692965068e+07 1.533636413054e+07 8.811032093884e+06 4.968319721114e+06 2.117831812684e+06 5.611208024873e+05 1.721439376840e+05 3.826164050851e+05 6.154123014436e+05 5.971023890417e+05 3.733460245603e+05
+4.980049422055e+07 2.770980873627e+07 1.592238965315e+07 8.978716272624e+06 3.826829188112e+06 1.013436646972e+06 3.111001443195e+05 6.912552205047e+05 1.109757271820e+06 1.073828966521e+06 6.688210893487e+05
+1.207640702649e+08 6.717906525378e+07 3.859868187908e+07 2.176315942734e+07 9.274841535900e+06 2.456254933882e+06 7.549294382842e+05 1.679883818612e+06 2.701317832251e+06 2.620614931140e+06 1.638299895324e+06
+7.665406647292e+13 1.198027000191e+13 1.407053384554e+11 1.804928802816e+10 3.025321371232e+09 3.392358945113e+08 4.192979468004e+07 3.831166759902e+07 3.341141381809e+07 2.297155667360e+07 1.083317755553e+07
+1.207640702649e+08 6.717906525378e+07 3.859868187908e+07 2.176315942734e+07 9.274841535900e+06 2.456254933882e+06 7.549294382842e+05 1.679883818612e+06 2.701317832251e+06 2.620614931140e+06 1.638299895324e+06
+4.980049422055e+07 2.770980873627e+07 1.592238965315e+07 8.978716272624e+06 3.826829188112e+06 1.013436646972e+06 3.111001443195e+05 6.912552205047e+05 1.109757271820e+06 1.073828966521e+06 6.688210893487e+05
+2.755692965068e+07 1.533636413054e+07 8.811032093884e+06 4.968319721114e+06 2.117831812684e+06 5.611208024873e+05 1.721439376840e+05 3.826164050851e+05 6.154123014436e+05 5.971023890417e+05 3.733460245603e+05
+5.228668039902e+06 2.911600107978e+06 1.673230461569e+06 9.440068762281e+05 4.027055401129e+05 1.068026516156e+05 3.273070230141e+04 7.270408995862e+04 1.169814691260e+05 1.134879007232e+05 7.091826381856e+04
+6.501723457540e+06 3.621955318711e+06 2.080861889573e+06 1.173782074901e+06 5.007122448799e+05 1.328313060730e+05 4.061852795040e+04 9.011310802890e+04 1.450849540992e+05 1.408813367266e+05 8.816937588714e+04
 
diff --git a/Tests/ReferenceData/MiniExamples/scatter2d/Interference2DRotatedSquareLattice.int b/Tests/ReferenceData/MiniExamples/scatter2d/Interference2DRotatedSquareLattice.int
index 8f44c245a9204767265d0608098fcbd149c7f50b..e20d91452a18d571474ea27f72072c9ee2322124 100644
--- a/Tests/ReferenceData/MiniExamples/scatter2d/Interference2DRotatedSquareLattice.int
+++ b/Tests/ReferenceData/MiniExamples/scatter2d/Interference2DRotatedSquareLattice.int
@@ -1,21 +1,21 @@
 # BornAgain Intensity Data
 
 # axis-0
-EquiDivision("phi_f (rad)", 11, -0.0349065850398866, 0.0349065850398866)
+EquiDivision("q_y (1/nm)", 11, 0, 140)
 
 # axis-1
-EquiDivision("alpha_f (rad)", 11, 0, 0.0349065850398866)
+EquiDivision("q_z (1/nm)", 11, 0, 70)
 
 # data
-3.023784649065e+05 2.632953402207e+05 1.779409280662e+05 1.343680396899e+05 9.611066702619e+04 6.277041495513e+04 3.631240475202e+04 1.775031702330e+04 6.639418475542e+03 1.434509506744e+03 1.358300284706e+02
-3.286877878771e+05 2.899837464013e+05 2.010807763501e+05 1.576006630831e+05 1.181713367076e+05 8.154163899732e+04 5.010532285318e+04 2.608288515172e+04 1.038667601349e+04 2.382030065585e+03 2.381346080258e+02
-4.019948943090e+04 3.560906528181e+04 2.489689153500e+04 1.976632107875e+04 1.509075945233e+04 1.066400701186e+04 6.753987481597e+03 3.649365365897e+03 1.519745931823e+03 3.673150694898e+02 3.900447454303e+01
-2.625996093281e+06 2.318866603863e+06 1.611243298658e+06 1.267480698803e+06 9.560821776740e+05 6.658184354683e+05 4.146685236516e+05 2.199699620931e+05 8.987183667346e+04 2.131246512017e+04 2.223885984028e+03
-2.796948518767e+07 2.452249844200e+07 1.679092658765e+07 1.290869045665e+07 9.428327792397e+06 6.291978449928e+06 3.712508610705e+06 1.843154686284e+06 6.958388113170e+05 1.505908610057e+05 1.416871690387e+04
-2.729656538289e+08 2.413947051063e+08 1.677624511687e+08 1.311075249056e+08 9.681888774071e+07 6.442140342374e+07 3.704398552130e+07 1.739331698726e+07 6.004867678623e+06 1.150239821984e+06 9.316582728016e+04
-2.869717012785e+07 2.558912760035e+07 1.812240796478e+07 1.465177906437e+07 1.143525065118e+07 8.274095705977e+06 5.356813210618e+06 2.940716129057e+06 1.229526701247e+06 2.928046062864e+05 2.984057031736e+04
-2.694565025270e+06 2.387503188130e+06 1.670160297682e+06 1.327011163368e+06 1.014080303043e+06 7.172987308028e+05 4.545932259817e+05 2.455727660742e+05 1.020598256688e+05 2.454006084861e+04 2.579403713295e+03
-3.861062120609e+04 3.412249582078e+04 2.374709953350e+04 1.872241183894e+04 1.416094119336e+04 9.890152780826e+03 6.175480963304e+03 3.281201365094e+03 1.339952837966e+03 3.166416584466e+02 3.276021002661e+01
-3.235428157081e+05 2.853204483796e+05 1.976755422988e+05 1.547305234934e+05 1.158175455656e+05 7.974112650409e+04 4.886513612805e+04 2.535221663534e+04 1.005467051824e+04 2.294671593296e+03 2.281124933465e+02
-1.011858396501e+06 8.923485875441e+05 6.175797384103e+05 4.813027888772e+05 3.563690714215e+05 2.402034251352e+05 1.420202972737e+05 6.980313242972e+04 2.568373778005e+04 5.321179818247e+03 4.704604142401e+02
+3.603476949254e+05 3.111559652307e+05 2.096046920925e+05 1.571908642555e+05 1.113745049077e+05 7.187303089891e+04 4.097821401613e+04 1.968523481244e+04 7.205536696572e+03 1.507597487783e+03 1.460373388021e+02
+3.632583604334e+05 3.183224664690e+05 2.209596971776e+05 1.730392654995e+05 1.295194037404e+05 8.910886174787e+04 5.450072647049e+04 2.816514612932e+04 1.108195155828e+04 2.480456796289e+03 2.568206669456e+02
+3.737119213751e+04 3.286254720977e+04 2.299654648501e+04 1.823770036339e+04 1.389672193465e+04 9.791883156605e+03 6.175576491453e+03 3.315734728219e+03 1.366211256057e+03 3.226905096626e+02 3.571489168645e+01
+2.605540121891e+06 2.283716635145e+06 1.588754023585e+06 1.248979187389e+06 9.408569426222e+05 6.538246582786e+05 4.058772678541e+05 2.141949526315e+05 8.670221846456e+04 2.011692999373e+04 2.198815904265e+03
+2.786785262184e+07 2.425685681774e+07 1.664212590771e+07 1.279971361898e+07 9.348894413199e+06 6.235771385520e+06 3.674012610153e+06 1.818115523641e+06 6.813684435045e+05 1.445275071668e+05 1.429949837913e+04
+2.757732112162e+08 2.419994865198e+08 1.683761793168e+08 1.314722084170e+08 9.691975999162e+07 6.431405642744e+07 3.683359573588e+07 1.718968316017e+07 5.874260329327e+06 1.099829174236e+06 9.352808826754e+04
+2.855726142092e+07 2.525880176521e+07 1.789352152707e+07 1.443590133429e+07 1.122883253621e+07 8.086659133463e+06 5.202296311553e+06 2.831036585223e+06 1.168178167277e+06 2.710778631172e+05 2.889627044155e+04
+2.671117909059e+06 2.348865704636e+06 1.644737194633e+06 1.305499140799e+06 9.958397978306e+05 7.025212367117e+05 4.435233386240e+05 2.382205523293e+05 9.804434403267e+04 2.306098373031e+04 2.539710287700e+03
+3.596997295338e+04 3.156175268286e+04 2.199065327280e+04 1.732706032024e+04 1.308935503583e+04 9.124449210125e+03 5.681335814848e+03 3.005365519079e+03 1.217646878170e+03 2.822175795749e+02 3.058561007056e+01
+3.456571873578e+05 3.025196500344e+05 2.094788906274e+05 1.634759941789e+05 1.218294458465e+05 8.340337927893e+04 5.074362426254e+04 2.608733200702e+04 1.021544222577e+04 2.277491271590e+03 2.351837876872e+02
+1.144669439716e+06 9.985262063120e+05 6.853157685942e+05 5.263539092646e+05 3.821417181106e+05 2.514155639699e+05 1.445512170020e+05 6.889706645081e+04 2.452163517540e+04 4.879189510092e+03 4.396643399088e+02
 
diff --git a/Tests/ReferenceData/MiniExamples/scatter2d/Interference2DSquareFiniteLattice.int b/Tests/ReferenceData/MiniExamples/scatter2d/Interference2DSquareFiniteLattice.int
index 586c0fc73726ed82192e0b826f0f58ab94be8568..d5b42438b5c49d7b8f9bc681d4ba6aba4e96a378 100644
--- a/Tests/ReferenceData/MiniExamples/scatter2d/Interference2DSquareFiniteLattice.int
+++ b/Tests/ReferenceData/MiniExamples/scatter2d/Interference2DSquareFiniteLattice.int
@@ -1,21 +1,21 @@
 # BornAgain Intensity Data
 
 # axis-0
-EquiDivision("phi_f (rad)", 11, -0.0349065850398866, 0.0349065850398866)
+EquiDivision("q_y (1/nm)", 11, 0, 140)
 
 # axis-1
-EquiDivision("alpha_f (rad)", 11, 0, 0.0349065850398866)
+EquiDivision("q_z (1/nm)", 11, 0, 70)
 
 # data
-3.009434046132e+05 2.661739466107e+05 1.855944896807e+05 1.466467432981e+05 1.111265902920e+05 7.788033369193e+04 4.876199900518e+04 2.599034944449e+04 1.064290012742e+04 2.519244241151e+03 2.606986609593e+02
-4.917567887966e+05 4.349120047828e+05 3.030873264176e+05 2.393654168233e+05 1.814666620555e+05 1.270918520552e+05 7.958667116986e+04 4.240434507467e+04 1.736155426630e+04 4.109746530798e+03 4.253525969650e+02
-8.342056275391e+04 7.335545026372e+04 5.101450014666e+04 4.064112224222e+04 3.065681102860e+04 2.147140604104e+04 1.341336950300e+04 7.158258087600e+03 2.925539524784e+03 6.907429498948e+02 7.127135288635e+01
-3.178641489328e+06 2.778710274480e+06 1.927366820539e+06 1.538498226140e+06 1.158392068522e+06 8.107773243949e+05 5.062663789129e+05 2.704746621076e+05 1.106031929212e+05 2.614011812171e+04 2.702948806535e+03
-2.384705508950e+07 1.875621779202e+07 8.661994282607e+06 2.626252279804e+06 1.450866957686e+06 1.074499650794e+06 6.134635014358e+05 3.065134276457e+05 1.277869571388e+05 3.033584520793e+04 3.122506070576e+03
-5.542674278783e+10 4.895157772466e+10 2.772338207401e+10 8.649720953704e+09 3.821467310831e+07 6.774411337082e+08 9.249051451323e+06 2.799288910965e+07 1.510581783232e+07 2.440764216718e+06 1.721000337454e+05
-2.384705508950e+07 1.875621779202e+07 8.661994282607e+06 2.626252279804e+06 1.450866957686e+06 1.074499650794e+06 6.134635014358e+05 3.065134276457e+05 1.277869571388e+05 3.033584520793e+04 3.122506070576e+03
-3.178641489328e+06 2.778710274480e+06 1.927366820539e+06 1.538498226140e+06 1.158392068522e+06 8.107773243949e+05 5.062663789129e+05 2.704746621076e+05 1.106031929212e+05 2.614011812171e+04 2.702948806535e+03
-8.342056275391e+04 7.335545026372e+04 5.101450014666e+04 4.064112224222e+04 3.065681102860e+04 2.147140604104e+04 1.341336950300e+04 7.158258087600e+03 2.925539524784e+03 6.907429498948e+02 7.127135288635e+01
-4.917567887966e+05 4.349120047828e+05 3.030873264176e+05 2.393654168233e+05 1.814666620555e+05 1.270918520552e+05 7.958667116986e+04 4.240434507467e+04 1.736155426630e+04 4.109746530798e+03 4.253525969650e+02
-3.009434046132e+05 2.661739466107e+05 1.855944896807e+05 1.466467432981e+05 1.111265902920e+05 7.788033369193e+04 4.876199900518e+04 2.599034944449e+04 1.064290012742e+04 2.519244241151e+03 2.606986609593e+02
+2.961735519434e+05 2.603001796677e+05 1.815842982490e+05 1.433687179214e+05 1.085915820760e+05 7.593434729076e+04 4.744105002872e+04 2.518443491445e+04 1.024007654192e+04 2.383584292131e+03 2.563010697772e+02
+5.014050874199e+05 4.405328994371e+05 3.073719537374e+05 2.424791594389e+05 1.835886901506e+05 1.283334543829e+05 8.013575988039e+04 4.250426126846e+04 1.726760626472e+04 4.012266614545e+03 4.332186556490e+02
+7.709373904131e+04 6.763193136324e+04 4.718128523370e+04 3.732505896778e+04 2.823656258526e+04 1.974500212232e+04 1.231873408172e+04 6.536537993138e+03 2.651055241342e+03 6.138612217387e+02 6.629527327867e+01
+3.659900029512e+06 2.886230953021e+06 1.934358634976e+06 1.651910877085e+06 1.177838587805e+06 8.191197259268e+05 5.019145244089e+05 2.686261445209e+05 1.085007205032e+05 2.504321253262e+04 2.713751242190e+03
+2.088493300867e+07 1.636305161252e+07 7.671633207088e+06 2.478456261341e+06 1.444977422517e+06 1.050647437534e+06 6.101218416512e+05 3.045250336130e+05 1.253853134007e+05 2.915435442381e+04 3.155864566498e+03
+5.599801360047e+10 4.906404948441e+10 2.774447313592e+10 8.542567526343e+09 2.877064907135e+07 6.733203166043e+08 1.226479577462e+07 2.470700294473e+07 1.425053539371e+07 2.330742168286e+06 1.721253134294e+05
+2.088493300867e+07 1.636305161252e+07 7.671633207088e+06 2.478456261341e+06 1.444977422517e+06 1.050647437534e+06 6.101218416512e+05 3.045250336130e+05 1.253853134007e+05 2.915435442381e+04 3.155864566498e+03
+3.659900029512e+06 2.886230953021e+06 1.934358634976e+06 1.651910877085e+06 1.177838587805e+06 8.191197259268e+05 5.019145244089e+05 2.686261445209e+05 1.085007205032e+05 2.504321253262e+04 2.713751242190e+03
+7.709373904131e+04 6.763193136324e+04 4.718128523370e+04 3.732505896778e+04 2.823656258526e+04 1.974500212232e+04 1.231873408172e+04 6.536537993138e+03 2.651055241342e+03 6.138612217387e+02 6.629527327867e+01
+5.014050874199e+05 4.405328994371e+05 3.073719537374e+05 2.424791594389e+05 1.835886901506e+05 1.283334543829e+05 8.013575988039e+04 4.250426126846e+04 1.726760626472e+04 4.012266614545e+03 4.332186556490e+02
+2.961735519434e+05 2.603001796677e+05 1.815842982490e+05 1.433687179214e+05 1.085915820760e+05 7.593434729076e+04 4.744105002872e+04 2.518443491445e+04 1.024007654192e+04 2.383584292131e+03 2.563010697772e+02
 
diff --git a/Tests/ReferenceData/MiniExamples/scatter2d/Mesocrystal.int b/Tests/ReferenceData/MiniExamples/scatter2d/Mesocrystal.int
index 74453ec4d728f2a71948d094d35f6bc1e19c0b8d..1543c49b1abe17e2c373ec0c1b4b9e061905ffaf 100644
--- a/Tests/ReferenceData/MiniExamples/scatter2d/Mesocrystal.int
+++ b/Tests/ReferenceData/MiniExamples/scatter2d/Mesocrystal.int
@@ -1,21 +1,21 @@
 # BornAgain Intensity Data
 
 # axis-0
-EquiDivision("phi_f (rad)", 11, -0.0349065850398866, 0.0349065850398866)
+EquiDivision("q_y (1/nm)", 11, 0, 140)
 
 # axis-1
-EquiDivision("alpha_f (rad)", 11, 0, 0.0349065850398866)
+EquiDivision("q_z (1/nm)", 11, 0, 70)
 
 # data
-1.303510290230e+06 4.177697072434e+06 5.808138402230e+05 2.623460230461e+05 4.006078357293e+05 4.305687984385e+06 4.967437402472e+05 4.857711776009e+06 1.127796487409e+05 2.607271605487e+04 1.929491836161e+04
-4.232626582691e+05 2.104018865113e+06 2.218531524747e+05 7.370118798152e+04 1.109910503246e+05 5.717468290822e+05 9.737827684165e+04 5.990154310876e+05 1.408742610878e+04 7.640185297262e+02 4.966446319274e+04
-8.914312543160e+08 3.153119130888e+09 4.068983624231e+08 1.785899712628e+08 2.886201123940e+08 1.812247006840e+09 2.848979316709e+08 2.477768326387e+09 5.416965968139e+07 7.397268102761e+06 2.065245723606e+07
-7.892729839694e+06 2.652503001062e+07 3.572562899109e+06 1.590472829815e+06 2.534581178293e+06 2.417247695763e+07 2.368068037486e+06 3.081163534311e+07 6.127323555253e+05 1.289844382256e+05 1.592379367891e+05
-1.635744366395e+07 5.888203106229e+07 7.785264582813e+06 3.764960302804e+06 6.635236707669e+06 7.411425246100e+07 8.443046030281e+06 9.279645369389e+07 1.831685865918e+06 6.636196653914e+05 1.884836008337e+05
-6.099779681435e+09 1.982088056538e+10 2.900454877316e+09 1.393097999335e+09 2.348122573641e+09 2.140609133846e+10 2.733964590954e+09 2.937036902728e+10 6.188802484479e+08 2.036937255170e+08 4.644053502656e+07
-1.635744366395e+07 5.888203106229e+07 7.785264582813e+06 3.764960302804e+06 6.635236707669e+06 7.411425246100e+07 8.443046030281e+06 9.279645369389e+07 1.831685865918e+06 6.636196653914e+05 1.884836008337e+05
-7.892729839694e+06 2.652503001062e+07 3.572562899109e+06 1.590472829815e+06 2.534581178293e+06 2.417247695763e+07 2.368068037486e+06 3.081163534311e+07 6.127323555253e+05 1.289844382256e+05 1.592379367891e+05
-8.914312543160e+08 3.153119130888e+09 4.068983624231e+08 1.785899712628e+08 2.886201123940e+08 1.812247006840e+09 2.848979316709e+08 2.477768326387e+09 5.416965968139e+07 7.397268102761e+06 2.065245723606e+07
-4.232626582691e+05 2.104018865113e+06 2.218531524747e+05 7.370118798152e+04 1.109910503246e+05 5.717468290822e+05 9.737827684165e+04 5.990154310876e+05 1.408742610878e+04 7.640185297262e+02 4.966446319274e+04
-1.303510290230e+06 4.177697072434e+06 5.808138402230e+05 2.623460230461e+05 4.006078357293e+05 4.305687984385e+06 4.967437402472e+05 4.857711776009e+06 1.127796487409e+05 2.607271605487e+04 1.929491836161e+04
+1.192372018104e+06 3.970431486171e+06 5.590956532517e+05 2.508820651610e+05 3.467035388966e+05 3.547164133698e+06 4.571172482591e+05 4.242611873786e+06 8.724898116072e+04 2.363205311231e+04 2.025146954693e+04
+1.351924442983e+05 8.526397868512e+05 8.455607611596e+04 2.314522119659e+04 2.975228001213e+04 8.236758429818e+04 2.309692964768e+04 6.877709594286e+04 2.772022109475e+03 2.318142650662e+03 3.646008974755e+04
+8.820632791067e+08 3.217160731625e+09 4.310986499383e+08 1.907145789302e+08 2.746087404968e+08 2.104508911152e+09 2.992333168047e+08 2.472262448384e+09 4.789267996924e+07 9.200344135822e+06 2.135831283078e+07
+7.414976319632e+06 2.584971127534e+07 3.601900722301e+06 1.619553443402e+06 2.279646200620e+06 2.151164174209e+07 2.398397375701e+06 2.904414923999e+07 5.021545406447e+05 1.407355109409e+05 1.534503673195e+05
+1.602833491406e+07 5.413600147766e+07 8.174399311729e+06 4.044033064052e+06 6.061288539204e+06 6.950002611254e+07 8.861914323721e+06 9.265302222701e+07 1.570408359474e+06 7.221516076860e+05 1.690751431046e+05
+5.796449676787e+09 1.945590256442e+10 2.954150332299e+09 1.450020225539e+09 2.100546016137e+09 1.928649766356e+10 2.795155796696e+09 2.820123626408e+10 5.150655605522e+08 2.175435002532e+08 3.692063776241e+07
+1.602833491406e+07 5.413600147766e+07 8.174399311729e+06 4.044033064052e+06 6.061288539204e+06 6.950002611254e+07 8.861914323721e+06 9.265302222701e+07 1.570408359474e+06 7.221516076860e+05 1.690751431046e+05
+7.414976319631e+06 2.584971127534e+07 3.601900722301e+06 1.619553443402e+06 2.279646200620e+06 2.151164174209e+07 2.398397375701e+06 2.904414923999e+07 5.021545406447e+05 1.407355109409e+05 1.534503673195e+05
+8.820632791067e+08 3.217160731625e+09 4.310986499383e+08 1.907145789302e+08 2.746087404968e+08 2.104508911152e+09 2.992333168047e+08 2.472262448384e+09 4.789267996924e+07 9.200344135822e+06 2.135831283078e+07
+1.351924442983e+05 8.526397868513e+05 8.455607611597e+04 2.314522119659e+04 2.975228001213e+04 8.236758429819e+04 2.309692964768e+04 6.877709594288e+04 2.772022109476e+03 2.318142650662e+03 3.646008974755e+04
+1.192372018104e+06 3.970431486171e+06 5.590956532518e+05 2.508820651610e+05 3.467035388966e+05 3.547164133698e+06 4.571172482591e+05 4.242611873786e+06 8.724898116072e+04 2.363205311231e+04 2.025146954693e+04
 
diff --git a/Tests/ReferenceData/MiniExamples/scatter2d/Mesocrystal2.int b/Tests/ReferenceData/MiniExamples/scatter2d/Mesocrystal2.int
index 171c8ecd8d14e9f047e5b76fc3f22ec2f6ba51fa..28fa82e20b4433f5b092a66dbb18e293fab54b80 100644
--- a/Tests/ReferenceData/MiniExamples/scatter2d/Mesocrystal2.int
+++ b/Tests/ReferenceData/MiniExamples/scatter2d/Mesocrystal2.int
@@ -1,21 +1,21 @@
 # BornAgain Intensity Data
 
 # axis-0
-EquiDivision("phi_f (rad)", 11, -0.0349065850398866, 0.0349065850398866)
+EquiDivision("q_y (1/nm)", 11, 0, 140)
 
 # axis-1
-EquiDivision("alpha_f (rad)", 11, 0, 0.0349065850398866)
+EquiDivision("q_z (1/nm)", 11, 0, 70)
 
 # data
-4.436644007083e+04 8.334209313400e+05 4.568397812536e+05 1.476106680240e+05 2.239987911886e+06 3.931060048401e+05 3.826552691854e+04 7.349633725458e+05 1.149248589732e+05 4.133073127208e+04 2.370307131100e+05
-3.284896156367e+06 1.652987373172e+06 3.535576074955e+06 1.997967673495e+06 4.192887208447e+06 2.105003777029e+06 1.516579976143e+06 9.157013054932e+05 2.669535528956e+05 4.644697466820e+04 2.690750941925e+05
-7.536801132245e+08 1.796685003175e+07 1.658522374590e+09 3.454301185747e+08 6.569256060252e+07 1.008857543891e+09 1.794161725749e+08 4.740221097866e+07 2.176657491411e+08 6.868537554135e+06 2.159706591199e+06
-1.145154103775e+08 2.538841590700e+07 1.962625801833e+07 2.170241092685e+08 1.892133921321e+07 1.184136306383e+07 3.298015803372e+07 1.412057211698e+06 1.906553527482e+06 1.351562256408e+06 2.578928239060e+05
-8.151425849199e+07 1.381553130257e+09 5.609633830561e+07 9.228151687395e+07 3.313807076240e+08 4.687646783855e+06 3.135721092977e+06 1.419954435722e+07 6.285714514632e+05 4.614185448109e+04 8.907238878306e+05
-1.932601004500e+10 3.367532430534e+11 3.565724247464e+10 7.785158655455e+09 1.090732819926e+11 3.198360143390e+09 2.971444973891e+09 4.897401061274e+09 3.472708442274e+08 9.535602411608e+07 2.591666732238e+08
-1.097003544803e+08 1.246573380152e+09 3.226550648476e+08 4.522315451904e+07 4.111982837161e+08 1.569860344043e+07 9.319587414349e+05 1.597816439206e+07 6.743008306019e+05 7.640050312066e+04 8.215961527091e+05
-1.263672630025e+08 3.445984000759e+07 3.812168279708e+08 1.068720100925e+07 7.605946363611e+06 5.454023924723e+06 2.570836583146e+05 1.458087959520e+05 1.341110715262e+06 8.772069507789e+04 1.111297122436e+05
-6.996930720433e+08 3.197074554405e+08 7.195555723469e+07 2.156114550711e+09 6.794545492161e+07 1.575354561764e+07 1.319843063991e+08 1.359250818988e+08 1.373960470809e+07 1.371102949754e+08 1.775493305895e+07
-2.818495059425e+06 7.570291925937e+05 1.932508601634e+06 9.078997210256e+06 1.872052910959e+06 1.218121404270e+06 3.046531822811e+05 3.152434862146e+06 2.384155475962e+05 6.736402747883e+05 5.150577969313e+05
-4.558410791227e+04 7.338896076651e+05 6.772226324363e+05 1.630400450385e+05 2.333064201185e+06 4.405047460452e+05 2.795253453614e+04 1.026044680938e+06 2.904986297757e+05 9.888777782904e+04 2.809206285787e+05
+4.611817217678e+04 8.890744581888e+05 4.451641001971e+05 1.452992689465e+05 2.182748035866e+06 3.810256066379e+05 3.281822255429e+04 7.027562592393e+05 1.088841205212e+05 4.131144353950e+04 2.345943695297e+05
+3.205623436714e+06 2.188644154848e+06 2.930301953389e+06 1.806546089599e+06 4.942183919958e+06 1.706756730018e+06 1.406828117820e+06 1.204702688855e+06 2.047926354517e+05 5.612308237634e+04 3.493357742631e+05
+7.469790043131e+08 1.900778093442e+07 1.556010190597e+09 3.100132347099e+08 6.852328247867e+07 9.366892163400e+08 1.608885369219e+08 4.588298408728e+07 2.066179246506e+08 5.715227138423e+06 2.482585011251e+06
+1.389316053605e+08 2.772601687760e+07 2.100940265591e+07 2.339904918460e+08 2.002526442279e+07 1.184151589033e+07 3.490496157927e+07 1.396111704759e+06 1.892784574244e+06 1.458167272943e+06 2.581345453791e+05
+8.455841197404e+07 1.426499253437e+09 5.690988480760e+07 1.079297408183e+08 3.174229769544e+08 3.876161628436e+06 4.325921438833e+06 1.357347621278e+07 5.161295516921e+05 7.963471026600e+04 8.860332253358e+05
+1.754176202888e+10 3.339821090977e+11 3.351988091585e+10 7.986861402416e+09 1.027749376921e+11 3.027424141790e+09 2.811492323877e+09 4.660435125209e+09 3.058565800510e+08 9.983684771810e+07 2.568558010565e+08
+1.158687342562e+08 1.292449984613e+09 3.548703024961e+08 4.647088997410e+07 3.985377129546e+08 1.566097573740e+07 1.026589797490e+06 1.572225028097e+07 5.082986006327e+05 9.992749828755e+04 8.264572828052e+05
+1.514277667136e+08 3.951924287019e+07 4.201855080543e+08 1.285444440578e+07 7.658943905177e+06 5.823028044793e+06 3.007798125039e+05 1.236863549975e+05 1.467952540758e+06 1.233002763875e+05 1.327875453155e+05
+7.001943971253e+08 2.939573219180e+08 6.799149022488e+07 2.010315579593e+09 6.284451981605e+07 1.579012715654e+07 1.222707936887e+08 1.224408116855e+08 1.395904673347e+07 1.316194836432e+08 1.608706806369e+07
+2.785744498063e+06 9.696253835176e+05 2.044830860564e+06 8.375568846683e+06 2.555136889336e+06 1.355489772060e+06 2.619644592147e+05 3.468282863972e+06 3.103263856960e+05 6.860053362353e+05 6.094854350139e+05
+4.762542000513e+04 7.971986503288e+05 6.485665854727e+05 1.644834975498e+05 2.320070625359e+06 3.990473699169e+05 3.180559562921e+04 9.778670039476e+05 2.970454049509e+05 1.031556958863e+05 2.844684286951e+05
 
diff --git a/Tests/ReferenceData/MiniExamples/scatter2d/RotatedPyramids.int b/Tests/ReferenceData/MiniExamples/scatter2d/RotatedPyramids.int
index 2128b2b182573810bbe5c2af16392e1f15f2f224..a59f832b9246a77b71a358785c4361fe58fc54b6 100644
--- a/Tests/ReferenceData/MiniExamples/scatter2d/RotatedPyramids.int
+++ b/Tests/ReferenceData/MiniExamples/scatter2d/RotatedPyramids.int
@@ -1,21 +1,21 @@
 # BornAgain Intensity Data
 
 # axis-0
-EquiDivision("phi_f (rad)", 11, -0.0349065850398866, 0.0349065850398866)
+EquiDivision("q_y (1/nm)", 11, 0, 140)
 
 # axis-1
-EquiDivision("alpha_f (rad)", 11, 0, 0.0349065850398866)
+EquiDivision("q_z (1/nm)", 11, 0, 70)
 
 # data
-4.907261694588e+05 2.749778919001e+05 1.892395676722e+05 1.459766320139e+05 1.081031027559e+05 7.808586722109e+04 5.858684312285e+04 4.877105867522e+04 4.598937262101e+04 4.739195486320e+04 5.007854839157e+04
-2.003970748453e+06 1.265941199958e+06 6.980608807556e+05 4.058698988591e+05 2.556083640993e+05 2.461964223327e+05 3.207156994071e+05 3.929153926465e+05 3.995612911899e+05 3.277057848012e+05 2.095864579143e+05
-4.606175444733e+06 1.792949746461e+06 9.094839724468e+05 3.974686274335e+05 1.692608881614e+05 2.915601880170e+05 6.024145341778e+05 8.308731448746e+05 8.180333211384e+05 5.941633552116e+05 3.038558802683e+05
-5.649993256728e+07 2.758238809013e+07 1.879683846208e+07 1.351651006976e+07 8.285117055453e+06 4.018612605720e+06 1.404989229829e+06 2.728639737607e+05 7.877050032651e+03 5.833451960326e+04 1.208412135149e+05
-6.738414278046e+08 4.961183789833e+08 3.064505990088e+08 2.031264576408e+08 1.228514708944e+08 6.812835868182e+07 3.853966610640e+07 2.672159959804e+07 2.294793679781e+07 2.021130658282e+07 1.614413436578e+07
-1.523109771332e+09 1.238613638683e+09 7.818787978807e+08 5.408510095962e+08 3.542539830186e+08 2.237059085346e+08 1.471680498359e+08 1.093443597976e+08 9.045836835255e+07 7.615428115813e+07 6.132140693513e+07
-6.738414278046e+08 4.961183789833e+08 3.064505990088e+08 2.031264576408e+08 1.228514708944e+08 6.812835868182e+07 3.853966610640e+07 2.672159959804e+07 2.294793679781e+07 2.021130658282e+07 1.614413436578e+07
-5.649993256728e+07 2.758238809013e+07 1.879683846208e+07 1.351651006976e+07 8.285117055453e+06 4.018612605720e+06 1.404989229829e+06 2.728639737607e+05 7.877050032651e+03 5.833451960326e+04 1.208412135149e+05
-4.606175444733e+06 1.792949746461e+06 9.094839724468e+05 3.974686274335e+05 1.692608881614e+05 2.915601880170e+05 6.024145341778e+05 8.308731448746e+05 8.180333211384e+05 5.941633552116e+05 3.038558802683e+05
-2.003970748453e+06 1.265941199958e+06 6.980608807556e+05 4.058698988591e+05 2.556083640993e+05 2.461964223327e+05 3.207156994071e+05 3.929153926465e+05 3.995612911899e+05 3.277057848012e+05 2.095864579143e+05
-4.907261694588e+05 2.749778919001e+05 1.892395676722e+05 1.459766320139e+05 1.081031027559e+05 7.808586722109e+04 5.858684312285e+04 4.877105867522e+04 4.598937262101e+04 4.739195486320e+04 5.007854839157e+04
+4.893939620145e+05 2.727236006610e+05 1.874379183230e+05 1.440694296207e+05 1.061946224403e+05 7.628664644533e+04 5.691801460441e+04 4.721086225741e+04 4.456624166762e+04 4.622125957635e+04 4.930032387673e+04
+1.995721669299e+06 1.251599802944e+06 6.925142593213e+05 4.039489714454e+05 2.550513988681e+05 2.447275448720e+05 3.168404823107e+05 3.866348502233e+05 3.922164714075e+05 3.211232186996e+05 2.051349791409e+05
+4.609124592793e+06 1.788230797961e+06 8.959262728798e+05 3.794744607214e+05 1.564007969189e+05 2.896091820125e+05 6.096711854792e+05 8.410688887757e+05 8.255447570975e+05 5.969357127290e+05 3.033226882707e+05
+5.609684678823e+07 2.710823524599e+07 1.853394030254e+07 1.333819577107e+07 8.172040152560e+06 3.959874274978e+06 1.384333735141e+06 2.703228770360e+05 8.710424874317e+03 5.700890161047e+04 1.180323150086e+05
+6.776342267345e+08 4.946777943298e+08 3.057121514195e+08 2.022615606734e+08 1.219791388605e+08 6.744028252532e+07 3.812074600612e+07 2.651168187396e+07 2.281940633452e+07 2.007145939655e+07 1.597999890552e+07
+1.538691189920e+09 1.241316679290e+09 7.841576654301e+08 5.417153429017e+08 3.542031807745e+08 2.233913423339e+08 1.470075317429e+08 1.093979078046e+08 9.056664982914e+07 7.616569735126e+07 6.122035506269e+07
+6.776342267345e+08 4.946777943298e+08 3.057121514195e+08 2.022615606734e+08 1.219791388605e+08 6.744028252532e+07 3.812074600612e+07 2.651168187396e+07 2.281940633452e+07 2.007145939655e+07 1.597999890552e+07
+5.609684678823e+07 2.710823524599e+07 1.853394030254e+07 1.333819577107e+07 8.172040152560e+06 3.959874274978e+06 1.384333735141e+06 2.703228770360e+05 8.710424874317e+03 5.700890161047e+04 1.180323150086e+05
+4.609124592793e+06 1.788230797961e+06 8.959262728798e+05 3.794744607214e+05 1.564007969189e+05 2.896091820125e+05 6.096711854792e+05 8.410688887757e+05 8.255447570975e+05 5.969357127290e+05 3.033226882707e+05
+1.995721669299e+06 1.251599802944e+06 6.925142593213e+05 4.039489714454e+05 2.550513988681e+05 2.447275448720e+05 3.168404823107e+05 3.866348502233e+05 3.922164714075e+05 3.211232186996e+05 2.051349791409e+05
+4.893939620145e+05 2.727236006610e+05 1.874379183230e+05 1.440694296207e+05 1.061946224404e+05 7.628664644533e+04 5.691801460441e+04 4.721086225741e+04 4.456624166763e+04 4.622125957635e+04 4.930032387673e+04
 
diff --git a/Tests/ReferenceData/MiniExamples/scatter2d/SlicedLayer.int b/Tests/ReferenceData/MiniExamples/scatter2d/SlicedLayer.int
index abe0f86b060160129a351f820343d4c35dd74051..eab32a565471e919be0a63aa3a1bd8311705e420 100644
--- a/Tests/ReferenceData/MiniExamples/scatter2d/SlicedLayer.int
+++ b/Tests/ReferenceData/MiniExamples/scatter2d/SlicedLayer.int
@@ -1,21 +1,21 @@
 # BornAgain Intensity Data
 
 # axis-0
-EquiDivision("phi_f (rad)", 11, -0.0349065850398866, 0.0349065850398866)
+EquiDivision("q_y (1/nm)", 11, 0, 140)
 
 # axis-1
-EquiDivision("alpha_f (rad)", 11, 0, 0.0349065850398866)
+EquiDivision("q_z (1/nm)", 11, 0, 70)
 
 # data
-5.809290454259e+01 1.168271943089e+03 6.102034799676e+02 1.731731426067e+02 4.041790728891e+00 1.863772565925e+02 5.362529348537e+02 6.341526839046e+02 3.451760087850e+02 3.459689513917e+01 6.998289499789e+01
-3.123558500478e+00 3.934175122421e+02 1.065507031038e+03 1.940716727019e+03 2.314327654629e+03 1.690296228524e+03 4.985646955519e+02 1.762293173435e+01 4.711103867164e+02 7.493737484892e+02 3.301321569591e+02
-7.211185413749e+02 1.706725724411e+04 1.111513076835e+04 4.520831334352e+03 4.060726332981e+02 6.844249025304e+02 2.504865262228e+03 2.040400623979e+03 3.531602341940e+02 1.685424072241e+02 8.040178679035e+02
-1.492375270878e+03 9.379692748429e+03 5.055071527520e+02 8.577685722121e+03 1.075683034532e+04 4.151026232832e+03 8.493981307958e+01 1.449525703093e+03 1.849266295523e+03 3.712253161912e+02 1.368713986900e+02
-3.801423089533e+04 5.373738601933e+05 1.460226380090e+05 1.042778922126e+04 4.234867080745e+03 1.029010410447e+04 3.467140145204e+03 8.916593489357e+01 1.578444726971e+03 1.137584261332e+03 4.277134213193e+01
-3.753193901427e+03 5.680669358411e+04 1.840307054954e+04 2.591496799095e+03 3.949440356084e+01 4.715703777840e+02 2.731180948913e+02 8.951579575256e+00 5.814842221020e+01 6.627532725757e+01 6.390019587759e+00
-3.801423089533e+04 5.373738601933e+05 1.460226380090e+05 1.042778922126e+04 4.234867080745e+03 1.029010410447e+04 3.467140145204e+03 8.916593489357e+01 1.578444726971e+03 1.137584261332e+03 4.277134213193e+01
-1.492375270878e+03 9.379692748429e+03 5.055071527520e+02 8.577685722121e+03 1.075683034532e+04 4.151026232832e+03 8.493981307958e+01 1.449525703093e+03 1.849266295523e+03 3.712253161912e+02 1.368713986900e+02
-7.211185413749e+02 1.706725724411e+04 1.111513076835e+04 4.520831334352e+03 4.060726332981e+02 6.844249025304e+02 2.504865262228e+03 2.040400623979e+03 3.531602341940e+02 1.685424072241e+02 8.040178679035e+02
-3.123558500478e+00 3.934175122421e+02 1.065507031038e+03 1.940716727019e+03 2.314327654629e+03 1.690296228524e+03 4.985646955519e+02 1.762293173435e+01 4.711103867164e+02 7.493737484892e+02 3.301321569591e+02
-5.809290454259e+01 1.168271943089e+03 6.102034799676e+02 1.731731426067e+02 4.041790728891e+00 1.863772565925e+02 5.362529348537e+02 6.341526839046e+02 3.451760087850e+02 3.459689513917e+01 6.998289499789e+01
+5.635804536241e+01 1.115790502382e+03 5.704396228512e+02 1.516273935808e+02 5.115785417690e+00 2.038653469536e+02 5.505657270784e+02 6.290952844690e+02 3.287092131428e+02 2.833022218477e+01 7.783969330757e+01
+4.190940250918e+00 4.436254506509e+02 1.123026846291e+03 1.977185324243e+03 2.303899419545e+03 1.640982069793e+03 4.591002792937e+02 2.206941782522e+01 4.900856981356e+02 7.420344443541e+02 3.100373149847e+02
+7.316234465464e+02 1.707806054612e+04 1.099691345165e+04 4.370769978991e+03 3.554676119801e+02 7.459052247021e+02 2.554733918895e+03 2.009640571739e+03 3.220768495367e+02 1.893663094408e+02 8.189142811058e+02
+1.463960638334e+03 8.876404580112e+03 5.913237487454e+02 8.829264612049e+03 1.079413441441e+04 4.043529318691e+03 7.604354697486e+01 1.506991460465e+03 1.840959222581e+03 3.447181773249e+02 1.530083331713e+02
+3.790707110240e+04 5.299646499135e+05 1.427860731080e+05 9.854430617077e+03 4.368864795813e+03 1.019559703781e+04 3.317952699390e+03 9.905634133939e+01 1.591315398286e+03 1.096956642743e+03 3.558899583195e+01
+3.798564558020e+03 5.690309726317e+04 1.832653335123e+04 2.539628362870e+03 4.143214822443e+01 4.766365548543e+02 2.677594680678e+02 7.874153267574e+00 6.000276303618e+01 6.524708426707e+01 5.671126934447e+00
+3.790707110240e+04 5.299646499135e+05 1.427860731080e+05 9.854430617077e+03 4.368864795813e+03 1.019559703781e+04 3.317952699390e+03 9.905634133939e+01 1.591315398286e+03 1.096956642743e+03 3.558899583195e+01
+1.463960638334e+03 8.876404580112e+03 5.913237487454e+02 8.829264612049e+03 1.079413441441e+04 4.043529318691e+03 7.604354697486e+01 1.506991460465e+03 1.840959222581e+03 3.447181773249e+02 1.530083331713e+02
+7.316234465464e+02 1.707806054612e+04 1.099691345165e+04 4.370769978991e+03 3.554676119801e+02 7.459052247021e+02 2.554733918895e+03 2.009640571739e+03 3.220768495367e+02 1.893663094408e+02 8.189142811058e+02
+4.190940250918e+00 4.436254506509e+02 1.123026846291e+03 1.977185324243e+03 2.303899419545e+03 1.640982069793e+03 4.591002792937e+02 2.206941782522e+01 4.900856981356e+02 7.420344443541e+02 3.100373149847e+02
+5.635804536241e+01 1.115790502382e+03 5.704396228512e+02 1.516273935808e+02 5.115785417690e+00 2.038653469536e+02 5.505657270784e+02 6.290952844690e+02 3.287092131428e+02 2.833022218477e+01 7.783969330757e+01
 
diff --git a/auto/Examples/scatter2d/BoxesWithSpecularPeak.py b/auto/Examples/scatter2d/BoxesWithSpecularPeak.py
index 4405b91dc6fd8d585fd35549f686d1dfb8a9eb6a..d2b369361ec6e4ce7c183c332af213e036a2e70f 100755
--- a/auto/Examples/scatter2d/BoxesWithSpecularPeak.py
+++ b/auto/Examples/scatter2d/BoxesWithSpecularPeak.py
@@ -48,7 +48,7 @@ def get_sample():
 def get_simulation(sample):
     beam = ba.Beam(1e9, 0.1*nm, 0.2*deg)
     n = 101
-    detector = ba.SphericalDetector(n, -2*deg, 2*deg, n, 0, 2*deg)
+    detector = ba.FlatDetector(n, n, 140, 70, beam, ba.FlatDetector.X, 2000, 0, -35)
     simulation = ba.ScatteringSimulation(beam, sample, detector)
     simulation.options().setUseAvgMaterials(True)
     simulation.options().setIncludeSpecular(True)
diff --git a/auto/Examples/scatter2d/CylindersInAverageLayer.py b/auto/Examples/scatter2d/CylindersInAverageLayer.py
index ba600b9f5d44635cb4d178c7a01c9f6ab421d423..656c29d64357f0e8dcb6d289dc1e7b1c653382f3 100755
--- a/auto/Examples/scatter2d/CylindersInAverageLayer.py
+++ b/auto/Examples/scatter2d/CylindersInAverageLayer.py
@@ -44,7 +44,7 @@ def get_sample(cyl_height=5*nm):
 def get_simulation(sample):
     beam = ba.Beam(1e9, 0.1*nm, 0.2*deg)
     n = 100
-    detector = ba.SphericalDetector(n, -2*deg, 2*deg, n, 0, 2*deg)
+    detector = ba.FlatDetector(n, n, 140, 70, beam, ba.FlatDetector.X, 2000, 0, -35)
     simulation = ba.ScatteringSimulation(beam, sample, detector)
     simulation.options().setUseAvgMaterials(True)
     return simulation
diff --git a/auto/Examples/scatter2d/HalfSpheresInAverageTopLayer.py b/auto/Examples/scatter2d/HalfSpheresInAverageTopLayer.py
index 039d26144c122404b64d0b3e39c26661979ab0ca..d228e304c8851463f2084a8508d0597aab8a535e 100755
--- a/auto/Examples/scatter2d/HalfSpheresInAverageTopLayer.py
+++ b/auto/Examples/scatter2d/HalfSpheresInAverageTopLayer.py
@@ -54,7 +54,7 @@ def get_sample():
 def get_simulation(sample):
     beam = ba.Beam(1e9, 0.1*nm, 0.2*deg)
     n = 100
-    detector = ba.SphericalDetector(n, -2*deg, 2*deg, n, 0, 2*deg)
+    detector = ba.FlatDetector(n, n, 140, 70, beam, ba.FlatDetector.X, 2000, 0, -35)
     simulation = ba.ScatteringSimulation(beam, sample, detector)
     simulation.options().setUseAvgMaterials(True)
     return simulation
diff --git a/auto/Examples/scatter2d/Interference1DRadialParacrystal.py b/auto/Examples/scatter2d/Interference1DRadialParacrystal.py
index d05d9118e18e7c12b0b81b50f3cbc09d6aa4eb71..f31994a931745fb1e8599eff2688498861b13ce5 100755
--- a/auto/Examples/scatter2d/Interference1DRadialParacrystal.py
+++ b/auto/Examples/scatter2d/Interference1DRadialParacrystal.py
@@ -48,7 +48,7 @@ def get_sample():
 def get_simulation(sample):
     beam = ba.Beam(1e9, 0.1*nm, 0.2*deg)
     n = 200
-    detector = ba.SphericalDetector(n, -2*deg, 2*deg, n, 0, 2*deg)
+    detector = ba.FlatDetector(n, n, 140, 70, beam, ba.FlatDetector.X, 2000, 0, -35)
     simulation = ba.ScatteringSimulation(beam, sample, detector)
     return simulation
 
diff --git a/auto/Examples/scatter2d/Interference2DCenteredSquareLattice.py b/auto/Examples/scatter2d/Interference2DCenteredSquareLattice.py
index d7ab07c4901bbdf2a95525fbfda571fa9c614338..793101b5093c314bb6d156b103d2cc490841bd31 100755
--- a/auto/Examples/scatter2d/Interference2DCenteredSquareLattice.py
+++ b/auto/Examples/scatter2d/Interference2DCenteredSquareLattice.py
@@ -61,7 +61,7 @@ def get_sample():
 def get_simulation(sample):
     beam = ba.Beam(1e9, 0.1*nm, 0.2*deg)
     n = 200
-    detector = ba.SphericalDetector(n, -2*deg, 2*deg, n, 0, 2*deg)
+    detector = ba.FlatDetector(n, n, 140, 70, beam, ba.FlatDetector.X, 2000, 0, -35)
     simulation = ba.ScatteringSimulation(beam, sample, detector)
     return simulation
 
diff --git a/auto/Examples/scatter2d/Interference2DParacrystal.py b/auto/Examples/scatter2d/Interference2DParacrystal.py
index 2caad15386f49855b4f87734a5547056dce0d711..72dadcfd1f0ad864c9e5534c90287414ff7dfd9d 100755
--- a/auto/Examples/scatter2d/Interference2DParacrystal.py
+++ b/auto/Examples/scatter2d/Interference2DParacrystal.py
@@ -54,7 +54,7 @@ def get_sample():
 def get_simulation(sample):
     beam = ba.Beam(1e9, 0.1*nm, 0.2*deg)
     n = 200
-    detector = ba.SphericalDetector(n, -2*deg, 2*deg, n, 0, 2*deg)
+    detector = ba.FlatDetector(n, n, 140, 70, beam, ba.FlatDetector.X, 2000, 0, -35)
     simulation = ba.ScatteringSimulation(beam, sample, detector)
     return simulation
 
diff --git a/auto/Examples/scatter2d/Interference2DRotatedSquareLattice.py b/auto/Examples/scatter2d/Interference2DRotatedSquareLattice.py
index 2453547da03938a1b1d69c7bea98ff12c8e08ca7..73e08e72c7538d4e8972479b0a8b3f43d9ddfc76 100755
--- a/auto/Examples/scatter2d/Interference2DRotatedSquareLattice.py
+++ b/auto/Examples/scatter2d/Interference2DRotatedSquareLattice.py
@@ -53,7 +53,7 @@ def get_sample():
 def get_simulation(sample):
     beam = ba.Beam(1e9, 0.1*nm, 0.2*deg)
     n = 200
-    detector = ba.SphericalDetector(n, -2*deg, 2*deg, n, 0, 2*deg)
+    detector = ba.FlatDetector(n, n, 140, 70, beam, ba.FlatDetector.X, 2000, 0, -35)
     simulation = ba.ScatteringSimulation(beam, sample, detector)
     return simulation
 
diff --git a/auto/Examples/scatter2d/Interference2DSquareFiniteLattice.py b/auto/Examples/scatter2d/Interference2DSquareFiniteLattice.py
index 8c19fea2497967332019be80fdf8bd6f285dfaec..c638599794146a0d5f2a427b1c77a1d19b2b4721 100755
--- a/auto/Examples/scatter2d/Interference2DSquareFiniteLattice.py
+++ b/auto/Examples/scatter2d/Interference2DSquareFiniteLattice.py
@@ -51,7 +51,7 @@ def get_sample():
 def get_simulation(sample):
     beam = ba.Beam(1e9, 0.1*nm, 0.2*deg)
     n = 200
-    detector = ba.SphericalDetector(n, -2*deg, 2*deg, n, 0, 2*deg)
+    detector = ba.FlatDetector(n, n, 140, 70, beam, ba.FlatDetector.X, 2000, 0, -35)
     simulation = ba.ScatteringSimulation(beam, sample, detector)
     return simulation
 
diff --git a/auto/Examples/scatter2d/Mesocrystal.py b/auto/Examples/scatter2d/Mesocrystal.py
index e1b84ffa77b9cb6bdda022561e9b6437ba83367b..ecc5ce97c312aa1842dd3afb74cb058ed1b1ae2e 100755
--- a/auto/Examples/scatter2d/Mesocrystal.py
+++ b/auto/Examples/scatter2d/Mesocrystal.py
@@ -52,7 +52,7 @@ def get_sample():
 def get_simulation(sample):
     beam = ba.Beam(1e9, 0.1*nm, 0.2*deg)
     n = 200
-    detector = ba.SphericalDetector(n, -2*deg, 2*deg, n, 0, 2*deg)
+    detector = ba.FlatDetector(n, n, 140, 70, beam, ba.FlatDetector.X, 2000, 0, -35)
     simulation = ba.ScatteringSimulation(beam, sample, detector)
     return simulation
 
diff --git a/auto/Examples/scatter2d/Mesocrystal2.py b/auto/Examples/scatter2d/Mesocrystal2.py
index bbaf9211577501d9cbf5a3c04d1bc1e454350cfc..0fb9cada2c757b1a26545f85a43a5ad8a454f8e5 100755
--- a/auto/Examples/scatter2d/Mesocrystal2.py
+++ b/auto/Examples/scatter2d/Mesocrystal2.py
@@ -69,7 +69,7 @@ def get_sample():
 def get_simulation(sample):
     beam = ba.Beam(1e9, 0.1*nm, 0.2*deg)
     n = 200
-    detector = ba.SphericalDetector(n, -2*deg, 2*deg, n, 0, 2*deg)
+    detector = ba.FlatDetector(n, n, 140, 70, beam, ba.FlatDetector.X, 2000, 0, -35)
     simulation = ba.ScatteringSimulation(beam, sample, detector)
     return simulation
 
diff --git a/auto/Examples/scatter2d/RotatedPyramids.py b/auto/Examples/scatter2d/RotatedPyramids.py
index 20edb8b37ad69410c67d86a756e25fd23ffc71dd..201a08872882d201761ea3ac18b95c362e3289a0 100755
--- a/auto/Examples/scatter2d/RotatedPyramids.py
+++ b/auto/Examples/scatter2d/RotatedPyramids.py
@@ -44,7 +44,7 @@ def get_sample():
 def get_simulation(sample):
     beam = ba.Beam(1e9, 0.1*nm, 0.2*deg)
     n = 200
-    detector = ba.SphericalDetector(n, -2*deg, 2*deg, n, 0, 2*deg)
+    detector = ba.FlatDetector(n, n, 140, 70, beam, ba.FlatDetector.X, 2000, 0, -35)
     simulation = ba.ScatteringSimulation(beam, sample, detector)
     return simulation
 
diff --git a/auto/Examples/scatter2d/SlicedLayer.py b/auto/Examples/scatter2d/SlicedLayer.py
index 3f47388c081e7fbee78ba9f7ae11efd7bc9af088..9416b7c3e663f864d38d94598c8b38a4a4f13f6b 100755
--- a/auto/Examples/scatter2d/SlicedLayer.py
+++ b/auto/Examples/scatter2d/SlicedLayer.py
@@ -40,7 +40,7 @@ def get_sample():
 def get_simulation(sample):
     beam = ba.Beam(1e9, 0.1*nm, 0.2*deg)
     n = 100
-    detector = ba.SphericalDetector(n, -2*deg, 2*deg, n, 0, 2*deg)
+    detector = ba.FlatDetector(n, n, 140, 70, beam, ba.FlatDetector.X, 2000, 0, -35)
     simulation = ba.ScatteringSimulation(beam, sample, detector)
     simulation.options().setUseAvgMaterials(True)
     return simulation
diff --git a/auto/MiniExamples/scatter2d/BoxesWithSpecularPeak.py b/auto/MiniExamples/scatter2d/BoxesWithSpecularPeak.py
index f4d88489bb8fc0891e126e60a548e40652c1efdd..40050b3af6d068e4f08392aa4694c715af6bef56 100755
--- a/auto/MiniExamples/scatter2d/BoxesWithSpecularPeak.py
+++ b/auto/MiniExamples/scatter2d/BoxesWithSpecularPeak.py
@@ -48,7 +48,7 @@ def get_sample():
 def get_simulation(sample):
     beam = ba.Beam(1e9, 0.1*nm, 0.2*deg)
     n = 11
-    detector = ba.SphericalDetector(n, -2*deg, 2*deg, n, 0, 2*deg)
+    detector = ba.FlatDetector(n, n, 140, 70, beam, ba.FlatDetector.X, 2000, 0, -35)
     simulation = ba.ScatteringSimulation(beam, sample, detector)
     simulation.options().setUseAvgMaterials(True)
     simulation.options().setIncludeSpecular(True)
diff --git a/auto/MiniExamples/scatter2d/CylindersInAverageLayer.py b/auto/MiniExamples/scatter2d/CylindersInAverageLayer.py
index 96543023992b8b047599479d8be8721825bc0eb8..895b05ada2d9b56fab35d231fa3fa6042ffc9e17 100755
--- a/auto/MiniExamples/scatter2d/CylindersInAverageLayer.py
+++ b/auto/MiniExamples/scatter2d/CylindersInAverageLayer.py
@@ -44,7 +44,7 @@ def get_sample(cyl_height=5*nm):
 def get_simulation(sample):
     beam = ba.Beam(1e9, 0.1*nm, 0.2*deg)
     n = 11
-    detector = ba.SphericalDetector(n, -2*deg, 2*deg, n, 0, 2*deg)
+    detector = ba.FlatDetector(n, n, 140, 70, beam, ba.FlatDetector.X, 2000, 0, -35)
     simulation = ba.ScatteringSimulation(beam, sample, detector)
     simulation.options().setUseAvgMaterials(True)
     return simulation
diff --git a/auto/MiniExamples/scatter2d/HalfSpheresInAverageTopLayer.py b/auto/MiniExamples/scatter2d/HalfSpheresInAverageTopLayer.py
index 7e40bd9a676bc6f4480b3b542f89e952dec88845..1af90be104c51e27d4249b9a1a3a60766d40446e 100755
--- a/auto/MiniExamples/scatter2d/HalfSpheresInAverageTopLayer.py
+++ b/auto/MiniExamples/scatter2d/HalfSpheresInAverageTopLayer.py
@@ -54,7 +54,7 @@ def get_sample():
 def get_simulation(sample):
     beam = ba.Beam(1e9, 0.1*nm, 0.2*deg)
     n = 11
-    detector = ba.SphericalDetector(n, -2*deg, 2*deg, n, 0, 2*deg)
+    detector = ba.FlatDetector(n, n, 140, 70, beam, ba.FlatDetector.X, 2000, 0, -35)
     simulation = ba.ScatteringSimulation(beam, sample, detector)
     simulation.options().setUseAvgMaterials(True)
     return simulation
diff --git a/auto/MiniExamples/scatter2d/Interference1DRadialParacrystal.py b/auto/MiniExamples/scatter2d/Interference1DRadialParacrystal.py
index d9d9fa5fa53f77258fa8796ddd19747ded4de9e5..d96bd02af5c55e7e2e044283f76f192b8a863529 100755
--- a/auto/MiniExamples/scatter2d/Interference1DRadialParacrystal.py
+++ b/auto/MiniExamples/scatter2d/Interference1DRadialParacrystal.py
@@ -48,7 +48,7 @@ def get_sample():
 def get_simulation(sample):
     beam = ba.Beam(1e9, 0.1*nm, 0.2*deg)
     n = 11
-    detector = ba.SphericalDetector(n, -2*deg, 2*deg, n, 0, 2*deg)
+    detector = ba.FlatDetector(n, n, 140, 70, beam, ba.FlatDetector.X, 2000, 0, -35)
     simulation = ba.ScatteringSimulation(beam, sample, detector)
     return simulation
 
diff --git a/auto/MiniExamples/scatter2d/Interference2DCenteredSquareLattice.py b/auto/MiniExamples/scatter2d/Interference2DCenteredSquareLattice.py
index abb53c77dde253e504704027e5a5df0738868f5b..934ce1758bbabde0266faeed29b5aaa055ebd740 100755
--- a/auto/MiniExamples/scatter2d/Interference2DCenteredSquareLattice.py
+++ b/auto/MiniExamples/scatter2d/Interference2DCenteredSquareLattice.py
@@ -61,7 +61,7 @@ def get_sample():
 def get_simulation(sample):
     beam = ba.Beam(1e9, 0.1*nm, 0.2*deg)
     n = 11
-    detector = ba.SphericalDetector(n, -2*deg, 2*deg, n, 0, 2*deg)
+    detector = ba.FlatDetector(n, n, 140, 70, beam, ba.FlatDetector.X, 2000, 0, -35)
     simulation = ba.ScatteringSimulation(beam, sample, detector)
     return simulation
 
diff --git a/auto/MiniExamples/scatter2d/Interference2DParacrystal.py b/auto/MiniExamples/scatter2d/Interference2DParacrystal.py
index ccc9d88cca10fefa18b263984abe434b22f00740..6a2896747b250f336b8ac1dc47df2ec319535a4d 100755
--- a/auto/MiniExamples/scatter2d/Interference2DParacrystal.py
+++ b/auto/MiniExamples/scatter2d/Interference2DParacrystal.py
@@ -54,7 +54,7 @@ def get_sample():
 def get_simulation(sample):
     beam = ba.Beam(1e9, 0.1*nm, 0.2*deg)
     n = 11
-    detector = ba.SphericalDetector(n, -2*deg, 2*deg, n, 0, 2*deg)
+    detector = ba.FlatDetector(n, n, 140, 70, beam, ba.FlatDetector.X, 2000, 0, -35)
     simulation = ba.ScatteringSimulation(beam, sample, detector)
     return simulation
 
diff --git a/auto/MiniExamples/scatter2d/Interference2DRotatedSquareLattice.py b/auto/MiniExamples/scatter2d/Interference2DRotatedSquareLattice.py
index 65f8ec0f2318a1cc53a64ba003f51f8ace8920d8..2eade363261617f8fae7ef9914fb6fd77a90428c 100755
--- a/auto/MiniExamples/scatter2d/Interference2DRotatedSquareLattice.py
+++ b/auto/MiniExamples/scatter2d/Interference2DRotatedSquareLattice.py
@@ -53,7 +53,7 @@ def get_sample():
 def get_simulation(sample):
     beam = ba.Beam(1e9, 0.1*nm, 0.2*deg)
     n = 11
-    detector = ba.SphericalDetector(n, -2*deg, 2*deg, n, 0, 2*deg)
+    detector = ba.FlatDetector(n, n, 140, 70, beam, ba.FlatDetector.X, 2000, 0, -35)
     simulation = ba.ScatteringSimulation(beam, sample, detector)
     return simulation
 
diff --git a/auto/MiniExamples/scatter2d/Interference2DSquareFiniteLattice.py b/auto/MiniExamples/scatter2d/Interference2DSquareFiniteLattice.py
index 0250352e2cd6476921eabc5972ba708b3e6d780b..e68f47905a2c6e285b1bcee465c2503b34c6e740 100755
--- a/auto/MiniExamples/scatter2d/Interference2DSquareFiniteLattice.py
+++ b/auto/MiniExamples/scatter2d/Interference2DSquareFiniteLattice.py
@@ -51,7 +51,7 @@ def get_sample():
 def get_simulation(sample):
     beam = ba.Beam(1e9, 0.1*nm, 0.2*deg)
     n = 11
-    detector = ba.SphericalDetector(n, -2*deg, 2*deg, n, 0, 2*deg)
+    detector = ba.FlatDetector(n, n, 140, 70, beam, ba.FlatDetector.X, 2000, 0, -35)
     simulation = ba.ScatteringSimulation(beam, sample, detector)
     return simulation
 
diff --git a/auto/MiniExamples/scatter2d/Mesocrystal.py b/auto/MiniExamples/scatter2d/Mesocrystal.py
index 77d4acc429b22d1f924cb4f93a8625055af90612..3f207186fc9c475a2eb22c4b69a4f4725c710b70 100755
--- a/auto/MiniExamples/scatter2d/Mesocrystal.py
+++ b/auto/MiniExamples/scatter2d/Mesocrystal.py
@@ -52,7 +52,7 @@ def get_sample():
 def get_simulation(sample):
     beam = ba.Beam(1e9, 0.1*nm, 0.2*deg)
     n = 11
-    detector = ba.SphericalDetector(n, -2*deg, 2*deg, n, 0, 2*deg)
+    detector = ba.FlatDetector(n, n, 140, 70, beam, ba.FlatDetector.X, 2000, 0, -35)
     simulation = ba.ScatteringSimulation(beam, sample, detector)
     return simulation
 
diff --git a/auto/MiniExamples/scatter2d/Mesocrystal2.py b/auto/MiniExamples/scatter2d/Mesocrystal2.py
index f6a69987e5de54d6d184f285a9cd8d7681d96742..758c36b75a0b7bfd090909fc8090ab19d4ac7e4b 100755
--- a/auto/MiniExamples/scatter2d/Mesocrystal2.py
+++ b/auto/MiniExamples/scatter2d/Mesocrystal2.py
@@ -69,7 +69,7 @@ def get_sample():
 def get_simulation(sample):
     beam = ba.Beam(1e9, 0.1*nm, 0.2*deg)
     n = 11
-    detector = ba.SphericalDetector(n, -2*deg, 2*deg, n, 0, 2*deg)
+    detector = ba.FlatDetector(n, n, 140, 70, beam, ba.FlatDetector.X, 2000, 0, -35)
     simulation = ba.ScatteringSimulation(beam, sample, detector)
     return simulation
 
diff --git a/auto/MiniExamples/scatter2d/RotatedPyramids.py b/auto/MiniExamples/scatter2d/RotatedPyramids.py
index db6d070d65ee24c88008a34b8cf2c29f0ff589e5..74ce4ba0b14b52a01dea220aea32c0a2dedad729 100755
--- a/auto/MiniExamples/scatter2d/RotatedPyramids.py
+++ b/auto/MiniExamples/scatter2d/RotatedPyramids.py
@@ -44,7 +44,7 @@ def get_sample():
 def get_simulation(sample):
     beam = ba.Beam(1e9, 0.1*nm, 0.2*deg)
     n = 11
-    detector = ba.SphericalDetector(n, -2*deg, 2*deg, n, 0, 2*deg)
+    detector = ba.FlatDetector(n, n, 140, 70, beam, ba.FlatDetector.X, 2000, 0, -35)
     simulation = ba.ScatteringSimulation(beam, sample, detector)
     return simulation
 
diff --git a/auto/MiniExamples/scatter2d/SlicedLayer.py b/auto/MiniExamples/scatter2d/SlicedLayer.py
index 8f9acf0ef64de0054f8c8d9795ff91a7b34b9000..edd08dc2138e4cee31d7d00cab97384c232d84e4 100755
--- a/auto/MiniExamples/scatter2d/SlicedLayer.py
+++ b/auto/MiniExamples/scatter2d/SlicedLayer.py
@@ -40,7 +40,7 @@ def get_sample():
 def get_simulation(sample):
     beam = ba.Beam(1e9, 0.1*nm, 0.2*deg)
     n = 11
-    detector = ba.SphericalDetector(n, -2*deg, 2*deg, n, 0, 2*deg)
+    detector = ba.FlatDetector(n, n, 140, 70, beam, ba.FlatDetector.X, 2000, 0, -35)
     simulation = ba.ScatteringSimulation(beam, sample, detector)
     simulation.options().setUseAvgMaterials(True)
     return simulation
diff --git a/rawEx/scatter2d/BoxesWithSpecularPeak.py b/rawEx/scatter2d/BoxesWithSpecularPeak.py
index 6388d9d5a15beef10c2baa21283a40450435fa3e..4f6749c7a32382ba8fae31a5f1ec4fa9a674cb46 100755
--- a/rawEx/scatter2d/BoxesWithSpecularPeak.py
+++ b/rawEx/scatter2d/BoxesWithSpecularPeak.py
@@ -48,7 +48,7 @@ def get_sample():
 def get_simulation(sample):
     beam = ba.Beam(1e9, 0.1*nm, 0.2*deg)
     n = <%= sm ? 11 : 101 %>
-    detector = ba.SphericalDetector(n, -2*deg, 2*deg, n, 0, 2*deg)
+    detector = ba.FlatDetector(n, n, 140, 70, beam, ba.FlatDetector.X, 2000, 0, -35)
     simulation = ba.ScatteringSimulation(beam, sample, detector)
     simulation.options().setUseAvgMaterials(True)
     simulation.options().setIncludeSpecular(True)
diff --git a/rawEx/scatter2d/CylindersInAverageLayer.py b/rawEx/scatter2d/CylindersInAverageLayer.py
index def34ce57922acc6f0ec072ec571d877507ae066..cd5921d75a104ac38c2c46b293643adac4962b75 100755
--- a/rawEx/scatter2d/CylindersInAverageLayer.py
+++ b/rawEx/scatter2d/CylindersInAverageLayer.py
@@ -44,7 +44,7 @@ def get_sample(cyl_height=5*nm):
 def get_simulation(sample):
     beam = ba.Beam(1e9, 0.1*nm, 0.2*deg)
     n = <%= sm ? 11 : 100 %>
-    detector = ba.SphericalDetector(n, -2*deg, 2*deg, n, 0, 2*deg)
+    detector = ba.FlatDetector(n, n, 140, 70, beam, ba.FlatDetector.X, 2000, 0, -35)
     simulation = ba.ScatteringSimulation(beam, sample, detector)
     simulation.options().setUseAvgMaterials(True)
     return simulation
diff --git a/rawEx/scatter2d/HalfSpheresInAverageTopLayer.py b/rawEx/scatter2d/HalfSpheresInAverageTopLayer.py
index 542a016970a0c9e4efd25e54c5fd04ae732b6709..5419b0c2486b75adc470ae6a75327d00cdf65fe2 100755
--- a/rawEx/scatter2d/HalfSpheresInAverageTopLayer.py
+++ b/rawEx/scatter2d/HalfSpheresInAverageTopLayer.py
@@ -54,7 +54,7 @@ def get_sample():
 def get_simulation(sample):
     beam = ba.Beam(1e9, 0.1*nm, 0.2*deg)
     n = <%= sm ? 11 : 100 %>
-    detector = ba.SphericalDetector(n, -2*deg, 2*deg, n, 0, 2*deg)
+    detector = ba.FlatDetector(n, n, 140, 70, beam, ba.FlatDetector.X, 2000, 0, -35)
     simulation = ba.ScatteringSimulation(beam, sample, detector)
     simulation.options().setUseAvgMaterials(True)
     return simulation
diff --git a/rawEx/scatter2d/Interference1DRadialParacrystal.py b/rawEx/scatter2d/Interference1DRadialParacrystal.py
index 7b60eb6ddd2d6f9e40148bffa1b079faa26f67ef..e29b95127d6ed110f7da02f710f8b7f53357f175 100755
--- a/rawEx/scatter2d/Interference1DRadialParacrystal.py
+++ b/rawEx/scatter2d/Interference1DRadialParacrystal.py
@@ -48,7 +48,7 @@ def get_sample():
 def get_simulation(sample):
     beam = ba.Beam(1e9, 0.1*nm, 0.2*deg)
     n = <%= sm ? 11 : 200 %>
-    detector = ba.SphericalDetector(n, -2*deg, 2*deg, n, 0, 2*deg)
+    detector = ba.FlatDetector(n, n, 140, 70, beam, ba.FlatDetector.X, 2000, 0, -35)
     simulation = ba.ScatteringSimulation(beam, sample, detector)
     return simulation
 
diff --git a/rawEx/scatter2d/Interference2DCenteredSquareLattice.py b/rawEx/scatter2d/Interference2DCenteredSquareLattice.py
index 69e508f56a3724264c55b9aa021901674acf8185..f26f935009a583e4bc3273a876d7daf420c53e52 100755
--- a/rawEx/scatter2d/Interference2DCenteredSquareLattice.py
+++ b/rawEx/scatter2d/Interference2DCenteredSquareLattice.py
@@ -61,7 +61,7 @@ def get_sample():
 def get_simulation(sample):
     beam = ba.Beam(1e9, 0.1*nm, 0.2*deg)
     n = <%= sm ? 11 : 200 %>
-    detector = ba.SphericalDetector(n, -2*deg, 2*deg, n, 0, 2*deg)
+    detector = ba.FlatDetector(n, n, 140, 70, beam, ba.FlatDetector.X, 2000, 0, -35)
     simulation = ba.ScatteringSimulation(beam, sample, detector)
     return simulation
 
diff --git a/rawEx/scatter2d/Interference2DParacrystal.py b/rawEx/scatter2d/Interference2DParacrystal.py
index 94120652f4f0da5cb958080bfc21f58a9abc4722..fd1305e9d8f606243300038712af86ba41355800 100755
--- a/rawEx/scatter2d/Interference2DParacrystal.py
+++ b/rawEx/scatter2d/Interference2DParacrystal.py
@@ -54,7 +54,7 @@ def get_sample():
 def get_simulation(sample):
     beam = ba.Beam(1e9, 0.1*nm, 0.2*deg)
     n = <%= sm ? 11 : 200 %>
-    detector = ba.SphericalDetector(n, -2*deg, 2*deg, n, 0, 2*deg)
+    detector = ba.FlatDetector(n, n, 140, 70, beam, ba.FlatDetector.X, 2000, 0, -35)
     simulation = ba.ScatteringSimulation(beam, sample, detector)
     return simulation
 
diff --git a/rawEx/scatter2d/Interference2DRotatedSquareLattice.py b/rawEx/scatter2d/Interference2DRotatedSquareLattice.py
index 3f39fcbd5800671ddf220dda3a9ecf1460c87979..fef6b90d10486b8219de9586c56adec287fc834c 100755
--- a/rawEx/scatter2d/Interference2DRotatedSquareLattice.py
+++ b/rawEx/scatter2d/Interference2DRotatedSquareLattice.py
@@ -53,7 +53,7 @@ def get_sample():
 def get_simulation(sample):
     beam = ba.Beam(1e9, 0.1*nm, 0.2*deg)
     n = <%= sm ? 11 : 200 %>
-    detector = ba.SphericalDetector(n, -2*deg, 2*deg, n, 0, 2*deg)
+    detector = ba.FlatDetector(n, n, 140, 70, beam, ba.FlatDetector.X, 2000, 0, -35)
     simulation = ba.ScatteringSimulation(beam, sample, detector)
     return simulation
 
diff --git a/rawEx/scatter2d/Interference2DSquareFiniteLattice.py b/rawEx/scatter2d/Interference2DSquareFiniteLattice.py
index 1d2a39206a9deb67756c7370cb904f918aff2489..73811df1d019ab539b86bc40ab61dd9390e5c19e 100755
--- a/rawEx/scatter2d/Interference2DSquareFiniteLattice.py
+++ b/rawEx/scatter2d/Interference2DSquareFiniteLattice.py
@@ -51,7 +51,7 @@ def get_sample():
 def get_simulation(sample):
     beam = ba.Beam(1e9, 0.1*nm, 0.2*deg)
     n = <%= sm ? 11 : 200 %>
-    detector = ba.SphericalDetector(n, -2*deg, 2*deg, n, 0, 2*deg)
+    detector = ba.FlatDetector(n, n, 140, 70, beam, ba.FlatDetector.X, 2000, 0, -35)
     simulation = ba.ScatteringSimulation(beam, sample, detector)
     return simulation
 
diff --git a/rawEx/scatter2d/Mesocrystal.py b/rawEx/scatter2d/Mesocrystal.py
index 94ef5f4793bfabf99ccd4558fac2e2c02cf37176..508887e6ae4fda7cf377fde0e8167a52ebea47e9 100755
--- a/rawEx/scatter2d/Mesocrystal.py
+++ b/rawEx/scatter2d/Mesocrystal.py
@@ -52,7 +52,7 @@ def get_sample():
 def get_simulation(sample):
     beam = ba.Beam(1e9, 0.1*nm, 0.2*deg)
     n = <%= sm ? 11 : 200 %>
-    detector = ba.SphericalDetector(n, -2*deg, 2*deg, n, 0, 2*deg)
+    detector = ba.FlatDetector(n, n, 140, 70, beam, ba.FlatDetector.X, 2000, 0, -35)
     simulation = ba.ScatteringSimulation(beam, sample, detector)
     return simulation
 
diff --git a/rawEx/scatter2d/Mesocrystal2.py b/rawEx/scatter2d/Mesocrystal2.py
index dcaa933c79bfd923fffe75357167892309498b7f..7d3397b70b9c6a28ecf39837db9e26f5886a4b89 100755
--- a/rawEx/scatter2d/Mesocrystal2.py
+++ b/rawEx/scatter2d/Mesocrystal2.py
@@ -69,7 +69,7 @@ def get_sample():
 def get_simulation(sample):
     beam = ba.Beam(1e9, 0.1*nm, 0.2*deg)
     n = <%= sm ? 11 : 200 %>
-    detector = ba.SphericalDetector(n, -2*deg, 2*deg, n, 0, 2*deg)
+    detector = ba.FlatDetector(n, n, 140, 70, beam, ba.FlatDetector.X, 2000, 0, -35)
     simulation = ba.ScatteringSimulation(beam, sample, detector)
     return simulation
 
diff --git a/rawEx/scatter2d/RotatedPyramids.py b/rawEx/scatter2d/RotatedPyramids.py
index 617fc99ab8906629dfb8a6acbbca34182120a138..3cf17151f6ba611f24fc61213e8369781bd40c14 100755
--- a/rawEx/scatter2d/RotatedPyramids.py
+++ b/rawEx/scatter2d/RotatedPyramids.py
@@ -44,7 +44,7 @@ def get_sample():
 def get_simulation(sample):
     beam = ba.Beam(1e9, 0.1*nm, 0.2*deg)
     n = <%= sm ? 11 : 200 %>
-    detector = ba.SphericalDetector(n, -2*deg, 2*deg, n, 0, 2*deg)
+    detector = ba.FlatDetector(n, n, 140, 70, beam, ba.FlatDetector.X, 2000, 0, -35)
     simulation = ba.ScatteringSimulation(beam, sample, detector)
     return simulation
 
diff --git a/rawEx/scatter2d/SlicedLayer.py b/rawEx/scatter2d/SlicedLayer.py
index 99f3d4ce6622a2fa17cc1c175c68160abfd7b0aa..2d9b804eca26f6f21c13a2dae6b60fa5eabdb8e4 100755
--- a/rawEx/scatter2d/SlicedLayer.py
+++ b/rawEx/scatter2d/SlicedLayer.py
@@ -40,7 +40,7 @@ def get_sample():
 def get_simulation(sample):
     beam = ba.Beam(1e9, 0.1*nm, 0.2*deg)
     n = <%= sm ? 11 : 100 %>
-    detector = ba.SphericalDetector(n, -2*deg, 2*deg, n, 0, 2*deg)
+    detector = ba.FlatDetector(n, n, 140, 70, beam, ba.FlatDetector.X, 2000, 0, -35)
     simulation = ba.ScatteringSimulation(beam, sample, detector)
     simulation.options().setUseAvgMaterials(True)
     return simulation