example Mesocrystal3 use FlatDetector

Tests/ReferenceData/MiniExamples/scatter2d/Mesocrystal3.int

 # BornAgain Intensity Data
 
 # axis-0
-EquiDivision("phi_f (rad)", 11, -0.0349065850398866, 0.0349065850398866)
+GenericScale("phi_f (deg)", [-2.0045340321059,-1.64029450521356,-1.64029450521356,-1.27592231475249,-1.27592231475249,-0.911446874686509,-0.911446874686509,-0.546897649070924,-0.546897649070924,-0.182304137784144,-0.182304137784144,0.182304137784144,0.182304137784144,0.546897649070924,0.546897649070924,0.911446874686509,0.911446874686509,1.27592231475249,1.27592231475249,1.64029450521356,1.64029450521356,2.0045340321059,])
 
 # axis-1
-EquiDivision("alpha_f (rad)", 11, 0, 0.0349065850398866)
+GenericScale("alpha_f (deg)", [0,0.182304137784144,0.182304137784144,0.36460458438581,0.36460458438581,0.546897649070924,0.546897649070924,0.729179642002074,0.729179642002074,0.911446874686509,0.911446874686509,1.09369566042372,1.09369566042372,1.27592231475249,1.27592231475249,1.45812315589723,1.45812315589723,1.64029450521356,1.64029450521356,1.82243268763288,1.82243268763288,2.0045340321059,])
 
 # data
