diff --git a/Tests/ReferenceData/MiniExamples/scatter2d/CustomFormFactor.int b/Tests/ReferenceData/MiniExamples/scatter2d/CustomFormFactor.int
index a20d59d2e1c747c50f949d7b957c5873daf531ca..1d1fe8f0a74618e50915e925d5e5f53e58486645 100644
--- a/Tests/ReferenceData/MiniExamples/scatter2d/CustomFormFactor.int
+++ b/Tests/ReferenceData/MiniExamples/scatter2d/CustomFormFactor.int
@@ -1,21 +1,21 @@
# BornAgain Intensity Data
# axis-0
-EquiDivision("phi_f (rad)", 11, -0.0174532925199433, 0.0174532925199433)
+EquiDivision("q_y (1/nm)", 11, 0, 70)
# axis-1
-EquiDivision("alpha_f (rad)", 11, 0, 0.0349065850398866)
+EquiDivision("q_z (1/nm)", 11, 0, 70)
# data
-2.253955078159e+08 7.923396401122e+08 1.687834461471e+08 2.554820476032e+07 4.781386889018e+07 4.959427539465e+06 2.439736882191e+07 9.304955534142e+05 1.476626235005e+07 5.482230798436e+04 9.481648543990e+06
-9.616404776115e+06 3.386350596752e+07 7.241835934733e+06 1.103837759726e+06 2.089395065148e+06 2.205261063278e+05 1.112952798213e+06 4.400815319108e+04 7.336428403273e+05 2.907035791980e+03 5.466325240157e+05
-6.174311051901e+06 2.172733357939e+07 4.638908276711e+06 7.049378981936e+05 1.327468567399e+06 1.389650444633e+05 6.927532471368e+05 2.691455716449e+04 4.379809020414e+05 1.681133522149e+03 3.035857976140e+05
-1.713263043561e+07 6.025514370479e+07 1.283993971692e+07 1.941665599530e+06 3.619094601728e+06 3.717933448725e+05 1.795775937288e+06 6.639035932352e+04 1.002928567636e+06 3.455917602962e+03 5.353563131680e+05
-7.902045965070e+09 2.779212171082e+10 5.926268089746e+09 8.984549716621e+08 1.685176211495e+09 1.753020371341e+08 8.656029126257e+08 3.316849797688e+07 5.294258623439e+08 1.979650876935e+06 3.453736199867e+08
-2.303645384968e+10 8.102020045067e+10 1.727633417868e+10 2.619290739538e+09 4.913501265653e+09 5.112848214329e+08 2.526009561053e+09 9.688106891768e+07 1.548553804175e+09 5.802199416946e+06 1.015136714126e+09
-7.902045965070e+09 2.779212171082e+10 5.926268089746e+09 8.984549716621e+08 1.685176211495e+09 1.753020371341e+08 8.656029126257e+08 3.316849797688e+07 5.294258623439e+08 1.979650876935e+06 3.453736199867e+08
-1.713263043561e+07 6.025514370479e+07 1.283993971692e+07 1.941665599530e+06 3.619094601728e+06 3.717933448725e+05 1.795775937288e+06 6.639035932352e+04 1.002928567636e+06 3.455917602962e+03 5.353563131680e+05
-6.174311051901e+06 2.172733357939e+07 4.638908276711e+06 7.049378981936e+05 1.327468567399e+06 1.389650444633e+05 6.927532471368e+05 2.691455716449e+04 4.379809020414e+05 1.681133522149e+03 3.035857976140e+05
-9.616404776115e+06 3.386350596752e+07 7.241835934733e+06 1.103837759726e+06 2.089395065148e+06 2.205261063278e+05 1.112952798213e+06 4.400815319108e+04 7.336428403273e+05 2.907035791980e+03 5.466325240157e+05
-2.253955078159e+08 7.923396401122e+08 1.687834461471e+08 2.554820476032e+07 4.781386889018e+07 4.959427539465e+06 2.439736882191e+07 9.304955534142e+05 1.476626235005e+07 5.482230798436e+04 9.481648543990e+06
+2.293069943254e+08 8.072982224923e+08 1.700041881354e+08 2.723597657138e+07 4.799836758569e+07 5.597779367006e+06 2.451894591847e+07 1.188861552377e+06 1.491717103490e+07 1.206913751086e+05 9.661616337420e+06
+8.807349364879e+06 3.106438957501e+07 6.567143414722e+06 1.060897957587e+06 1.889904023061e+06 2.249441973825e+05 1.009862024533e+06 5.107442926787e+04 6.717921844071e+05 5.894123635413e+03 5.081106370153e+05
+5.532250736735e+06 1.949853944997e+07 4.114122678418e+06 6.629560690963e+05 1.173407413202e+06 1.386570345139e+05 6.132175139860e+05 3.053149651979e+04 3.899200979017e+05 3.339134937403e+03 2.728129701410e+05
+1.514143192914e+07 5.333490632725e+07 1.122913196169e+07 1.801156746275e+06 3.151685731018e+06 3.655000942203e+05 1.561383038623e+06 7.393405648503e+04 8.704354951987e+05 6.693782275744e+03 4.609662956631e+05
+7.835345023813e+09 2.760077224665e+10 5.814878397925e+09 9.355843709131e+08 1.647579673279e+09 1.937974578021e+08 8.471578232966e+08 4.175102344852e+07 5.208342916001e+08 4.393719607077e+06 3.427050300863e+08
+2.298415113791e+10 8.096334011342e+10 1.705675558698e+10 2.744767050435e+09 4.833657560040e+09 5.688698345768e+08 2.487547718198e+09 1.227691326991e+08 1.532967219293e+09 1.297741727799e+07 1.013702085763e+09
+7.835345023813e+09 2.760077224665e+10 5.814878397925e+09 9.355843709131e+08 1.647579673279e+09 1.937974578021e+08 8.471578232966e+08 4.175102344852e+07 5.208342916001e+08 4.393719607077e+06 3.427050300863e+08
+1.514143192914e+07 5.333490632725e+07 1.122913196169e+07 1.801156746275e+06 3.151685731018e+06 3.655000942203e+05 1.561383038623e+06 7.393405648503e+04 8.704354951987e+05 6.693782275744e+03 4.609662956631e+05
+5.532250736735e+06 1.949853944997e+07 4.114122678418e+06 6.629560690963e+05 1.173407413202e+06 1.386570345139e+05 6.132175139861e+05 3.053149651979e+04 3.899200979017e+05 3.339134937403e+03 2.728129701410e+05
+8.807349364879e+06 3.106438957501e+07 6.567143414722e+06 1.060897957587e+06 1.889904023061e+06 2.249441973825e+05 1.009862024533e+06 5.107442926788e+04 6.717921844071e+05 5.894123635413e+03 5.081106370153e+05
+2.293069943254e+08 8.072982224923e+08 1.700041881354e+08 2.723597657138e+07 4.799836758569e+07 5.597779367006e+06 2.451894591847e+07 1.188861552377e+06 1.491717103490e+07 1.206913751086e+05 9.661616337420e+06
diff --git a/Tests/ReferenceData/MiniExamples/scatter2d/LatticeOrientationDistribution.int b/Tests/ReferenceData/MiniExamples/scatter2d/LatticeOrientationDistribution.int
index ae4484c72ba6f7ff30cd0cf750f0a7a26fe857dd..31a6bba0f7169340eb25635bb214fed42ade284f 100644
--- a/Tests/ReferenceData/MiniExamples/scatter2d/LatticeOrientationDistribution.int
+++ b/Tests/ReferenceData/MiniExamples/scatter2d/LatticeOrientationDistribution.int
@@ -1,21 +1,21 @@
# BornAgain Intensity Data
# axis-0
-EquiDivision("phi_f (rad)", 11, -0.0174532925199433, 0.0174532925199433)
+EquiDivision("q_y (1/nm)", 11, 0, 70)
# axis-1
-EquiDivision("alpha_f (rad)", 11, 0, 0.0349065850398866)
+EquiDivision("q_z (1/nm)", 11, 0, 70)
# data
-1.039587042515e+08 6.879106712558e+07 3.886788209690e+07 2.201852939795e+07 1.033022828818e+07 3.721829250749e+06 8.995243811964e+05 1.080594630520e+05 9.413681795112e+04 2.499569773481e+05 3.709875590668e+05
-7.309655584514e+08 5.088261049875e+08 3.134965817222e+08 1.927212107032e+08 9.206289242927e+07 3.077562213201e+07 6.501280735658e+06 6.891219793249e+05 5.750397138007e+05 1.705330737110e+06 3.528735381847e+06
-1.065889833844e+08 7.478746417653e+07 4.768064199588e+07 3.249201920987e+07 1.940929609662e+07 9.245529208315e+06 2.985503508954e+06 4.709516056127e+05 5.168571688650e+05 1.619624192159e+06 2.571533266716e+06
-1.125822745885e+08 7.903964819791e+07 5.047225249312e+07 3.450883513026e+07 2.073384663752e+07 9.960324369435e+06 3.248172198921e+06 5.164050057716e+05 5.671454297123e+05 1.759795293585e+06 2.746553232000e+06
-1.679489789407e+08 1.178985872292e+08 7.527925062566e+07 5.147623936717e+07 3.094874390627e+07 1.489172074053e+07 4.872056812952e+06 7.791236089618e+05 8.645316165113e+05 2.730269037958e+06 4.385156433269e+06
-6.513273976228e+10 4.571435954986e+10 2.815990423731e+10 1.682874138387e+10 7.561285398621e+09 2.313017628635e+09 4.308618593950e+08 3.748009369071e+07 2.261704870968e+07 3.973032412576e+07 3.660066966669e+07
-1.679489789407e+08 1.178985872292e+08 7.527925062566e+07 5.147623936717e+07 3.094874390627e+07 1.489172074053e+07 4.872056812952e+06 7.791236089618e+05 8.645316165113e+05 2.730269037958e+06 4.385156433269e+06
-1.125822745885e+08 7.903964819791e+07 5.047225249312e+07 3.450883513026e+07 2.073384663752e+07 9.960324369435e+06 3.248172198921e+06 5.164050057716e+05 5.671454297123e+05 1.759795293585e+06 2.746553232000e+06
-1.065889833844e+08 7.478746417653e+07 4.768064199588e+07 3.249201920987e+07 1.940929609662e+07 9.245529208315e+06 2.985503508954e+06 4.709516056127e+05 5.168571688650e+05 1.619624192159e+06 2.571533266716e+06
-7.309655584514e+08 5.088261049875e+08 3.134965817222e+08 1.927212107032e+08 9.206289242927e+07 3.077562213201e+07 6.501280735658e+06 6.891219793249e+05 5.750397138007e+05 1.705330737110e+06 3.528735381847e+06
-1.039587042515e+08 6.879106712558e+07 3.886788209691e+07 2.201852939795e+07 1.033022828818e+07 3.721829250749e+06 8.995243811964e+05 1.080594630520e+05 9.413681795112e+04 2.499569773481e+05 3.709875590668e+05
+1.309623206864e+08 8.496659903046e+07 4.691817334278e+07 2.569648597302e+07 1.159892563936e+07 4.020617381363e+06 9.360232537691e+05 1.086599225024e+05 9.996273723348e+04 2.596591143557e+05 3.818082812679e+05
+6.155547493215e+08 4.244113486706e+08 2.614154855674e+08 1.615524058048e+08 7.859620486908e+07 2.700277831154e+07 5.833017885013e+06 6.245981360163e+05 5.669015242324e+05 1.663132569680e+06 3.365743069185e+06
+1.001235279575e+08 6.971961726673e+07 4.449473021818e+07 3.029047370153e+07 1.805816765389e+07 8.569415338322e+06 2.743284538915e+06 4.270203354849e+05 5.027097443747e+05 1.548060838479e+06 2.425902145315e+06
+1.103010717000e+08 7.683771881724e+07 4.910121086789e+07 3.351598783216e+07 2.007458814169e+07 9.591180321079e+06 3.094496318872e+06 4.846069248142e+05 5.711073170315e+05 1.743840020135e+06 2.693817327960e+06
+1.723500254879e+08 1.200444987862e+08 7.670345521529e+07 5.236072480072e+07 3.137890157897e+07 1.501372722794e+07 4.858350703012e+06 7.650583105341e+05 9.111658652464e+05 2.830880665728e+06 4.499124458232e+06
+6.579261326531e+10 4.581487562190e+10 2.822914745459e+10 1.681773468103e+10 7.513211181096e+09 2.278825735195e+09 4.188632674940e+08 3.582382351970e+07 2.318652260546e+07 4.005181852393e+07 3.650016689010e+07
+1.723500254879e+08 1.200444987862e+08 7.670345521529e+07 5.236072480072e+07 3.137890157897e+07 1.501372722794e+07 4.858350703012e+06 7.650583105341e+05 9.111658652464e+05 2.830880665728e+06 4.499124458232e+06
+1.103010717000e+08 7.683771881724e+07 4.910121086789e+07 3.351598783216e+07 2.007458814169e+07 9.591180321079e+06 3.094496318872e+06 4.846069248142e+05 5.711073170315e+05 1.743840020135e+06 2.693817327960e+06
+1.001235279575e+08 6.971961726673e+07 4.449473021818e+07 3.029047370153e+07 1.805816765389e+07 8.569415338322e+06 2.743284538915e+06 4.270203354849e+05 5.027097443747e+05 1.548060838479e+06 2.425902145315e+06
+6.155547493215e+08 4.244113486706e+08 2.614154855674e+08 1.615524058048e+08 7.859620486908e+07 2.700277831154e+07 5.833017885013e+06 6.245981360164e+05 5.669015242324e+05 1.663132569680e+06 3.365743069185e+06
+1.309623206864e+08 8.496659903046e+07 4.691817334278e+07 2.569648597302e+07 1.159892563936e+07 4.020617381363e+06 9.360232537691e+05 1.086599225024e+05 9.996273723348e+04 2.596591143557e+05 3.818082812679e+05
diff --git a/Tests/ReferenceData/MiniExamples/scatter2d/MagneticCylinders2.0.int b/Tests/ReferenceData/MiniExamples/scatter2d/MagneticCylinders2.0.int
index b751aa57cce005da75e488d5fa7b85d2cbe5d951..521052d707c126f959d076efdcbfcce682cb3f23 100644
--- a/Tests/ReferenceData/MiniExamples/scatter2d/MagneticCylinders2.0.int
+++ b/Tests/ReferenceData/MiniExamples/scatter2d/MagneticCylinders2.0.int
@@ -1,21 +1,21 @@
# BornAgain Intensity Data
# axis-0
-EquiDivision("phi_f (rad)", 11, -0.0174532925199433, 0.0174532925199433)
+EquiDivision("q_y (1/nm)", 11, 0, 70)
# axis-1
-EquiDivision("alpha_f (rad)", 11, 0, 0.0349065850398866)
+EquiDivision("q_z (1/nm)", 11, 0, 70)
# data
-2.677831054519e+03 7.489078625010e+03 1.162189808222e+03 8.115348165443e+02 3.916447615744e+02 9.725499340488e+01 8.625635884846e+00 4.179541239863e+01 8.811660789231e+01 9.554582003049e+01 6.474338584319e+01
-1.483277409542e+02 4.146853140770e+02 6.495949319886e+01 4.522500369324e+01 2.174691892539e+01 5.389522471437e+00 4.755231120592e-01 2.304862552232e+00 4.884974245432e+00 5.339273533129e+00 3.661310944513e+00
-8.221774025708e+03 2.298917339554e+04 3.639858741943e+03 2.520759987496e+03 1.205167576251e+03 2.972695708065e+02 2.599621819056e+01 1.252737251495e+02 2.634092145838e+02 2.845587778076e+02 1.919774209426e+02
-5.252689916473e+04 1.468614631855e+05 2.342280949955e+04 1.603021830425e+04 7.610891061042e+03 1.870904485910e+03 1.631109654079e+02 7.878965769896e+02 1.657269752688e+03 1.792780113274e+03 1.212113874167e+03
-1.215433908044e+05 3.400141617443e+05 5.350848578223e+04 3.607309565142e+04 1.712088963407e+04 4.211458600602e+03 3.682770818675e+02 1.789605570105e+03 3.763802622542e+03 4.076253023604e+03 2.760422986195e+03
-1.566442329039e+05 4.382255997375e+05 6.275934130945e+04 4.362093699922e+04 2.107855794122e+04 5.221966061132e+03 4.607698249258e+02 2.258779320295e+03 4.749337033145e+03 5.150344059103e+03 3.493574257729e+03
-1.215433908044e+05 3.400141617443e+05 4.410952122050e+04 3.168300153864e+04 1.560362158428e+04 3.894391740958e+03 3.468711414704e+02 1.715563765922e+03 3.605977649336e+03 3.915232918283e+03 2.659813887944e+03
-5.252689916473e+04 1.468614631855e+05 1.877403369191e+04 1.327295330867e+04 6.538171098438e+03 1.633317469306e+03 1.459946411861e+02 7.265257469263e+02 1.526433701480e+03 1.658579153057e+03 1.127876906815e+03
-8.221774025708e+03 2.298917339554e+04 2.962903453153e+03 2.067837194548e+03 1.011050260539e+03 2.516329549710e+02 2.241544383746e+01 1.117778774332e+02 2.346366460045e+02 2.548302627821e+02 1.732039256322e+02
-1.483277409542e+02 4.146853140770e+02 5.402586153924e+01 3.745931622931e+01 1.820169559565e+01 4.515892286729e+00 4.004386795954e-01 2.004313191321e+00 4.238562873840e+00 4.656960365427e+00 3.219267495278e+00
-2.677831054519e+03 7.489078625010e+03 9.864866073139e+02 6.822937560314e+02 3.302499734410e+02 8.165388008813e+01 7.173183923857e+00 3.567705932382e+01 7.500884545621e+01 8.168476984142e+01 5.578425480298e+01
+2.713984213106e+03 7.520240064339e+03 1.170295436043e+03 8.149733503581e+02 3.906789598387e+02 9.556922091850e+01 8.603921890926e+00 4.311182589041e+01 8.943752074410e+01 9.598850285691e+01 6.429565103056e+01
+1.690108347763e+02 4.680840413044e+02 7.353604057046e+01 5.105468023861e+01 2.438357911982e+01 5.951105115170e+00 5.329170751678e-01 2.673145608538e+00 5.571168919835e+00 6.022831619893e+00 4.078578841249e+00
+8.118132907965e+03 2.248354477126e+04 3.570191484681e+03 2.465496060325e+03 1.170640502444e+03 2.843128884673e+02 2.523742025886e+01 1.259688294203e+02 2.604774134052e+02 2.784129556436e+02 1.855846903942e+02
+5.271165532408e+04 1.459629941985e+05 2.334796298600e+04 1.593318087620e+04 7.512392138493e+03 1.817996302564e+03 1.609201460604e+02 8.053520188590e+02 1.665651003041e+03 1.782638419155e+03 1.190726852747e+03
+1.226024564214e+05 3.396653404670e+05 5.360766051563e+04 3.603895085268e+04 1.698542034626e+04 4.112635137322e+03 3.653217862127e+02 1.838824260433e+03 3.802382795993e+03 4.073952395343e+03 2.725411818428e+03
+1.582322395701e+05 4.383845339984e+05 6.296758993701e+04 4.364519315187e+04 2.094138267328e+04 5.106042720007e+03 4.580098532260e+02 2.324068097662e+03 4.804649057965e+03 5.154552217900e+03 3.453958520213e+03
+1.226024564214e+05 3.396653404670e+05 4.419659429753e+04 3.166008128854e+04 1.548122787735e+04 3.802591628382e+03 3.445513894264e+02 1.762429049064e+03 3.642655299370e+03 3.912889332950e+03 2.626011158092e+03
+5.271165532408e+04 1.459629941985e+05 1.871348812925e+04 1.319606627911e+04 6.454216867380e+03 1.586852707581e+03 1.443444562183e+02 7.423905770381e+02 1.533936968365e+03 1.649095212678e+03 1.107925111433e+03
+8.118132907965e+03 2.248354477126e+04 2.906084525042e+03 2.023002802541e+03 9.821993069535e+02 2.406224354204e+02 2.181019532607e+01 1.123565762205e+02 2.319835478860e+02 2.493072501515e+02 1.674267504820e+02
+1.690108347763e+02 4.680840413044e+02 6.115833492036e+01 4.229789172616e+01 2.041114414292e+01 4.985736508364e+00 4.495833309813e-01 2.323735611187e+00 4.833033171430e+00 5.252744579165e+00 3.585949505684e+00
+2.713984213106e+03 7.520240064339e+03 9.933831614479e+02 6.853386238334e+02 3.294810974752e+02 8.023139903889e+01 7.163157404202e+00 3.678953858867e+01 7.611947552719e+01 8.205733924180e+01 5.539577049864e+01
diff --git a/Tests/ReferenceData/MiniExamples/scatter2d/MagneticCylinders2.1.int b/Tests/ReferenceData/MiniExamples/scatter2d/MagneticCylinders2.1.int
index 73473b6bdfb90c32f314c4819e35b2bb239ed58a..17cf51015dfd1c3a886832de6f66d76599a2e328 100644
--- a/Tests/ReferenceData/MiniExamples/scatter2d/MagneticCylinders2.1.int
+++ b/Tests/ReferenceData/MiniExamples/scatter2d/MagneticCylinders2.1.int
@@ -1,21 +1,21 @@
# BornAgain Intensity Data
# axis-0
-EquiDivision("phi_f (rad)", 11, -0.0174532925199433, 0.0174532925199433)
+EquiDivision("q_y (1/nm)", 11, 0, 70)
# axis-1
-EquiDivision("alpha_f (rad)", 11, 0, 0.0349065850398866)
+EquiDivision("q_z (1/nm)", 11, 0, 70)
# data
-2.181926876403e-02 6.836071687628e-01 3.079979562001e-01 4.331810321632e-01 3.802249330327e-01 1.336685512878e-01 2.996181366194e-02 1.815367147750e-01 3.893057638992e-01 4.514853362586e-01 3.261917425149e-01
-2.631144586217e-03 7.395691325093e-02 3.140172922989e-02 4.250417316088e-02 3.528032407660e-02 1.190309158034e-02 2.082919366582e-03 1.228064703318e-02 2.630526493694e-02 3.019230756841e-02 2.168743090742e-02
-3.967138115241e-01 8.676553507645e+00 3.406450134472e+00 4.397407412760e+00 3.332999527954e+00 1.049269807552e+00 1.427401746813e-01 7.985752789817e-01 1.688479648918e+00 1.881896378225e+00 1.307754548695e+00
-9.316280408047e+00 1.242103600366e+02 4.590818787535e+01 5.397275546479e+01 3.526337224774e+01 1.008535501155e+01 1.101295120128e+00 5.805025604656e+00 1.223588365017e+01 1.344814607055e+01 9.231338990713e+00
-1.313788089058e+02 6.729221215562e+02 2.451115416524e+02 2.237861672008e+02 1.203645820656e+02 3.118936857626e+01 2.916909862387e+00 1.458345471212e+01 3.067918259154e+01 3.338768108727e+01 2.271910732100e+01
-1.340709352219e+03 3.750748744835e+03 5.371537417806e+02 3.733491945617e+02 1.804102151684e+02 4.469451958327e+01 3.943703525155e+00 1.933276765559e+01 4.064931379302e+01 4.408151081707e+01 2.990130943973e+01
-1.313788089058e+02 6.729221215562e+02 2.460040952994e+02 2.241432746905e+02 1.204444546856e+02 3.117422257102e+01 2.897084620859e+00 1.458559902111e+01 3.069646320195e+01 3.340496299270e+01 2.272752036586e+01
-9.316280408047e+00 1.242103600366e+02 4.637998120759e+01 5.420786297783e+01 3.532197992498e+01 1.007360225822e+01 1.085416126189e+00 5.806776838882e+00 1.225017692886e+01 1.346256464630e+01 9.238400763941e+00
-3.967138115241e-01 8.676553507645e+00 3.478712658328e+00 4.437987849515e+00 3.344105728871e+00 1.046901490031e+00 1.394104272540e-01 7.989523076250e-01 1.691612348099e+00 1.885095550973e+00 1.309334570874e+00
-2.631144586217e-03 7.395691325093e-02 3.260640310375e-02 4.322858953761e-02 3.549237539821e-02 1.185534773540e-02 2.012916357150e-03 1.228884329957e-02 2.637536010249e-02 3.026587999005e-02 2.172482071209e-02
-2.181926876403e-02 6.836071687628e-01 3.277386725967e-01 4.456026772156e-01 3.840390087144e-01 1.327729206689e-01 2.860420458363e-02 1.816995758146e-01 3.907209988333e-01 4.529832527822e-01 3.269538646443e-01
+2.198141504819e-02 6.873949454855e-01 3.090238307662e-01 4.346434720068e-01 3.788740008683e-01 1.309295449345e-01 3.080093814553e-02 1.865331895097e-01 3.945424130836e-01 4.531386920065e-01 3.236391434918e-01
+2.978357887053e-03 8.363728687156e-02 3.544300667381e-02 4.796551758143e-02 3.953160098423e-02 1.311197707093e-02 2.393586827944e-03 1.420109732647e-02 2.996721339088e-02 3.403445959088e-02 2.414371587337e-02
+3.890600555378e-01 8.508453688277e+00 3.334778894335e+00 4.301618357240e+00 3.236641017062e+00 1.002002897759e+00 1.410755323231e-01 8.014323967577e-01 1.668502906706e+00 1.840475022896e+00 1.263717976868e+00
+9.284213450415e+00 1.239455212374e+02 4.573692560797e+01 5.367141838118e+01 3.480658599575e+01 9.792680409561e+00 1.097203917305e+00 5.927470367923e+00 1.229327566888e+01 1.336927881344e+01 9.066758883792e+00
+1.315703468689e+02 6.765524596844e+02 2.457013067273e+02 2.236506362291e+02 1.194177703273e+02 3.045073652045e+01 2.902403565268e+00 1.497956321771e+01 3.099004874863e+01 3.336674640979e+01 2.242974438828e+01
+1.354301013714e+03 3.752109054410e+03 5.389361303013e+02 3.735568016348e+02 1.792361396138e+02 4.370233809848e+01 3.920081079558e+00 1.989157070111e+01 4.112272636360e+01 4.411752821618e+01 2.956224052670e+01
+1.315703468689e+02 6.765524596844e+02 2.465944756100e+02 2.240061368870e+02 1.194961532228e+02 3.043498495854e+01 2.882737397182e+00 1.498212579939e+01 3.100757845021e+01 3.338398629076e+01 2.243796175536e+01
+9.284213450415e+00 1.239455212374e+02 4.620698825253e+01 5.390436537379e+01 3.486382254327e+01 9.780522021880e+00 1.081531451095e+00 5.929550451885e+00 1.230769965970e+01 1.338358896663e+01 9.073622133449e+00
+3.890600555378e-01 8.508453688277e+00 3.405630359227e+00 4.341192104235e+00 3.247317291530e+00 9.995927567186e-01 1.378412803712e-01 8.018723251338e-01 1.671613148030e+00 1.843599254381e+00 1.265229266914e+00
+2.978357887053e-03 8.363728687156e-02 3.680608253859e-02 4.878096346103e-02 3.976694840568e-02 1.305592745790e-02 2.315106122837e-03 1.421210635304e-02 3.004746950097e-02 3.411729735544e-02 2.418493365812e-02
+2.198141504819e-02 6.873949454855e-01 3.288907534253e-01 4.470821586724e-01 3.826407992705e-01 1.299948322666e-01 2.944663249755e-02 1.867272554110e-01 3.959843976382e-01 4.546407971619e-01 3.243882740838e-01
diff --git a/Tests/ReferenceData/MiniExamples/scatter2d/MagneticCylinders2.2.int b/Tests/ReferenceData/MiniExamples/scatter2d/MagneticCylinders2.2.int
index b751aa57cce005da75e488d5fa7b85d2cbe5d951..521052d707c126f959d076efdcbfcce682cb3f23 100644
--- a/Tests/ReferenceData/MiniExamples/scatter2d/MagneticCylinders2.2.int
+++ b/Tests/ReferenceData/MiniExamples/scatter2d/MagneticCylinders2.2.int
@@ -1,21 +1,21 @@
# BornAgain Intensity Data
# axis-0
-EquiDivision("phi_f (rad)", 11, -0.0174532925199433, 0.0174532925199433)
+EquiDivision("q_y (1/nm)", 11, 0, 70)
# axis-1
-EquiDivision("alpha_f (rad)", 11, 0, 0.0349065850398866)
+EquiDivision("q_z (1/nm)", 11, 0, 70)
# data
-2.677831054519e+03 7.489078625010e+03 1.162189808222e+03 8.115348165443e+02 3.916447615744e+02 9.725499340488e+01 8.625635884846e+00 4.179541239863e+01 8.811660789231e+01 9.554582003049e+01 6.474338584319e+01
-1.483277409542e+02 4.146853140770e+02 6.495949319886e+01 4.522500369324e+01 2.174691892539e+01 5.389522471437e+00 4.755231120592e-01 2.304862552232e+00 4.884974245432e+00 5.339273533129e+00 3.661310944513e+00
-8.221774025708e+03 2.298917339554e+04 3.639858741943e+03 2.520759987496e+03 1.205167576251e+03 2.972695708065e+02 2.599621819056e+01 1.252737251495e+02 2.634092145838e+02 2.845587778076e+02 1.919774209426e+02
-5.252689916473e+04 1.468614631855e+05 2.342280949955e+04 1.603021830425e+04 7.610891061042e+03 1.870904485910e+03 1.631109654079e+02 7.878965769896e+02 1.657269752688e+03 1.792780113274e+03 1.212113874167e+03
-1.215433908044e+05 3.400141617443e+05 5.350848578223e+04 3.607309565142e+04 1.712088963407e+04 4.211458600602e+03 3.682770818675e+02 1.789605570105e+03 3.763802622542e+03 4.076253023604e+03 2.760422986195e+03
-1.566442329039e+05 4.382255997375e+05 6.275934130945e+04 4.362093699922e+04 2.107855794122e+04 5.221966061132e+03 4.607698249258e+02 2.258779320295e+03 4.749337033145e+03 5.150344059103e+03 3.493574257729e+03
-1.215433908044e+05 3.400141617443e+05 4.410952122050e+04 3.168300153864e+04 1.560362158428e+04 3.894391740958e+03 3.468711414704e+02 1.715563765922e+03 3.605977649336e+03 3.915232918283e+03 2.659813887944e+03
-5.252689916473e+04 1.468614631855e+05 1.877403369191e+04 1.327295330867e+04 6.538171098438e+03 1.633317469306e+03 1.459946411861e+02 7.265257469263e+02 1.526433701480e+03 1.658579153057e+03 1.127876906815e+03
-8.221774025708e+03 2.298917339554e+04 2.962903453153e+03 2.067837194548e+03 1.011050260539e+03 2.516329549710e+02 2.241544383746e+01 1.117778774332e+02 2.346366460045e+02 2.548302627821e+02 1.732039256322e+02
-1.483277409542e+02 4.146853140770e+02 5.402586153924e+01 3.745931622931e+01 1.820169559565e+01 4.515892286729e+00 4.004386795954e-01 2.004313191321e+00 4.238562873840e+00 4.656960365427e+00 3.219267495278e+00
-2.677831054519e+03 7.489078625010e+03 9.864866073139e+02 6.822937560314e+02 3.302499734410e+02 8.165388008813e+01 7.173183923857e+00 3.567705932382e+01 7.500884545621e+01 8.168476984142e+01 5.578425480298e+01
+2.713984213106e+03 7.520240064339e+03 1.170295436043e+03 8.149733503581e+02 3.906789598387e+02 9.556922091850e+01 8.603921890926e+00 4.311182589041e+01 8.943752074410e+01 9.598850285691e+01 6.429565103056e+01
+1.690108347763e+02 4.680840413044e+02 7.353604057046e+01 5.105468023861e+01 2.438357911982e+01 5.951105115170e+00 5.329170751678e-01 2.673145608538e+00 5.571168919835e+00 6.022831619893e+00 4.078578841249e+00
+8.118132907965e+03 2.248354477126e+04 3.570191484681e+03 2.465496060325e+03 1.170640502444e+03 2.843128884673e+02 2.523742025886e+01 1.259688294203e+02 2.604774134052e+02 2.784129556436e+02 1.855846903942e+02
+5.271165532408e+04 1.459629941985e+05 2.334796298600e+04 1.593318087620e+04 7.512392138493e+03 1.817996302564e+03 1.609201460604e+02 8.053520188590e+02 1.665651003041e+03 1.782638419155e+03 1.190726852747e+03
+1.226024564214e+05 3.396653404670e+05 5.360766051563e+04 3.603895085268e+04 1.698542034626e+04 4.112635137322e+03 3.653217862127e+02 1.838824260433e+03 3.802382795993e+03 4.073952395343e+03 2.725411818428e+03
+1.582322395701e+05 4.383845339984e+05 6.296758993701e+04 4.364519315187e+04 2.094138267328e+04 5.106042720007e+03 4.580098532260e+02 2.324068097662e+03 4.804649057965e+03 5.154552217900e+03 3.453958520213e+03
+1.226024564214e+05 3.396653404670e+05 4.419659429753e+04 3.166008128854e+04 1.548122787735e+04 3.802591628382e+03 3.445513894264e+02 1.762429049064e+03 3.642655299370e+03 3.912889332950e+03 2.626011158092e+03
+5.271165532408e+04 1.459629941985e+05 1.871348812925e+04 1.319606627911e+04 6.454216867380e+03 1.586852707581e+03 1.443444562183e+02 7.423905770381e+02 1.533936968365e+03 1.649095212678e+03 1.107925111433e+03
+8.118132907965e+03 2.248354477126e+04 2.906084525042e+03 2.023002802541e+03 9.821993069535e+02 2.406224354204e+02 2.181019532607e+01 1.123565762205e+02 2.319835478860e+02 2.493072501515e+02 1.674267504820e+02
+1.690108347763e+02 4.680840413044e+02 6.115833492036e+01 4.229789172616e+01 2.041114414292e+01 4.985736508364e+00 4.495833309813e-01 2.323735611187e+00 4.833033171430e+00 5.252744579165e+00 3.585949505684e+00
+2.713984213106e+03 7.520240064339e+03 9.933831614479e+02 6.853386238334e+02 3.294810974752e+02 8.023139903889e+01 7.163157404202e+00 3.678953858867e+01 7.611947552719e+01 8.205733924180e+01 5.539577049864e+01
diff --git a/Tests/ReferenceData/MiniExamples/scatter2d/MagneticCylinders2.3.int b/Tests/ReferenceData/MiniExamples/scatter2d/MagneticCylinders2.3.int
index 73473b6bdfb90c32f314c4819e35b2bb239ed58a..17cf51015dfd1c3a886832de6f66d76599a2e328 100644
--- a/Tests/ReferenceData/MiniExamples/scatter2d/MagneticCylinders2.3.int
+++ b/Tests/ReferenceData/MiniExamples/scatter2d/MagneticCylinders2.3.int
@@ -1,21 +1,21 @@
# BornAgain Intensity Data
# axis-0
-EquiDivision("phi_f (rad)", 11, -0.0174532925199433, 0.0174532925199433)
+EquiDivision("q_y (1/nm)", 11, 0, 70)
# axis-1
-EquiDivision("alpha_f (rad)", 11, 0, 0.0349065850398866)
+EquiDivision("q_z (1/nm)", 11, 0, 70)
# data
-2.181926876403e-02 6.836071687628e-01 3.079979562001e-01 4.331810321632e-01 3.802249330327e-01 1.336685512878e-01 2.996181366194e-02 1.815367147750e-01 3.893057638992e-01 4.514853362586e-01 3.261917425149e-01
-2.631144586217e-03 7.395691325093e-02 3.140172922989e-02 4.250417316088e-02 3.528032407660e-02 1.190309158034e-02 2.082919366582e-03 1.228064703318e-02 2.630526493694e-02 3.019230756841e-02 2.168743090742e-02
-3.967138115241e-01 8.676553507645e+00 3.406450134472e+00 4.397407412760e+00 3.332999527954e+00 1.049269807552e+00 1.427401746813e-01 7.985752789817e-01 1.688479648918e+00 1.881896378225e+00 1.307754548695e+00
-9.316280408047e+00 1.242103600366e+02 4.590818787535e+01 5.397275546479e+01 3.526337224774e+01 1.008535501155e+01 1.101295120128e+00 5.805025604656e+00 1.223588365017e+01 1.344814607055e+01 9.231338990713e+00
-1.313788089058e+02 6.729221215562e+02 2.451115416524e+02 2.237861672008e+02 1.203645820656e+02 3.118936857626e+01 2.916909862387e+00 1.458345471212e+01 3.067918259154e+01 3.338768108727e+01 2.271910732100e+01
-1.340709352219e+03 3.750748744835e+03 5.371537417806e+02 3.733491945617e+02 1.804102151684e+02 4.469451958327e+01 3.943703525155e+00 1.933276765559e+01 4.064931379302e+01 4.408151081707e+01 2.990130943973e+01
-1.313788089058e+02 6.729221215562e+02 2.460040952994e+02 2.241432746905e+02 1.204444546856e+02 3.117422257102e+01 2.897084620859e+00 1.458559902111e+01 3.069646320195e+01 3.340496299270e+01 2.272752036586e+01
-9.316280408047e+00 1.242103600366e+02 4.637998120759e+01 5.420786297783e+01 3.532197992498e+01 1.007360225822e+01 1.085416126189e+00 5.806776838882e+00 1.225017692886e+01 1.346256464630e+01 9.238400763941e+00
-3.967138115241e-01 8.676553507645e+00 3.478712658328e+00 4.437987849515e+00 3.344105728871e+00 1.046901490031e+00 1.394104272540e-01 7.989523076250e-01 1.691612348099e+00 1.885095550973e+00 1.309334570874e+00
-2.631144586217e-03 7.395691325093e-02 3.260640310375e-02 4.322858953761e-02 3.549237539821e-02 1.185534773540e-02 2.012916357150e-03 1.228884329957e-02 2.637536010249e-02 3.026587999005e-02 2.172482071209e-02
-2.181926876403e-02 6.836071687628e-01 3.277386725967e-01 4.456026772156e-01 3.840390087144e-01 1.327729206689e-01 2.860420458363e-02 1.816995758146e-01 3.907209988333e-01 4.529832527822e-01 3.269538646443e-01
+2.198141504819e-02 6.873949454855e-01 3.090238307662e-01 4.346434720068e-01 3.788740008683e-01 1.309295449345e-01 3.080093814553e-02 1.865331895097e-01 3.945424130836e-01 4.531386920065e-01 3.236391434918e-01
+2.978357887053e-03 8.363728687156e-02 3.544300667381e-02 4.796551758143e-02 3.953160098423e-02 1.311197707093e-02 2.393586827944e-03 1.420109732647e-02 2.996721339088e-02 3.403445959088e-02 2.414371587337e-02
+3.890600555378e-01 8.508453688277e+00 3.334778894335e+00 4.301618357240e+00 3.236641017062e+00 1.002002897759e+00 1.410755323231e-01 8.014323967577e-01 1.668502906706e+00 1.840475022896e+00 1.263717976868e+00
+9.284213450415e+00 1.239455212374e+02 4.573692560797e+01 5.367141838118e+01 3.480658599575e+01 9.792680409561e+00 1.097203917305e+00 5.927470367923e+00 1.229327566888e+01 1.336927881344e+01 9.066758883792e+00
+1.315703468689e+02 6.765524596844e+02 2.457013067273e+02 2.236506362291e+02 1.194177703273e+02 3.045073652045e+01 2.902403565268e+00 1.497956321771e+01 3.099004874863e+01 3.336674640979e+01 2.242974438828e+01
+1.354301013714e+03 3.752109054410e+03 5.389361303013e+02 3.735568016348e+02 1.792361396138e+02 4.370233809848e+01 3.920081079558e+00 1.989157070111e+01 4.112272636360e+01 4.411752821618e+01 2.956224052670e+01
+1.315703468689e+02 6.765524596844e+02 2.465944756100e+02 2.240061368870e+02 1.194961532228e+02 3.043498495854e+01 2.882737397182e+00 1.498212579939e+01 3.100757845021e+01 3.338398629076e+01 2.243796175536e+01
+9.284213450415e+00 1.239455212374e+02 4.620698825253e+01 5.390436537379e+01 3.486382254327e+01 9.780522021880e+00 1.081531451095e+00 5.929550451885e+00 1.230769965970e+01 1.338358896663e+01 9.073622133449e+00
+3.890600555378e-01 8.508453688277e+00 3.405630359227e+00 4.341192104235e+00 3.247317291530e+00 9.995927567186e-01 1.378412803712e-01 8.018723251338e-01 1.671613148030e+00 1.843599254381e+00 1.265229266914e+00
+2.978357887053e-03 8.363728687156e-02 3.680608253859e-02 4.878096346103e-02 3.976694840568e-02 1.305592745790e-02 2.315106122837e-03 1.421210635304e-02 3.004746950097e-02 3.411729735544e-02 2.418493365812e-02
+2.198141504819e-02 6.873949454855e-01 3.288907534253e-01 4.470821586724e-01 3.826407992705e-01 1.299948322666e-01 2.944663249755e-02 1.867272554110e-01 3.959843976382e-01 4.546407971619e-01 3.243882740838e-01
diff --git a/Tests/ReferenceData/MiniExamples/scatter2d/PolydisperseCylinders.int b/Tests/ReferenceData/MiniExamples/scatter2d/PolydisperseCylinders.int
index dc819c424d2aa5aeb4b8a26990928aa021b06581..36025e2086890be07b4a88418b67404af26ee10c 100644
--- a/Tests/ReferenceData/MiniExamples/scatter2d/PolydisperseCylinders.int
+++ b/Tests/ReferenceData/MiniExamples/scatter2d/PolydisperseCylinders.int
@@ -1,21 +1,21 @@
# BornAgain Intensity Data
# axis-0
-EquiDivision("phi_f (rad)", 11, -0.0174532925199433, 0.0174532925199433)
+EquiDivision("q_y (1/nm)", 11, 0, 70)
# axis-1
-EquiDivision("alpha_f (rad)", 11, 0, 0.0349065850398866)
+EquiDivision("q_z (1/nm)", 11, 0, 70)
# data
-8.989141269507e+06 6.157550461446e+06 3.296563159198e+06 1.195832469925e+06 1.687220052464e+05 2.247117004870e+04 2.822928698210e+05 5.037392737705e+05 4.848381438135e+05 2.830395497800e+05 7.721996643694e+04
-2.372836507417e+07 1.625362504508e+07 8.701435479129e+06 3.156353225698e+06 4.453250441814e+05 5.931075082480e+04 7.451298425690e+05 1.329828844525e+06 1.280240272227e+06 7.476670084054e+05 2.040959972044e+05
-5.881302352693e+07 4.028798254460e+07 2.156962825061e+07 7.824296181963e+06 1.103794036665e+06 1.469562415091e+05 1.844841712790e+06 3.288121965000e+06 3.158871563614e+06 1.839069942097e+06 4.998276120914e+05
-4.554926942435e+07 3.119975276211e+07 1.670272187779e+07 6.059364527093e+06 8.552161243877e+05 1.139948183261e+05 1.434291268921e+06 2.566158587431e+06 2.479948224462e+06 1.456409015968e+06 4.006861835910e+05
-2.672394387797e+09 1.830584224454e+09 9.799634113337e+08 3.553765336735e+08 5.010339069505e+07 6.663106838418e+06 8.348814206616e+07 1.483642710562e+08 1.419113895459e+08 8.211115894534e+07 2.212893496371e+07
-8.533998155905e+09 5.845695165783e+09 3.129325785552e+09 1.134841639562e+09 1.600099688263e+08 2.128335998081e+07 2.667778153385e+08 4.743811985912e+08 4.541926103095e+08 2.631765562474e+08 7.106868548750e+07
-2.672394387797e+09 1.830584224454e+09 9.799634113337e+08 3.553765336735e+08 5.010339069505e+07 6.663106838418e+06 8.348814206616e+07 1.483642710562e+08 1.419113895459e+08 8.211115894534e+07 2.212893496371e+07
-4.554926942435e+07 3.119975276211e+07 1.670272187779e+07 6.059364527093e+06 8.552161243877e+05 1.139948183261e+05 1.434291268921e+06 2.566158587431e+06 2.479948224462e+06 1.456409015968e+06 4.006861835910e+05
-5.881302352693e+07 4.028798254460e+07 2.156962825061e+07 7.824296181963e+06 1.103794036665e+06 1.469562415091e+05 1.844841712790e+06 3.288121965000e+06 3.158871563614e+06 1.839069942097e+06 4.998276120914e+05
-2.372836507417e+07 1.625362504508e+07 8.701435479129e+06 3.156353225698e+06 4.453250441814e+05 5.931075082480e+04 7.451298425690e+05 1.329828844525e+06 1.280240272227e+06 7.476670084054e+05 2.040959972044e+05
-8.989141269507e+06 6.157550461446e+06 3.296563159198e+06 1.195832469925e+06 1.687220052464e+05 2.247117004870e+04 2.822928698210e+05 5.037392737705e+05 4.848381438135e+05 2.830395497800e+05 7.721996643694e+04
+8.969220493131e+06 6.134505817228e+06 3.273958738474e+06 1.179744141322e+06 1.626286786720e+05 2.438270934061e+04 2.862969472767e+05 5.044280760662e+05 4.808930746898e+05 2.772797127695e+05 7.353366450024e+04
+2.387547955237e+07 1.632896214540e+07 8.713976128548e+06 3.139535365411e+06 4.325910705310e+05 6.499897675317e+04 7.623115940826e+05 1.342959224785e+06 1.280334444115e+06 7.382924886481e+05 1.957691359024e+05
+5.779778768847e+07 3.953011531399e+07 2.109566606121e+07 7.599914627809e+06 1.046706189945e+06 1.574810710236e+05 1.843792447907e+06 3.243266110044e+06 3.085048798011e+06 1.773051865235e+06 4.678580790567e+05
+4.658374573626e+07 3.185749526288e+07 1.699932093964e+07 6.124299915472e+06 8.436854449721e+05 1.272424438747e+05 1.492215564966e+06 2.634809816043e+06 2.521328667636e+06 1.461842509031e+06 3.904586477249e+05
+2.667381679181e+09 1.824224877384e+09 9.733613552028e+08 3.505237122046e+08 4.822797972694e+07 7.261813588600e+06 8.476738192228e+07 1.486325598575e+08 1.407383198336e+08 8.036639858227e+07 2.101571923817e+07
+8.576537679827e+09 5.865408903823e+09 3.129577854741e+09 1.127013224478e+09 1.550686143886e+08 2.335929273395e+07 2.727401628285e+08 4.785209294877e+08 4.535470713121e+08 2.593610890386e+08 6.795663687879e+07
+2.667381679181e+09 1.824224877384e+09 9.733613552028e+08 3.505237122046e+08 4.822797972694e+07 7.261813588600e+06 8.476738192228e+07 1.486325598575e+08 1.407383198336e+08 8.036639858227e+07 2.101571923817e+07
+4.658374573626e+07 3.185749526288e+07 1.699932093964e+07 6.124299915472e+06 8.436854449721e+05 1.272424438747e+05 1.492215564966e+06 2.634809816043e+06 2.521328667636e+06 1.461842509031e+06 3.904586477249e+05
+5.779778768847e+07 3.953011531399e+07 2.109566606121e+07 7.599914627809e+06 1.046706189945e+06 1.574810710236e+05 1.843792447907e+06 3.243266110044e+06 3.085048798011e+06 1.773051865235e+06 4.678580790567e+05
+2.387547955237e+07 1.632896214540e+07 8.713976128548e+06 3.139535365411e+06 4.325910705310e+05 6.499897675317e+04 7.623115940826e+05 1.342959224785e+06 1.280334444115e+06 7.382924886481e+05 1.957691359024e+05
+8.969220493131e+06 6.134505817228e+06 3.273958738474e+06 1.179744141322e+06 1.626286786720e+05 2.438270934062e+04 2.862969472767e+05 5.044280760662e+05 4.808930746898e+05 2.772797127695e+05 7.353366450024e+04
diff --git a/auto/Examples/fit/scatter2d/fit_with_masks.py b/auto/Examples/fit/scatter2d/fit_with_masks.py
index becfaa0ccabee3b39b5fdc82479c419d0e416343..05a37a34807b38ee9f666cc1722e1ca21f7fc5a3 100755
--- a/auto/Examples/fit/scatter2d/fit_with_masks.py
+++ b/auto/Examples/fit/scatter2d/fit_with_masks.py
@@ -61,7 +61,7 @@ if __name__ == '__main__':
fit_objective.addSimulationAndData(get_masked_simulation, real_data, 1)
fit_objective.initPrint(10)
observer = ba_fitmonitor.PlotterGISAS()
- fit_objective.initPlot(10, observer)
+ fit_objective.initPlot(10, observer)
P = ba.Parameters()
P.add("radius", 6.*nm, min=4, max=8)
diff --git a/auto/Examples/fit/scatter2d/minimizer_settings.py b/auto/Examples/fit/scatter2d/minimizer_settings.py
index 95394c090104bb958b5038f5b99c15e4ee0c03f6..a95e54328e9348d5c172e9effb52e6f6a19e478f 100755
--- a/auto/Examples/fit/scatter2d/minimizer_settings.py
+++ b/auto/Examples/fit/scatter2d/minimizer_settings.py
@@ -47,7 +47,7 @@ def get_simulation(P):
"""
beam = ba.Beam(1e8, 1*angstrom, 0.2*deg)
n = 100 # bp.simargs['n']
- detector = ba.SphericalDetector(n, -1*deg, 1*deg, n, 0, 2*deg)
+ detector = ba.FlatDetector(n, n, 70, 70, beam, ba.FlatDetector.X, 2000, 0, -35)
return ba.ScatteringSimulation(beam, get_sample(P), detector)
diff --git a/auto/Examples/fit/scatter2d/model1_cylinders.py b/auto/Examples/fit/scatter2d/model1_cylinders.py
index 91facfab7c3c2b58e7e267af865bbc25c83567e6..08eb6d25186b880651175162f0dd5763967e35fe 100755
--- a/auto/Examples/fit/scatter2d/model1_cylinders.py
+++ b/auto/Examples/fit/scatter2d/model1_cylinders.py
@@ -38,6 +38,7 @@ def get_simulation(P):
beam = ba.Beam(1e8, 0.1*nm, 0.2*deg)
sample = get_sample(P)
detector = ba.SphericalDetector(n, -1*deg, 1*deg, n, 0, 2*deg)
+ # detector = ba.FlatDetector(n, n, 70, 70, beam, ba.FlatDetector.X, 2000, 0, -35)
return ba.ScatteringSimulation(beam, sample, detector)
diff --git a/auto/Examples/fit/scatter2d/model2_hexlattice.py b/auto/Examples/fit/scatter2d/model2_hexlattice.py
index a08df601e1bae78be55847c7f7e26d3c652812f6..46e5d9b8f260b31e6b5905c0bde6fc4acd410bf8 100755
--- a/auto/Examples/fit/scatter2d/model2_hexlattice.py
+++ b/auto/Examples/fit/scatter2d/model2_hexlattice.py
@@ -40,9 +40,9 @@ def get_simulation(P):
Create and return GISAXS simulation with beam and detector defined
"""
n = 100
- detector = ba.SphericalDetector(n, -1*deg, 1*deg, n, 0, 2*deg)
- sample = get_sample(P)
beam = ba.Beam(1e8, 0.1*nm, 0.2*deg)
+ detector = ba.FlatDetector(n, n, 70, 70, beam, ba.FlatDetector.X, 2000, 0, -35)
+ sample = get_sample(P)
simulation = ba.ScatteringSimulation(beam, sample, detector)
return simulation
diff --git a/auto/Examples/scatter2d/CustomFormFactor.py b/auto/Examples/scatter2d/CustomFormFactor.py
index b55bd203f02905704784bd213c063ac11130beb6..4bb2cff923c8fcca4929b522d0c4ea870ee3d68d 100755
--- a/auto/Examples/scatter2d/CustomFormFactor.py
+++ b/auto/Examples/scatter2d/CustomFormFactor.py
@@ -76,7 +76,7 @@ def get_sample():
def get_simulation(sample):
beam = ba.Beam(1e9, 1*angstrom, 0.2*deg)
n = 100
- det = ba.SphericalDetector(n, -1*deg, 1*deg, n, 0, 2*deg)
+ det = ba.FlatDetector(n, n, 70, 70, beam, ba.FlatDetector.X, 2000, 0, -35)
simulation = ba.ScatteringSimulation(beam, sample, det)
simulation.options().setNumberOfThreads(
1) # deactivate multithreading (why?)
diff --git a/auto/Examples/scatter2d/Interference1DLattice.py b/auto/Examples/scatter2d/Interference1DLattice.py
index 2d5ebeb7f6e817f3b70fcbf8b62a93db5fc0dc63..8e7d93825cd74d7dacfec1fa688ed909c5a8a2e6 100755
--- a/auto/Examples/scatter2d/Interference1DLattice.py
+++ b/auto/Examples/scatter2d/Interference1DLattice.py
@@ -54,7 +54,7 @@ def get_sample():
def get_simulation(sample):
beam = ba.Beam(1e9, 1*angstrom, 0.2*deg)
n = 100
- det = ba.SphericalDetector(n, -1*deg, 1*deg, n, 0, 2*deg)
+ det = ba.FlatDetector(n, n, 70, 70, beam, ba.FlatDetector.X, 2000, 0, -35)
simulation = ba.ScatteringSimulation(beam, sample, det)
simulation.options().setMonteCarloIntegration(True, 100)
if not "__no_terminal__" in globals():
diff --git a/auto/Examples/scatter2d/LatticeOrientationDistribution.py b/auto/Examples/scatter2d/LatticeOrientationDistribution.py
index a53cc9fd2feba7f1fea21166928ffb6feb24fa6b..a1fa3792be1be38ab21b6cd8a33cef3101472e67 100755
--- a/auto/Examples/scatter2d/LatticeOrientationDistribution.py
+++ b/auto/Examples/scatter2d/LatticeOrientationDistribution.py
@@ -37,7 +37,7 @@ def get_sample():
def get_simulation(sample):
beam = ba.Beam(1e9, 0.1*nm, 0.2*deg)
n = 100
- detector = ba.SphericalDetector(n, -1*deg, 1*deg, n, 0, 2*deg)
+ detector = ba.FlatDetector(n, n, 70, 70, beam, ba.FlatDetector.X, 2000, 0, -35)
simulation = ba.ScatteringSimulation(beam, sample, detector)
return simulation
diff --git a/auto/Examples/scatter2d/MagneticCylinders2.py b/auto/Examples/scatter2d/MagneticCylinders2.py
index 56b8d1663c043768701e49a992d5c8764d11bcab..f5f9c1494321c086645754112e660801a35a3a11 100755
--- a/auto/Examples/scatter2d/MagneticCylinders2.py
+++ b/auto/Examples/scatter2d/MagneticCylinders2.py
@@ -35,7 +35,7 @@ def get_simulation(sample, pol_dir):
z_up = R3(0, 0, 1)
n = 100
beam = ba.Beam(1e9, 0.1*nm, 0.2*deg)
- detector = ba.SphericalDetector(n, -1*deg, 1*deg, n, 0, 2*deg)
+ detector = ba.FlatDetector(n, n, 70, 70, beam, ba.FlatDetector.X, 2000, 0, -35)
beam.setPolarization(pol_dir)
detector.setAnalyzer(z_up)
diff --git a/auto/Examples/scatter2d/PolydisperseCylinders.py b/auto/Examples/scatter2d/PolydisperseCylinders.py
index c58e599928c8bd2d9920a2ca85449159c90ac9ef..dd3d7477be9407fc6b9bdb2057f8b888709eda8c 100755
--- a/auto/Examples/scatter2d/PolydisperseCylinders.py
+++ b/auto/Examples/scatter2d/PolydisperseCylinders.py
@@ -30,7 +30,7 @@ def get_sample():
def get_simulation(sample):
beam = ba.Beam(1e9, 0.1*nm, 0.2*deg)
n = 200
- detector = ba.SphericalDetector(n, -1*deg, 1*deg, n, 0, 2*deg)
+ detector = ba.FlatDetector(n, n, 70, 70, beam, ba.FlatDetector.X, 2000, 0, -35)
simulation = ba.ScatteringSimulation(beam, sample, detector)
return simulation
diff --git a/auto/MiniExamples/fit/scatter2d/fit_with_masks.py b/auto/MiniExamples/fit/scatter2d/fit_with_masks.py
index 747961463f8dd68ab5fc6520bff531408b743558..3074390939ebbac8845f79a8866b8afca516b579 100755
--- a/auto/MiniExamples/fit/scatter2d/fit_with_masks.py
+++ b/auto/MiniExamples/fit/scatter2d/fit_with_masks.py
@@ -61,7 +61,7 @@ if __name__ == '__main__':
fit_objective.addSimulationAndData(get_masked_simulation, real_data, 1)
fit_objective.initPrint(10)
observer = ba_fitmonitor.PlotterGISAS()
- plt.close() # (hide plot) fit_objective.initPlot(10, observer)
+ plt.close() # (hide plot) fit_objective.initPlot(10, observer)
P = ba.Parameters()
P.add("radius", 6.*nm, min=4, max=8)
diff --git a/auto/MiniExamples/fit/scatter2d/minimizer_settings.py b/auto/MiniExamples/fit/scatter2d/minimizer_settings.py
index b0774aaa7731d09ab500725a02ffeddc12506859..e554661c94c00916bb2bd44f6c64be987d92542b 100755
--- a/auto/MiniExamples/fit/scatter2d/minimizer_settings.py
+++ b/auto/MiniExamples/fit/scatter2d/minimizer_settings.py
@@ -47,7 +47,7 @@ def get_simulation(P):
"""
beam = ba.Beam(1e8, 1*angstrom, 0.2*deg)
n = 100 # bp.simargs['n']
- detector = ba.SphericalDetector(n, -1*deg, 1*deg, n, 0, 2*deg)
+ detector = ba.FlatDetector(n, n, 70, 70, beam, ba.FlatDetector.X, 2000, 0, -35)
return ba.ScatteringSimulation(beam, get_sample(P), detector)
diff --git a/auto/MiniExamples/fit/scatter2d/model1_cylinders.py b/auto/MiniExamples/fit/scatter2d/model1_cylinders.py
index 6001f2f4ccf5efc91284c5d61780a136c24176e8..0cc93c67488df33b0808adb563914cb39e3d7fc7 100755
--- a/auto/MiniExamples/fit/scatter2d/model1_cylinders.py
+++ b/auto/MiniExamples/fit/scatter2d/model1_cylinders.py
@@ -38,6 +38,7 @@ def get_simulation(P):
beam = ba.Beam(1e8, 0.1*nm, 0.2*deg)
sample = get_sample(P)
detector = ba.SphericalDetector(n, -1*deg, 1*deg, n, 0, 2*deg)
+ # detector = ba.FlatDetector(n, n, 70, 70, beam, ba.FlatDetector.X, 2000, 0, -35)
return ba.ScatteringSimulation(beam, sample, detector)
diff --git a/auto/MiniExamples/fit/scatter2d/model2_hexlattice.py b/auto/MiniExamples/fit/scatter2d/model2_hexlattice.py
index cad7b9101b15f28e95558ce14f0238f4f69f03e0..eb30ce743834cf3ffc7e8396792bec6f31cc1bf8 100755
--- a/auto/MiniExamples/fit/scatter2d/model2_hexlattice.py
+++ b/auto/MiniExamples/fit/scatter2d/model2_hexlattice.py
@@ -40,9 +40,9 @@ def get_simulation(P):
Create and return GISAXS simulation with beam and detector defined
"""
n = 11
- detector = ba.SphericalDetector(n, -1*deg, 1*deg, n, 0, 2*deg)
- sample = get_sample(P)
beam = ba.Beam(1e8, 0.1*nm, 0.2*deg)
+ detector = ba.FlatDetector(n, n, 70, 70, beam, ba.FlatDetector.X, 2000, 0, -35)
+ sample = get_sample(P)
simulation = ba.ScatteringSimulation(beam, sample, detector)
return simulation
diff --git a/auto/MiniExamples/scatter2d/CustomFormFactor.py b/auto/MiniExamples/scatter2d/CustomFormFactor.py
index a7ee50ad03f100e2c3650be64a45729acead7869..5e524333c3b9aeb21fdcacf33af91d1c73c99b74 100755
--- a/auto/MiniExamples/scatter2d/CustomFormFactor.py
+++ b/auto/MiniExamples/scatter2d/CustomFormFactor.py
@@ -76,7 +76,7 @@ def get_sample():
def get_simulation(sample):
beam = ba.Beam(1e9, 1*angstrom, 0.2*deg)
n = 11
- det = ba.SphericalDetector(n, -1*deg, 1*deg, n, 0, 2*deg)
+ det = ba.FlatDetector(n, n, 70, 70, beam, ba.FlatDetector.X, 2000, 0, -35)
simulation = ba.ScatteringSimulation(beam, sample, det)
simulation.options().setNumberOfThreads(
1) # deactivate multithreading (why?)
diff --git a/auto/MiniExamples/scatter2d/Interference1DLattice.py b/auto/MiniExamples/scatter2d/Interference1DLattice.py
index d94dc99eca09b51e4e9baa3cbb1101b20b73464e..be9bae02789564d307fcfedf2cbaebd48cd12f2c 100755
--- a/auto/MiniExamples/scatter2d/Interference1DLattice.py
+++ b/auto/MiniExamples/scatter2d/Interference1DLattice.py
@@ -54,7 +54,7 @@ def get_sample():
def get_simulation(sample):
beam = ba.Beam(1e9, 1*angstrom, 0.2*deg)
n = 11
- det = ba.SphericalDetector(n, -1*deg, 1*deg, n, 0, 2*deg)
+ det = ba.FlatDetector(n, n, 70, 70, beam, ba.FlatDetector.X, 2000, 0, -35)
simulation = ba.ScatteringSimulation(beam, sample, det)
simulation.options().setMonteCarloIntegration(True, 100)
if not "__no_terminal__" in globals():
diff --git a/auto/MiniExamples/scatter2d/LatticeOrientationDistribution.py b/auto/MiniExamples/scatter2d/LatticeOrientationDistribution.py
index 4638dd7a5233ace81fbd401c1270a9bb8215a1a4..8aa1d3cc74f6d0b277715cbdbb1d8536c95fa32b 100755
--- a/auto/MiniExamples/scatter2d/LatticeOrientationDistribution.py
+++ b/auto/MiniExamples/scatter2d/LatticeOrientationDistribution.py
@@ -37,7 +37,7 @@ def get_sample():
def get_simulation(sample):
beam = ba.Beam(1e9, 0.1*nm, 0.2*deg)
n = 11
- detector = ba.SphericalDetector(n, -1*deg, 1*deg, n, 0, 2*deg)
+ detector = ba.FlatDetector(n, n, 70, 70, beam, ba.FlatDetector.X, 2000, 0, -35)
simulation = ba.ScatteringSimulation(beam, sample, detector)
return simulation
diff --git a/auto/MiniExamples/scatter2d/MagneticCylinders2.py b/auto/MiniExamples/scatter2d/MagneticCylinders2.py
index 1f60011dac526e6bff4b21d898362d6a97e5f64d..801fc5b77917f9500fe3d5bd120eee55cc722de8 100755
--- a/auto/MiniExamples/scatter2d/MagneticCylinders2.py
+++ b/auto/MiniExamples/scatter2d/MagneticCylinders2.py
@@ -35,7 +35,7 @@ def get_simulation(sample, pol_dir):
z_up = R3(0, 0, 1)
n = 11
beam = ba.Beam(1e9, 0.1*nm, 0.2*deg)
- detector = ba.SphericalDetector(n, -1*deg, 1*deg, n, 0, 2*deg)
+ detector = ba.FlatDetector(n, n, 70, 70, beam, ba.FlatDetector.X, 2000, 0, -35)
beam.setPolarization(pol_dir)
detector.setAnalyzer(z_up)
diff --git a/auto/MiniExamples/scatter2d/PolydisperseCylinders.py b/auto/MiniExamples/scatter2d/PolydisperseCylinders.py
index a9e18a5bcf177891bbce3192975242393b92611b..c148f72e5934f67853288fc37d97c3b75b68a3a4 100755
--- a/auto/MiniExamples/scatter2d/PolydisperseCylinders.py
+++ b/auto/MiniExamples/scatter2d/PolydisperseCylinders.py
@@ -30,7 +30,7 @@ def get_sample():
def get_simulation(sample):
beam = ba.Beam(1e9, 0.1*nm, 0.2*deg)
n = 11
- detector = ba.SphericalDetector(n, -1*deg, 1*deg, n, 0, 2*deg)
+ detector = ba.FlatDetector(n, n, 70, 70, beam, ba.FlatDetector.X, 2000, 0, -35)
simulation = ba.ScatteringSimulation(beam, sample, detector)
return simulation
diff --git a/rawEx/fit/scatter2d/fit_with_masks.py b/rawEx/fit/scatter2d/fit_with_masks.py
index 6138b175dd2e3a3c07a6327bac7ada8edfe73703..ef35cb8dac4922564303bb323d39f0af3166bf90 100755
--- a/rawEx/fit/scatter2d/fit_with_masks.py
+++ b/rawEx/fit/scatter2d/fit_with_masks.py
@@ -61,7 +61,7 @@ if __name__ == '__main__':
fit_objective.addSimulationAndData(get_masked_simulation, real_data, 1)
fit_objective.initPrint(10)
observer = ba_fitmonitor.PlotterGISAS()
- <%= sm ? "plt.close() # (hide plot) " :"" %>fit_objective.initPlot(10, observer)
+ <%= sm ? "plt.close() # (hide plot) " :"" %>fit_objective.initPlot(10, observer)
P = ba.Parameters()
P.add("radius", 6.*nm, min=4, max=8)
diff --git a/rawEx/fit/scatter2d/minimizer_settings.py b/rawEx/fit/scatter2d/minimizer_settings.py
index 066904c930d4fe7cb12b488f0d1a034414fc7fe9..c39b50349dea59a5692ec1cf8050bfb1a022b91f 100755
--- a/rawEx/fit/scatter2d/minimizer_settings.py
+++ b/rawEx/fit/scatter2d/minimizer_settings.py
@@ -47,7 +47,7 @@ def get_simulation(P):
"""
beam = ba.Beam(1e8, 1*angstrom, 0.2*deg)
n = 100 # bp.simargs['n']
- detector = ba.SphericalDetector(n, -1*deg, 1*deg, n, 0, 2*deg)
+ detector = ba.FlatDetector(n, n, 70, 70, beam, ba.FlatDetector.X, 2000, 0, -35)
return ba.ScatteringSimulation(beam, get_sample(P), detector)
diff --git a/rawEx/fit/scatter2d/model1_cylinders.py b/rawEx/fit/scatter2d/model1_cylinders.py
index f7aa9ba73964f99464b631316e5fdf6a56044f66..e4bff27e921d4a76aa47790c911989a87968056b 100644
--- a/rawEx/fit/scatter2d/model1_cylinders.py
+++ b/rawEx/fit/scatter2d/model1_cylinders.py
@@ -38,6 +38,7 @@ def get_simulation(P):
beam = ba.Beam(1e8, 0.1*nm, 0.2*deg)
sample = get_sample(P)
detector = ba.SphericalDetector(n, -1*deg, 1*deg, n, 0, 2*deg)
+ # detector = ba.FlatDetector(n, n, 70, 70, beam, ba.FlatDetector.X, 2000, 0, -35)
return ba.ScatteringSimulation(beam, sample, detector)
diff --git a/rawEx/fit/scatter2d/model2_hexlattice.py b/rawEx/fit/scatter2d/model2_hexlattice.py
index 1ce38e56f04cfde2379b0291e7d574a25c861109..b29513ea87faa0e54b72b0aa1fb75ffa50df68f2 100644
--- a/rawEx/fit/scatter2d/model2_hexlattice.py
+++ b/rawEx/fit/scatter2d/model2_hexlattice.py
@@ -40,9 +40,9 @@ def get_simulation(P):
Create and return GISAXS simulation with beam and detector defined
"""
n = <%= sm ? 11 : 100 %>
- detector = ba.SphericalDetector(n, -1*deg, 1*deg, n, 0, 2*deg)
- sample = get_sample(P)
beam = ba.Beam(1e8, 0.1*nm, 0.2*deg)
+ detector = ba.FlatDetector(n, n, 70, 70, beam, ba.FlatDetector.X, 2000, 0, -35)
+ sample = get_sample(P)
simulation = ba.ScatteringSimulation(beam, sample, detector)
return simulation
diff --git a/rawEx/scatter2d/CustomFormFactor.py b/rawEx/scatter2d/CustomFormFactor.py
index 70f2e5592df9bc6320972d2f36e7a268131e4d23..7b2a65a9787f27de450e1c43f75d27d5a495ed83 100755
--- a/rawEx/scatter2d/CustomFormFactor.py
+++ b/rawEx/scatter2d/CustomFormFactor.py
@@ -76,7 +76,7 @@ def get_sample():
def get_simulation(sample):
beam = ba.Beam(1e9, 1*angstrom, 0.2*deg)
n = <%= sm ? 11 : 100 %>
- det = ba.SphericalDetector(n, -1*deg, 1*deg, n, 0, 2*deg)
+ det = ba.FlatDetector(n, n, 70, 70, beam, ba.FlatDetector.X, 2000, 0, -35)
simulation = ba.ScatteringSimulation(beam, sample, det)
simulation.options().setNumberOfThreads(
1) # deactivate multithreading (why?)
diff --git a/rawEx/scatter2d/Interference1DLattice.py b/rawEx/scatter2d/Interference1DLattice.py
index 369fd2fa5e971e7b711540bfd07124eb9880046c..df2f69a9ae2422855559018b0ed3266e4e6b9d69 100755
--- a/rawEx/scatter2d/Interference1DLattice.py
+++ b/rawEx/scatter2d/Interference1DLattice.py
@@ -54,7 +54,7 @@ def get_sample():
def get_simulation(sample):
beam = ba.Beam(1e9, 1*angstrom, 0.2*deg)
n = <%= sm ? 11 : 100 %>
- det = ba.SphericalDetector(n, -1*deg, 1*deg, n, 0, 2*deg)
+ det = ba.FlatDetector(n, n, 70, 70, beam, ba.FlatDetector.X, 2000, 0, -35)
simulation = ba.ScatteringSimulation(beam, sample, det)
simulation.options().setMonteCarloIntegration(True, 100)
if not "__no_terminal__" in globals():
diff --git a/rawEx/scatter2d/LatticeOrientationDistribution.py b/rawEx/scatter2d/LatticeOrientationDistribution.py
index 9209aadf99692002ed7692a106f7ef8f43038862..6772cdd8ae2aec3ed1e1cabf738dfb0900726b41 100755
--- a/rawEx/scatter2d/LatticeOrientationDistribution.py
+++ b/rawEx/scatter2d/LatticeOrientationDistribution.py
@@ -37,7 +37,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, -1*deg, 1*deg, n, 0, 2*deg)
+ detector = ba.FlatDetector(n, n, 70, 70, beam, ba.FlatDetector.X, 2000, 0, -35)
simulation = ba.ScatteringSimulation(beam, sample, detector)
return simulation
diff --git a/rawEx/scatter2d/MagneticCylinders2.py b/rawEx/scatter2d/MagneticCylinders2.py
index 637c290c738d721518fceeb814893710d3339c10..86e866137549af322c4a949fab232cf3d5ab00a4 100755
--- a/rawEx/scatter2d/MagneticCylinders2.py
+++ b/rawEx/scatter2d/MagneticCylinders2.py
@@ -35,7 +35,7 @@ def get_simulation(sample, pol_dir):
z_up = R3(0, 0, 1)
n = <%= sm ? 11 : 100 %>
beam = ba.Beam(1e9, 0.1*nm, 0.2*deg)
- detector = ba.SphericalDetector(n, -1*deg, 1*deg, n, 0, 2*deg)
+ detector = ba.FlatDetector(n, n, 70, 70, beam, ba.FlatDetector.X, 2000, 0, -35)
beam.setPolarization(pol_dir)
detector.setAnalyzer(z_up)
diff --git a/rawEx/scatter2d/PolydisperseCylinders.py b/rawEx/scatter2d/PolydisperseCylinders.py
index c2bf7273d53b03a7bef9fa3a9f04c8718d8f05d4..9518230dc6541ca01feaf68dbbf4a18636925a62 100755
--- a/rawEx/scatter2d/PolydisperseCylinders.py
+++ b/rawEx/scatter2d/PolydisperseCylinders.py
@@ -30,7 +30,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, -1*deg, 1*deg, n, 0, 2*deg)
+ detector = ba.FlatDetector(n, n, 70, 70, beam, ba.FlatDetector.X, 2000, 0, -35)
simulation = ba.ScatteringSimulation(beam, sample, detector)
return simulation