[i820] Detector2D::indexOfSpecular newly implemented (#820) (Closes #820)

Merging branch 'i820'  into 'main'.

See merge request !2093

Device/Detector/Detector2D.cpp

@@ -62,10 +62,13 @@ Pixel* Detector2D::createPixel(size_t index) const
 
 size_t Detector2D::indexOfSpecular(const Beam& beam) const
 {
-    double alpha = beam.alpha_i();
-    double phi = beam.phi_i();
-    if (alpha + phi < 0)
-        return -1; // issue #820
-    // return getGlobalIndex(
+    const double alpha = beam.alpha_i();
+    const double phi = beam.phi_i();
+
+    const double u = tan(phi);
+    const double v = hypot(1., u * u) * tan(alpha);
+
+    if (axis(0).rangeComprises(u) && axis(1).rangeComprises(v))
+        return getGlobalIndex(axis(0).closestIndex(u), axis(1).closestIndex(v));
     return totalSize();
 }

Tests/ReferenceData/MiniExamples/scatter2d/BoxesWithSpecularPeak.int

@@ -12,7 +12,7 @@ EquiDivision("alpha_f (rad)", 11, 0, 0.0349065850398866)
 9.086584951794e+00 1.491107308618e+02 3.054542855154e+01 8.409850899337e+00 9.753097492069e+00 4.873578819294e+00 1.944081893968e+00 3.140954798722e+00 2.154226332995e+00 8.435299816963e-01 1.462155022508e+00
 3.662662033958e+06 5.805703472673e+07 1.098404735686e+07 2.627686238859e+06 2.456347483343e+06 9.147088703499e+05 2.540470310605e+05 2.723632862936e+05 1.207299928395e+05 3.030143407444e+04 3.381536922739e+04
 2.518359852821e+03 4.131430062822e+04 8.458367538033e+03 2.326766662679e+03 2.695297968613e+03 1.344893469135e+03 5.355590918332e+02 8.635445501950e+02 5.909110427896e+02 2.307901977904e+02 3.989088632903e+02
-7.687350631089e+07 1.260835536288e+09 2.490063131769e+08 5.985520194575e+07 5.180837630661e+07 1.643349701210e+07 3.726522641426e+06 3.270858953146e+06 1.219638035667e+06 2.661389753802e+05 2.660443162524e+05
+7.687350631089e+07 9.840396718387e+08 2.490063131769e+08 5.985520194575e+07 5.180837630661e+07 1.643349701210e+07 3.726522641426e+06 3.270858953146e+06 1.219638035667e+06 2.661389753802e+05 2.660443162524e+05
 2.518359852821e+03 4.131430062822e+04 8.458367538033e+03 2.326766662679e+03 2.695297968613e+03 1.344893469135e+03 5.355590918332e+02 8.635445501950e+02 5.909110427896e+02 2.307901977904e+02 3.989088632903e+02
 3.662662033958e+06 5.805703472673e+07 1.098404735686e+07 2.627686238859e+06 2.456347483343e+06 9.147088703499e+05 2.540470310605e+05 2.723632862936e+05 1.207299928395e+05 3.030143407444e+04 3.381536922739e+04
 9.086584951794e+00 1.491107308618e+02 3.054542855154e+01 8.409850899337e+00 9.753097492069e+00 4.873578819294e+00 1.944081893968e+00 3.140954798722e+00 2.154226332995e+00 8.435299816963e-01 1.462155022508e+00

Tests/ReferenceData/Suite/BoxesWithSpecular.int

@@ -19,7 +19,7 @@ EquiDivision("alpha_f (rad)", 25, 0, 0.0349065850398866)
 9.004895394296e-04 7.751109742599e-03 9.659394819421e-03 3.399091232209e-03 2.738425603148e-03 2.318488631331e-03 1.821128137262e-03 1.207766789024e-03 6.043253892439e-04 1.883271191689e-04 4.338982983888e-05 1.079122352545e-04 2.422157329922e-04 3.248170489210e-04 3.045256500098e-04 2.033088768361e-04 8.738872709603e-05 2.079016535890e-05 2.586499053234e-05 7.677830635449e-05 1.256374765598e-04 1.364519264888e-04 1.042948578559e-04 5.271899335471e-05 1.458956607588e-05
 7.988921455569e-04 6.876700650007e-03 8.569984046172e-03 3.015884263355e-03 2.429872611069e-03 2.057447117059e-03 1.616283907819e-03 1.072082356302e-03 5.365384863195e-04 1.672429627340e-04 3.854350080565e-05 9.589346510450e-05 2.153310283143e-04 2.889110631434e-04 2.710254600658e-04 1.810706634986e-04 7.789374758701e-05 1.854880518848e-05 2.310161160931e-05 6.866057344740e-05 1.125123548177e-04 1.223917758369e-04 9.371580632154e-05 4.746644689763e-05 1.316528920104e-05
 4.072620846993e-03 3.505646726627e-02 4.368888795148e-02 1.537469298334e-02 1.238709836234e-02 1.048809855034e-02 8.238500573182e-03 5.463775999546e-03 2.733766782580e-03 8.518328100454e-04 1.962188498626e-04 4.878478750328e-04 1.094497900229e-03 1.466815437640e-03 1.374029853031e-03 9.163497888281e-04 3.933459340332e-04 9.342370053086e-05 1.159952459962e-04 3.434998982167e-04 5.605074304296e-04 6.067529101723e-04 4.620011484208e-04 2.325172947612e-04 6.402962542085e-05
-2.144984726387e+01 1.848434155561e+02 2.305654038086e+02 8.097473639431e+01 6.465868042922e+01 5.360718909457e+01 4.049706313500e+01 2.521636295487e+01 1.150500223654e+01 3.164485968263e+00 6.224374882482e-01 1.280906884416e+00 2.315628555296e+00 2.448221464843e+00 1.782034618922e+00 9.147649000364e-01 3.008443742294e-01 5.470431247563e-02 5.211491614342e-02 1.189316165154e-01 1.504324554541e-01 1.270966809704e-01 7.609762660337e-02 3.035195063896e-02 6.677046700593e-03
+2.144984726387e+01 1.848434155561e+02 6.078863071128e-01 8.097473639431e+01 6.465868042922e+01 5.360718909457e+01 4.049706313500e+01 2.521636295487e+01 1.150500223654e+01 3.164485968263e+00 6.224374882482e-01 1.280906884416e+00 2.315628555296e+00 2.448221464843e+00 1.782034618922e+00 9.147649000364e-01 3.008443742294e-01 5.470431247563e-02 5.211491614342e-02 1.189316165154e-01 1.504324554541e-01 1.270966809704e-01 7.609762660337e-02 3.035195063896e-02 6.677046700593e-03
 4.072620846993e-03 3.505646726627e-02 4.368888795148e-02 1.537469298334e-02 1.238709836234e-02 1.048809855034e-02 8.238500573182e-03 5.463775999546e-03 2.733766782580e-03 8.518328100454e-04 1.962188498626e-04 4.878478750328e-04 1.094497900229e-03 1.466815437640e-03 1.374029853031e-03 9.163497888281e-04 3.933459340332e-04 9.342370053086e-05 1.159952459962e-04 3.434998982167e-04 5.605074304296e-04 6.067529101723e-04 4.620011484208e-04 2.325172947612e-04 6.402962542085e-05
 7.988921455569e-04 6.876700650007e-03 8.569984046172e-03 3.015884263355e-03 2.429872611069e-03 2.057447117059e-03 1.616283907819e-03 1.072082356302e-03 5.365384863195e-04 1.672429627340e-04 3.854350080565e-05 9.589346510450e-05 2.153310283143e-04 2.889110631434e-04 2.710254600658e-04 1.810706634986e-04 7.789374758701e-05 1.854880518848e-05 2.310161160931e-05 6.866057344740e-05 1.125123548177e-04 1.223917758369e-04 9.371580632154e-05 4.746644689763e-05 1.316528920104e-05
 9.004895394296e-04 7.751109742599e-03 9.659394819421e-03 3.399091232209e-03 2.738425603148e-03 2.318488631331e-03 1.821128137262e-03 1.207766789024e-03 6.043253892439e-04 1.883271191689e-04 4.338982983888e-05 1.079122352545e-04 2.422157329922e-04 3.248170489210e-04 3.045256500098e-04 2.033088768361e-04 8.738872709603e-05 2.079016535890e-05 2.586499053234e-05 7.677830635449e-05 1.256374765598e-04 1.364519264888e-04 1.042948578559e-04 5.271899335471e-05 1.458956607588e-05