-1.229502818652e+05 1.185120263778e+06 4.840325924775e+07 2.024958551408e+06 1.939544634429e+06 1.082999839473e+07 3.525113121822e+05 2.225343051871e+06 2.478662630543e+06 9.176897605832e+04 7.215973167430e+05
-2.925129326009e+07 5.102733558248e+05 1.297798628653e+08 1.091424852664e+08 1.260992548514e+06 2.898544195188e+07 6.535866055297e+06 4.846175483820e+06 7.584911304947e+06 2.048077091554e+05 5.870620027494e+05
-4.391112604672e+09 1.890258223023e+08 9.296612799974e+08 1.796932310421e+10 5.560768193164e+08 2.171280643951e+09 2.091918834014e+09 8.163361055239e+07 5.233354672246e+08 1.780947778556e+07 6.779948445154e+06
-3.168626984063e+08 5.699775910259e+09 3.509704039508e+08 4.045401330032e+08 3.229578330214e+08 5.741228228301e+06 4.494650802228e+07 8.505950132235e+06 5.220377221003e+04 2.153104283927e+06 1.366738107263e+05
-1.850783629064e+09 1.418839749822e+09 8.875260731510e+09 4.073228366940e+08 6.083485736203e+08 1.290778681723e+08 2.571802009997e+07 3.962259461106e+07 9.098522364948e+06 9.705443657112e+05 3.515532621770e+06
-2.480517270383e+11 9.361991279539e+11 2.842789080084e+12 5.223634065208e+10 1.904027830661e+11 4.685617548781e+10 1.808977203667e+09 1.080402941607e+10 2.101328255130e+09 1.961647393589e+08 8.129441338538e+08
-1.300075409006e+09 5.647920892100e+09 1.014872329835e+10 3.825617866648e+08 3.326116031065e+08 1.406635522289e+08 7.520332122739e+06 3.649046864874e+07 8.696628526827e+06 9.334283194125e+05 3.368338900226e+06
-7.263011087128e+08 9.909771310318e+07 7.632533025606e+08 1.347028491201e+08 6.784343882153e+06 4.693787328592e+06 1.353640490543e+07 1.347126614812e+06 3.326985518448e+06 4.795111889808e+06 6.646557662594e+05
-2.569333128447e+09 6.198049181188e+10 1.846304447954e+09 1.924244544208e+09 2.911602052708e+09 9.050875390695e+07 3.950377758846e+08 1.369145685916e+09 6.384888475287e+07 3.861950381037e+08 7.688869440555e+07
-1.893148638911e+07 3.528505415008e+08 1.514993560287e+08 1.327479446652e+06 2.045991851109e+07 1.916404289283e+07 3.277060502881e+05 6.861891745299e+06 4.035674247487e+06 2.069066299167e+06 6.069910198265e+05
-4.166281283018e+03 3.729688158412e+06 4.924514636096e+07 1.465381588006e+06 1.719576837642e+06 1.090142162906e+07 4.724453883127e+05 1.777277549216e+06 1.991615195072e+06 2.351872080084e+04 6.527604167549e+05
+1.249305103091e+05 1.287742439624e+06 5.022319788025e+07 2.238049454876e+06 1.896899506162e+06 1.132489876542e+07 3.077140845412e+05 2.171282041022e+06 2.547596679961e+06 1.005920420278e+05 6.998071154509e+05
+2.923145340692e+07 4.649021409930e+05 1.566806440546e+08 1.036385439788e+08 1.443178805651e+06 3.310419745438e+07 6.011351944487e+06 5.560195124763e+06 8.377405907866e+06 1.789515982502e+05 7.522377479815e+05
+4.371817398711e+09 2.134663429368e+08 7.929243102088e+08 1.749026592662e+10 5.307386593737e+08 1.963245885287e+09 2.048668534495e+09 7.600741091339e+07 4.636555081857e+08 1.814078926168e+07 4.823352049004e+06
+3.843776049283e+08 6.572257846787e+09 3.990802377713e+08 4.325773827686e+08 3.632295083428e+08 8.554783518212e+06 4.718675068169e+07 9.844385856920e+06 2.613589805339e+05 2.203438072700e+06 9.815440935464e+04
+1.982660696488e+09 1.206696551320e+09 8.747999879275e+09 4.444267714548e+08 5.905468614027e+08 1.266444756105e+08 2.502265925213e+07 3.781105827062e+07 9.093566879123e+06 1.066410268905e+06 3.307624557966e+06
+2.521509837827e+11 8.895474442294e+11 2.813356233242e+12 5.038515485668e+10 1.712317122356e+11 4.696671499668e+10 2.012765214102e+09 9.716073664056e+09 2.128407568749e+09 1.593364763338e+08 7.457801254548e+08
+1.365009430613e+09 5.743648796486e+09 1.038067637053e+10 4.293167045950e+08 2.888855420163e+08 1.424156569012e+08 6.836791621071e+06 3.307456025015e+07 9.878734907851e+06 8.557880417111e+05 3.165649012449e+06
+8.650702690818e+08 1.322594676946e+08 8.044376013387e+08 1.463931616192e+08 7.096207567868e+06 4.676070499623e+06 1.532500450114e+07 1.008887859506e+06 3.469635545233e+06 5.075309241241e+06 5.443836225380e+05
+2.557821290813e+09 6.085971419489e+10 1.884970071983e+09 1.648256225377e+09 2.851757733931e+09 7.661399469537e+07 3.714870324287e+08 1.351598081392e+09 5.963605657166e+07 3.484432718442e+08 7.677387770867e+07
+1.857235886860e+07 3.520790240238e+08 1.846180170958e+08 6.855386637361e+05 2.050472043636e+07 2.515485150317e+07 1.662452545653e+05 7.292730892654e+06 5.048934304020e+06 1.712843251628e+06 6.934978664061e+05
+3.906559512046e+03 3.835993667169e+06 5.128951642438e+07 1.904440156124e+06 1.506344944593e+06 1.143277613860e+07 5.482259246888e+05 1.741154157202e+06 2.056573408959e+06 1.735466123224e+04 6.102937613833e+05
 

auto/Examples/scatter2d/Mesocrystal3.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)
     simulation.options().setUseAvgMaterials(True)
     return simulation

auto/MiniExamples/scatter2d/Mesocrystal3.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)
     simulation.options().setUseAvgMaterials(True)
     return simulation

rawEx/scatter2d/Mesocrystal3.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)
     simulation.options().setUseAvgMaterials(True)
     return simulation