increase pixels and MC integration points Interference1DLattice

Tests/Examples/CMakeLists.txt

@@ -186,7 +186,7 @@ test_example(scatter2d/DodecahedraSAS 2e-10)
 run_example(scatter2d/FindPeaks)
 test_example(scatter2d/HalfSpheresInAverageTopLayer 2e-10)
 test_example(scatter2d/HexagonalLatticesWithBasis 2e-10)
-test_example(scatter2d/Interference1DLattice 2e-10)
+test_example(scatter2d/Interference1DLattice 0.1) # MC integration ==> high tolerance is ok
 test_example(scatter2d/Interference1DRadialParacrystal 2e-10)
 test_example(scatter2d/Interference2DCenteredSquareLattice 2e-10)
 test_example(scatter2d/Interference2DParacrystal 2e-10)

Tests/ReferenceData/MiniExamples/scatter2d/Interference1DLattice.int

 # BornAgain Intensity Data
 
 # axis-0
-EquiDivision("phi_f (rad)", 11, -0.0174532925199433, 0.0174532925199433)
+EquiDivision("phi_f (rad)", 21, -0.0174532925199433, 0.0174532925199433)
 
 # axis-1
-EquiDivision("alpha_f (rad)", 11, 0, 0.0349065850398866)
+EquiDivision("alpha_f (rad)", 21, 0, 0.0349065850398866)
 
 # data
-2.522904440489e+04 2.087303883222e+04 1.266774315563e+04 5.188171110849e+03 3.373481854123e+02 1.124261957469e+03 1.399341557507e+03 2.196177381496e+02 3.382903877994e+02 6.835340130848e+02 1.713265498678e+02
-7.272492442179e+04 6.023343827976e+04 5.068675155358e+04 1.663751725424e+04 9.637335354051e+02 5.404305739357e+03 5.974436803180e+03 9.460842485737e+02 1.886338590127e+03 4.005978671979e+03 1.199104353828e+03
-6.165162278757e+07 1.849247728226e+07 4.920178163762e+07 1.768225679949e+07 1.464262119525e+06 3.206899928996e+06 7.491726244283e+06 7.390036835327e+05 2.262883006979e+06 2.818542282465e+06 3.354364583292e+05
-8.971710746898e+07 4.881652016970e+08 3.381564701851e+08 1.565662633150e+08 1.250616161917e+07 8.248768305467e+07 6.622410197370e+07 1.372315559789e+07 2.874113510724e+07 3.144251888355e+07 5.393511808446e+06
-2.435605362721e+08 1.877392446330e+08 1.280289939506e+09 1.532142645550e+08 1.515708032351e+06 7.770127525045e+06 4.876711682939e+06 7.361096665790e+05 1.049015119106e+06 1.721882440155e+06 4.433892830948e+05
-3.047696518784e+12 7.610188789158e+14 8.684726730134e+13 6.416692190487e+12 7.972435635859e+09 5.210798510618e+10 3.283132850595e+11 2.448577968522e+10 7.702995890444e+10 5.212293946761e+09 1.546045022396e+10
-5.791027547255e+08 2.179111139072e+08 6.080650911781e+08 5.045567981366e+08 4.096560200417e+07 9.497614067850e+07 1.436255789912e+08 5.158535859390e+06 3.046482786570e+07 3.892035368137e+07 2.937783272584e+07
-1.377093954310e+08 1.564135021566e+08 6.091787043675e+07 2.474048216026e+07 6.770261752286e+05 1.832243875193e+06 1.006585141466e+06 2.920697493085e+05 2.424629719452e+05 5.172157927872e+05 1.345822087810e+05
-1.628975960310e+07 1.022072688765e+08 2.809461884526e+07 4.029481770477e+06 7.299674715477e+05 1.259692093620e+06 1.788267069631e+06 9.307157803613e+05 7.318624401082e+05 1.510082451585e+06 2.827223413462e+05
-8.604000104191e+04 5.311142588630e+04 3.534960006165e+04 1.499560563290e+04 9.677262070655e+02 3.138290120888e+03 3.466691246907e+03 5.778140845881e+02 8.587476099829e+02 1.704826474406e+03 3.589379848447e+02
-3.402263423142e+04 2.471359344614e+04 1.725541327571e+04 6.945173397010e+03 5.553252601006e+02 1.949310016573e+03 2.677918790355e+03 4.116822052566e+02 7.849660710903e+02 1.482882713892e+03 4.760348194067e+02
+2.3844311454659296e+03 1.9176273896694289e+04 8.1678249850880284e+03 5.5773048064184795e+03 4.2124303013517683e+03 3.2814460467962040e+03 1.9785202918796952e+03 7.0460057127677806e+02 1.1251667850118085e+02 1.4691813246237120e+02 3.8837220803129946e+02 5.3411633239872037e+02 4.4153248633320032e+02 2.0203179408248917e+02 4.4841357896057616e+01 3.5470930671261094e+01 1.2228311149649392e+02 1.8785821927734096e+02 1.6728203431695206e+02 8.6879982846505087e+01 2.2405791086012201e+01
+1.6188480719799195e+03 1.3588415634056009e+04 5.7237211955396151e+03 3.7932985411704822e+03 3.0151682086471797e+03 2.2188314766032277e+03 1.3191711668782611e+03 4.9129124766289277e+02 8.3614924841413512e+01 1.0706566480536782e+02 3.1219567004773984e+02 4.0318413418998176e+02 3.3367051603704232e+02 1.5375045517039192e+02 3.6618477531577739e+01 2.8734533254768134e+01 1.0567966115687061e+02 1.7093720799829117e+02 1.5394655883845570e+02 8.4324500393887121e+01 2.0713409258262615e+01
+2.8902292155353243e+03 2.3056108057471007e+04 9.8220999482155221e+03 6.8590241263148482e+03 5.3012377912128813e+03 4.1698000694194789e+03 2.4649288078802542e+03 9.1955151441249734e+02 1.5935787783716097e+02 2.0862840877937253e+02 5.7918084875442526e+02 8.3367115973102750e+02 6.7365892651461365e+02 3.2383439485538702e+02 7.5556374518979936e+01 6.3444644559875940e+01 2.1888085025433904e+02 3.6126158970929242e+02 3.4072035353696526e+02 1.8098397496670117e+02 5.3253415750709159e+01
+1.4103032417247738e+04 1.1546909893247514e+05 4.7663708224388145e+04 3.2553743540648782e+04 2.5473315870251932e+04 2.1704476126193385e+04 1.2775755989249446e+04 4.6541223191120571e+03 8.7694535652376294e+02 1.1128668471247740e+03 3.3282948029639520e+03 4.4639131604106642e+03 4.1282648014857950e+03 1.9790099205283625e+03 4.6765958828916274e+02 4.2280524796701332e+02 1.5873302657578165e+03 2.5483085979276466e+03 2.7684917125507450e+03 1.7120072546976171e+03 4.9007063359066086e+02
+1.0791528437224923e+07 9.9745675490160331e+07 2.9008244332483578e+07 2.3524141235168535e+07 2.7305379265037328e+07 1.2879426270338025e+07 9.5960679978157580e+06 3.1333827830843544e+06 5.8538801787364879e+05 7.1192941309218912e+05 1.9916470966203480e+06 2.9082126326675527e+06 2.6295415819283091e+06 9.1855989906479139e+05 2.8012106694116874e+05 1.7477571018948991e+05 8.7687545811165322e+05 9.2513534339088632e+05 8.7718694574471947e+05 4.5933389557006379e+05 1.1906602856996619e+05
+4.0057918163149722e+05 3.6832850176929082e+06 1.3473803358662536e+06 8.7461745669920940e+05 7.2380969635515567e+05 4.9831169032172929e+05 3.1249041665703972e+05 1.1212785162984191e+05 1.8146625779341444e+04 2.2007659478998623e+04 5.8467327048553539e+04 7.1440896110704096e+04 5.7124143947419441e+04 2.7329428185383265e+04 5.8702924253740421e+03 4.4935880084260316e+03 1.4454030979200086e+04 2.2856494920609181e+04 2.0828303122228339e+04 1.0352895217512088e+04 2.5243808138356217e+03
+4.4911380458427750e+05 4.0116849119176269e+06 1.6452000635319278e+06 1.0921861891972180e+06 8.4737358107686520e+05 6.8091422796031565e+05 4.2317327422069863e+05 1.5371124689758790e+05 2.7536808341596377e+04 3.4439733131470784e+04 1.0018687022192615e+05 1.4730036687211340e+05 1.1885208617092694e+05 6.7685240992646635e+04 1.4488354280611728e+04 1.2755469984952060e+04 4.4855442802332160e+04 8.0589304598300543e+04 7.6799291624141741e+04 5.0702926040428538e+04 1.4131882809920126e+04
+2.1822717984892240e+08 1.7286903471537254e+09 6.9392902793222213e+08 4.1474682187507480e+08 3.8097329653223121e+08 3.1626721357575035e+08 1.7091319922732392e+08 4.2461713320398934e+07 1.0234892682167981e+07 1.2728636717763135e+07 4.0132678060174517e+07 3.7910481738310583e+07 2.6328603913180426e+07 1.5197030033923814e+07 3.1484732882873048e+06 2.5207481068918048e+06 1.1379464434660796e+07 1.5621253618662078e+07 1.1722001595964953e+07 8.1494785607635183e+06 1.6035488994990692e+06
+5.0126774872373492e+06 3.8112600807306960e+07 1.7007119688874681e+07 1.1009199550805589e+07 8.4381982529992107e+06 6.3798288281398313e+06 3.5639266219736533e+06 1.3091601751295535e+06 2.2846132771016081e+05 2.5903157318779602e+05 7.3832289589228958e+05 9.2314178404901386e+05 7.6227593559532403e+05 3.5088924237464712e+05 7.2332767934670657e+04 5.6229023312062927e+04 1.9011203735888394e+05 2.8564068794237729e+05 2.5439389382006400e+05 1.3381422307171076e+05 3.1263034034730179e+04
+3.3468086968569774e+07 2.6084134058057025e+08 1.0119191552290754e+08 6.4997554982005097e+07 6.0248054110700287e+07 4.4571966993311480e+07 2.4494010766072340e+07 8.9573558899202663e+06 1.7466705061851419e+06 2.0032770541504535e+06 6.7068291915859552e+06 7.7952211187589588e+06 6.8675671212103246e+06 3.2394933598213098e+06 8.0474056623278151e+05 6.6915443529496004e+05 2.4144373305583941e+06 4.5141097229371928e+06 4.6771173395697819e+06 2.9612496813787902e+06 7.2343383268541342e+05
+9.5442728875342969e+13 5.9400724204266700e+14 2.9380404216527169e+14 8.5388151225665078e+13 4.2707315479166219e+13 1.4771987260233504e+13 5.6462437738633848e+12 1.0524171224019430e+12 1.1953676630512480e+11 9.8728368151719513e+10 9.8179680099561615e+10 1.7720258847474216e+11 9.3037199124172821e+10 4.4080357134998779e+10 5.9281743325673828e+09 4.9164510080299053e+09 9.3507135033347149e+09 1.0668276218905027e+10 1.0665045991462198e+10 4.5771976576413021e+09 1.1144400624185658e+09
+3.0952142916482937e+07 2.5497644453802446e+08 1.0263044973625124e+08 6.6380774330456167e+07 6.1509990488211021e+07 4.1546541888528615e+07 2.5979527889361333e+07 1.0191401168088561e+07 1.9218089817068598e+06 2.2392313973834403e+06 6.2371369069524398e+06 8.8965699923317060e+06 7.7630334058026541e+06 4.0996929600557322e+06 9.5672000431447953e+05 7.6759984020022734e+05 3.1056980025932025e+06 5.3876150510748448e+06 5.8732777456455361e+06 3.5699671980931140e+06 1.1060986272357299e+06
+5.0003963341197586e+06 3.8314240141410433e+07 1.6617700480085129e+07 1.0719969982428979e+07 9.7711693370949924e+06 7.5673523442735486e+06 4.7675739587947838e+06 1.8395799749116180e+06 3.1120954211920931e+05 4.5195837964192335e+05 1.3658660551236377e+06 1.8913746379113670e+06 1.8652015938343720e+06 9.9059383078343386e+05 2.6414226783184952e+05 2.4405284766403184e+05 1.0001220614892553e+06 2.1992553850389076e+06 3.1969738012998984e+06 4.4613596651848424e+06 3.2106793410942429e+06
+1.4976267868075395e+08 1.8784812057158411e+09 6.6950336074243772e+08 5.0788844034358793e+08 4.4642577554358763e+08 3.2390030132996422e+08 1.5815725298965174e+08 6.0389125080679238e+07 1.2832771195652306e+07 1.3964869898073763e+07 3.2647352791597690e+07 4.6525210478958465e+07 4.8906501237138182e+07 2.8498196271151688e+07 4.0690410668322342e+06 5.0405813362436481e+06 1.7019720674612418e+07 3.1846500757523496e+07 2.7376061671302557e+07 1.7025653404224455e+07 1.0554260400247888e+06
+4.6058019871687132e+05 3.7282102723499588e+06 1.5340458881963256e+06 1.0516980345384111e+06 8.8555773461179342e+05 6.3844205583695578e+05 3.6179272558385960e+05 1.4075425281315093e+05 2.2767348784170052e+04 2.9280389702932553e+04 8.1227461069561730e+04 1.0907189282189598e+05 9.3074866593814397e+04 4.2430922662682548e+04 9.2352735932160886e+03 7.4315701612977364e+03 2.6828442723038246e+04 4.2943735775359630e+04 3.7668159588728537e+04 2.3062637898429937e+04 5.4221580183346960e+03
+5.5393061582252278e+05 4.1237849766507475e+06 1.7769666435443100e+06 1.1800758470538163e+06 1.1768167477069402e+06 7.7777855257241160e+05 5.7082561855375033e+05 2.1394328231509158e+05 4.5011829492914148e+04 6.4885773845170072e+04 2.0317831401344520e+05 3.6855777414672659e+05 6.6459129191356746e+05 7.7200684250666248e+05 3.3283766936732637e+05 2.2491273464264974e+05 1.1308804050003879e+06 1.3477940645038756e+06 1.7850048404351184e+06 8.8455043102885899e+05 2.5270841280796775e+05
+1.3176007722535117e+07 1.2742550626701166e+08 3.5016959014086224e+07 2.6300248479633749e+07 2.1255177607701950e+07 1.4355790671541072e+07 8.7395258402919825e+06 2.8485482649998851e+06 7.1710435519291530e+05 5.6543884772687720e+05 3.0192907335108593e+06 2.8364197039846941e+06 2.8525874404273573e+06 8.2833216724181583e+05 4.9955731846580195e+04 2.2237509230633637e+04 5.0363257841538114e+04 4.3465828935264537e+04 3.0791805497904013e+04 1.2613402937960282e+04 2.8120049137247647e+03
+1.2330932107716719e+04 9.8822731679777120e+04 4.1669234791404197e+04 2.8131157852156957e+04 2.2103431082760435e+04 1.6152216090789947e+04 9.8895575395517080e+03 3.5749793646695339e+03 5.7700003234839392e+02 7.5979019944042454e+02 1.9761380008643105e+03 2.6926766486637316e+03 2.0912612579965980e+03 1.0295414882875014e+03 2.2128730580834838e+02 1.7851656722961141e+02 5.9415667091020157e+02 8.9042077920777581e+02 7.9094084408171148e+02 4.4559252507324641e+02 1.0708675706258093e+02
+2.7315148143150195e+03 2.2500528923479033e+04 9.3337126267728345e+03 6.1085061018397982e+03 4.8244225719360102e+03 3.8755711643040636e+03 2.2753924269686863e+03 8.5727511682876570e+02 1.3871762309021452e+02 1.7946967834914392e+02 4.9670086491817386e+02 6.6434130093035753e+02 5.5022104132457503e+02 2.7753421527174027e+02 6.2490480364926903e+01 5.0606171522027182e+01 1.7247795989618965e+02 2.6057843173502374e+02 2.5173371263553310e+02 1.3868045008168127e+02 3.3443501916285534e+01
+1.7578221591205734e+03 1.3977421886910994e+04 5.9389408802506769e+03 4.0940368303901932e+03 3.4482302261510399e+03 2.5760134285777362e+03 1.4411339067758693e+03 5.2859865630200557e+02 9.9027143741557509e+01 1.2753604352787100e+02 3.4771219640297448e+02 4.6775147897500381e+02 4.0885185217659938e+02 1.9603791628291791e+02 4.5233971630834368e+01 3.7849575944558111e+01 1.3311846340000022e+02 2.1588714455734953e+02 1.9332704013102654e+02 1.1191882260522716e+02 3.0757969038383717e+01
+3.1546027610224241e+03 2.4832158711945722e+04 1.0440257696917764e+04 7.2602268555072678e+03 6.0709666539535237e+03 4.8191173872620902e+03 2.6599310391098265e+03 1.0146131986293065e+03 1.9385912948328470e+02 2.2774149079668507e+02 6.9898866811387177e+02 9.9766783082702057e+02 8.5368978045057372e+02 4.5152822597664533e+02 1.0252060167096312e+02 8.3999625997333524e+01 3.5278184327390204e+02 5.6241850270834493e+02 5.6545642107540561e+02 3.6620432332942238e+02 9.1612842758403943e+01
 

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
+    n = 101
     det = ba.SphericalDetector(n, -1*deg, 1*deg, n, 0, 2*deg)
     simulation = ba.ScatteringSimulation(beam, sample, det)
     simulation.options().setMonteCarloIntegration(True, 100)

auto/FigExamples/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
+    n = 101
     det = ba.SphericalDetector(n, -1*deg, 1*deg, n, 0, 2*deg)
     simulation = ba.ScatteringSimulation(beam, sample, det)
     simulation.options().setMonteCarloIntegration(True, 100)

auto/MiniExamples/scatter2d/Interference1DLattice.py

@@ -54,10 +54,10 @@ def get_sample():
 
 def get_simulation(sample):
     beam = ba.Beam(1e9, 1*angstrom, 0.2*deg)
-    n = 11
+    n = 21
     det = ba.SphericalDetector(n, -1*deg, 1*deg, n, 0, 2*deg)
     simulation = ba.ScatteringSimulation(beam, sample, det)
-    simulation.options().setMonteCarloIntegration(True, 100)
+    simulation.options().setMonteCarloIntegration(True, 1000)
     if not "__no_terminal__" in globals():
         simulation.setTerminalProgressMonitor()
     return simulation

rawEx/scatter2d/Interference1DLattice.py

@@ -54,10 +54,10 @@ def get_sample():
 
 def get_simulation(sample):
     beam = ba.Beam(1e9, 1*angstrom, 0.2*deg)
-    n = <%= test_mode ? 11 : 100 %>
+    n = <%= test_mode ? 21 : 101 %>
     det = ba.SphericalDetector(n, -1*deg, 1*deg, n, 0, 2*deg)
     simulation = ba.ScatteringSimulation(beam, sample, det)
-    simulation.options().setMonteCarloIntegration(True, 100)
+    simulation.options().setMonteCarloIntegration(True, <%= test_mode ? 1000 : 100 %>)
     if not "__no_terminal__" in globals():
         simulation.setTerminalProgressMonitor()
     return simulation