Skip to content

Bug fixed that calculates sampling of Gaussian source in Circular or … #206

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 5, 2025
Merged

Bug fixed that calculates sampling of Gaussian source in Circular or … #206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1cfffac
Bug fixed that calculates sampling of Gaussian source in Circular or …
hayakawa16 Sep 3, 2025
947c3b6
Per SonarQubeCloud review, modified variable "reader" from System.IO.…
hayakawa16 Sep 4, 2025
c6967c9
Merge branch 'master' into bug/204-monte-carlo-circular-gaussian-sour…
hayakawa16 Sep 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions ...ab/test/monte_carlo/source_test_data_generation/Func_GetPositionInACircleRandomGaussian.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,10 @@

NR = Func_GetDoubleNormallyDistributedRandomNumbers(RN1, RN2, LimitL, LimitU);

VOUT(1) = V(1)+ 0.8493218 * BDFWHM * NR(1);
VOUT(2) = V(2)+ 0.8493218 * BDFWHM * NR(2);
% The x and y position should be from the center of the circle or radius,
% so beamDiameterFwhm should be beamRadiusFwhm = (beamDiameterFwhm/2)
VOUT(1) = V(1)+ 0.8493218 * (BDFWHM / 2) * NR(1);
VOUT(2) = V(2)+ 0.8493218 * (BDFWHM / 2) * NR(2);
VOUT(3) = V(3);
end

Expand Down
6 changes: 4 additions & 2 deletions .../test/monte_carlo/source_test_data_generation/Func_GetPositionInAnEllipseRandomGaussian.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,10 @@
LimitX = Func_GetLimit(FactorX);
LimitY = Func_GetLimit(FactorY);

T1 = 0.8493218*BDFWHM*Func_GetSingleNormallyDistributedRandomNumber(RN1, RN2, LimitX);
T2 = 0.8493218*BDFWHM*Func_GetSingleNormallyDistributedRandomNumber(RN3, RN4, LimitY);
% The x and y position should be from the center of the circle or radius,
% so beamDiameterFwhm should be beamRadiusFwhm = (beamDiameterFwhm/2)
T1 = 0.8493218*(BDFWHM/2)*Func_GetSingleNormallyDistributedRandomNumber(RN1, RN2, LimitX);
T2 = 0.8493218*(BDFWHM/2)*Func_GetSingleNormallyDistributedRandomNumber(RN3, RN4, LimitY);

VOUT(1) = V(1)+ T1;
VOUT(2) = V(2)+ T2;
Expand Down
2 changes: 1 addition & 1 deletion matlab/test/monte_carlo/source_test_data_generation/UnitTests_SourceToolbox.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.0000000000e+00, 2.0000000000e+00, 3.0000000000e+00, 7.0710678119e-01, 7.0710678119e-01, 0.0000000000e+00, 1.0000000000e+00, -2.5000000000e+00, 1.2000000000e+00, 7.8539816340e-01, 7.8539816340e-01, 0.0000000000e+00, 1.5707963268e+00, 0.0000000000e+00, 3.1415926536e+00, 1.5707963268e+00, 1.5707963268e+00, 7.8539816340e-01, 2.0000000000e+00, 2.5000000000e+00, 3.0000000000e+00, 1.0000000000e+00, 2.0000000000e+00, 3.0000000000e+00, 1.0000000000e+00, 2.0000000000e+00, 8.0000000000e-01, 2.5000000000e+00, 5.0000000000e-01, 5.0000000000e-01, 7.8539816340e-01, 3.1622776602e-01, 6.3245553203e-01, 7.0710678119e-01, -2.4038566061e-01, 8.0063629303e-01, 5.4881350243e-01, -8.3062970822e-01, -5.4820001436e-01, 9.7627004864e-02, -0.0000000000e+00, -0.0000000000e+00, 8.8249690258e-01, 9.8985210047e-01, 1.8624762920e+00, 1.5707963268e+00, 7.8539816340e-01, -5.8910586113e-01, 1.4967342534e+00, 3.0000000000e+00, -3.0673325845e-02, 1.3197749533e+00, 3.0000000000e+00, 1.0488135024e+00, 2.1856892331e+00, 3.6455680954e+00, 7.3017984105e-01, 2.2450786356e+00, 3.4045250143e+00, 1.0488135024e+00, 2.0000000000e+00, 3.0000000000e+00, 7.3017984105e-01, 2.0000000000e+00, 3.0000000000e+00, 1.1952540097e+00, 2.4642230826e+00, 3.0000000000e+00, 3.8437662825e-01, 2.3103671369e+00, 3.0000000000e+00, 1.1952540097e+00, 2.4642230826e+00, 4.2911361908e+00, 3.8437662825e-01, 2.3103671369e+00, 3.4289404236e+00, 1.0488135024e+00, 2.1856892331e+00, 3.0000000000e+00, 7.3017984105e-01, 2.2450786356e+00, 3.0000000000e+00, 4.8813502432e-02, -0.0000000000e+00, 5.0000000000e-01, 5.0000000000e-01, 7.0710678119e-01, 7.0710678119e-01, 4.3297802812e-17, 7.0710678119e-01, 4.3297802812e-17, 7.0710678119e-01, -7.0710678119e-01, 0.0000000000e+00, 1.0000000000e+00, 0.0000000000e+00, -1.4644660941e-01, 8.5355339059e-01, -5.0000000000e-01, -1.4644660941e-01, 8.5355339059e-01, -5.0000000000e-01, 1.5857864376e+00, 9.1421356237e-01, 2.6142135624e+00, -9.2677669530e-01, 2.8033008589e-01, -2.5000000000e-01, 6.4644660941e-01, 1.4644660941e-01, 3.8213203436e+00, 7.0710678119e-01, 4.3297802812e-17, 7.0710678119e-01, 1.0000000000e+00, -3.0000000000e+00, 2.0000000000e+00, 4.3297802812e-17, 7.0710678119e-01, -7.0710678119e-01, 3.0000000000e+00, 2.0000000000e+00, -1.0000000000e+00, 0.0000000000e+00, 1.0000000000e+00, 0.0000000000e+00, -7.0710678119e-01, 2.1213203436e+00, 3.0000000000e+00, -1.4644660941e-01, 8.5355339059e-01, -5.0000000000e-01, 5.8578643763e-01, 3.4142135624e+00, 1.4142135624e+00, 3.9269908170e-01, 2.0000000000e+00, -5.0000000000e-01, 4.2000000000e+00, -9.0666756704e-01, 1.3961632764e+00, 3.0000000000e+00,
1.0000000000e+00, 2.0000000000e+00, 3.0000000000e+00, 7.0710678119e-01, 7.0710678119e-01, 0.0000000000e+00, 1.0000000000e+00, -2.5000000000e+00, 1.2000000000e+00, 7.8539816340e-01, 7.8539816340e-01, 0.0000000000e+00, 1.5707963268e+00, 0.0000000000e+00, 3.1415926536e+00, 1.5707963268e+00, 1.5707963268e+00, 7.8539816340e-01, 2.0000000000e+00, 2.5000000000e+00, 3.0000000000e+00, 1.0000000000e+00, 2.0000000000e+00, 3.0000000000e+00, 1.0000000000e+00, 2.0000000000e+00, 8.0000000000e-01, 2.5000000000e+00, 5.0000000000e-01, 5.0000000000e-01, 7.8539816340e-01, 3.1622776602e-01, 6.3245553203e-01, 7.0710678119e-01, -2.4038566061e-01, 8.0063629303e-01, 5.4881350243e-01, -8.3062970822e-01, -5.4820001436e-01, 9.7627004864e-02, -0.0000000000e+00, -0.0000000000e+00, 8.8249690258e-01, 9.8985210047e-01, 1.8624762920e+00, 1.5707963268e+00, 7.8539816340e-01, -5.8910586113e-01, 1.4967342534e+00, 3.0000000000e+00, 4.8466333708e-01, 1.6598874767e+00, 3.0000000000e+00, 1.0488135024e+00, 2.1856892331e+00, 3.6455680954e+00, 7.3017984105e-01, 2.2450786356e+00, 3.4045250143e+00, 1.0488135024e+00, 2.0000000000e+00, 3.0000000000e+00, 7.3017984105e-01, 2.0000000000e+00, 3.0000000000e+00, 1.1952540097e+00, 2.4642230826e+00, 3.0000000000e+00, 6.9218831412e-01, 2.1551835684e+00, 3.0000000000e+00, 1.1952540097e+00, 2.4642230826e+00, 4.2911361908e+00, 3.8437662825e-01, 2.3103671369e+00, 3.4289404236e+00, 1.0488135024e+00, 2.1856892331e+00, 3.0000000000e+00, 7.3017984105e-01, 2.2450786356e+00, 3.0000000000e+00, 4.8813502432e-02, -0.0000000000e+00, 5.0000000000e-01, 5.0000000000e-01, 7.0710678119e-01, 7.0710678119e-01, 4.3297802812e-17, 7.0710678119e-01, 4.3297802812e-17, 7.0710678119e-01, -7.0710678119e-01, 0.0000000000e+00, 1.0000000000e+00, 0.0000000000e+00, -1.4644660941e-01, 8.5355339059e-01, -5.0000000000e-01, -1.4644660941e-01, 8.5355339059e-01, -5.0000000000e-01, 1.5857864376e+00, 9.1421356237e-01, 2.6142135624e+00, -9.2677669530e-01, 2.8033008589e-01, -2.5000000000e-01, 6.4644660941e-01, 1.4644660941e-01, 3.8213203436e+00, 7.0710678119e-01, 4.3297802812e-17, 7.0710678119e-01, 1.0000000000e+00, -3.0000000000e+00, 2.0000000000e+00, 4.3297802812e-17, 7.0710678119e-01, -7.0710678119e-01, 3.0000000000e+00, 2.0000000000e+00, -1.0000000000e+00, 0.0000000000e+00, 1.0000000000e+00, 0.0000000000e+00, -7.0710678119e-01, 2.1213203436e+00, 3.0000000000e+00, -1.4644660941e-01, 8.5355339059e-01, -5.0000000000e-01, 5.8578643763e-01, 3.4142135624e+00, 1.4142135624e+00, 3.9269908170e-01, 2.0000000000e+00, -5.0000000000e-01, 4.2000000000e+00, -9.0666756704e-01, 1.3961632764e+00, 3.0000000000e+00,
2 changes: 1 addition & 1 deletion matlab/test/monte_carlo/source_test_data_generation/UnitTests_SurfaceEmitting2DSources.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.0000000000e+00, 0.0000000000e+00, 0.0000000000e+00, 7.0710678119e-01, 7.0710678119e-01, 0.0000000000e+00, 1.0000000000e+00, -2.5000000000e+00, 1.2000000000e+00, 7.8539816340e-01, 7.8539816340e-01, 0.0000000000e+00, 1.5707963268e+00, 0.0000000000e+00, 3.1415926536e+00, 1.0000000000e+00, 2.0000000000e+00, 3.0000000000e+00, 8.0000000000e-01, 1.2000000000e+00, 1.5000000000e+00, 1.0000000000e+00, 2.0000000000e+00, 8.0000000000e-01, 7.8539816340e-01, 4.6708668105e-01, 8.6503758455e-01, 1.8313931776e-01, 2.0461858039e+00, -3.5461858039e+00, 1.9678049083e+00, 4.6708668105e-01, 8.6503758455e-01, 1.8313931776e-01, 1.8554491863e+00, -3.3554491863e+00, 1.4478043547e+00, 6.0275777831e-01, 7.3715866524e-01, -3.0541801347e-01, 2.0461858039e+00, -3.5461858039e+00, 1.9678049083e+00, 5.5744328042e-01, 7.0445430168e-01, -4.3931893421e-01, 1.8554491863e+00, -3.3554491863e+00, 1.4478043547e+00, 4.6708668105e-01, 8.6503758455e-01, 1.8313931776e-01, 8.4953565822e-01, -2.3495356582e+00, 1.3023363653e+00, 5.3044120905e-01, 7.9209406120e-01, 3.0202503529e-01, 1.0673592523e+00, -2.5673592523e+00, 1.6782073724e+00, -7.5207139095e-02, 9.3896259407e-01, -3.3569797908e-01, 8.4953565822e-01, -2.3495356582e+00, 1.3023363653e+00, 3.5567783444e-01, 9.3452389586e-01, 1.2584361593e-02, 1.0673592523e+00, -2.5673592523e+00, 1.6782073724e+00, 4.6708668105e-01, 8.6503758455e-01, 1.8313931776e-01, 8.8274863226e-01, -2.3827486323e+00, 1.2967857573e+00, 5.3044120905e-01, 7.9209406120e-01, 3.0202503529e-01, 1.0123707617e+00, -2.5123707617e+00, 1.5640884293e+00, 1.1722944862e-02, 9.2240192747e-01, -3.8605343771e-01, 8.8274863226e-01, -2.3827486323e+00, 1.2967857573e+00, 2.3884092479e-01, 9.5419317945e-01, -1.8019541877e-01, 1.0123707617e+00, -2.5123707617e+00, 1.5640884293e+00, 5.1658909152e-01, 7.6356322080e-01, 3.8743634105e-01, 2.0461858039e+00, -3.5461858039e+00, 1.9678049083e+00, 5.1658909152e-01, 7.6356322080e-01, 3.8743634105e-01, 1.8554491863e+00, -3.3554491863e+00, 1.4478043547e+00, 5.1658909152e-01, 7.6356322080e-01, 3.8743634105e-01, 8.4953565822e-01, -2.3495356582e+00, 1.3023363653e+00, 5.2253171344e-01, 8.0807545050e-01, 2.7198285747e-01, 1.0673592523e+00, -2.5673592523e+00, 1.6782073724e+00, 5.1658909152e-01, 7.6356322080e-01, 3.8743634105e-01, 8.8274863226e-01, -2.3827486323e+00, 1.2967857573e+00, 5.2253171344e-01, 8.0807545050e-01, 2.7198285747e-01, 1.0123707617e+00, -2.5123707617e+00, 1.5640884293e+00, 4.0706644811e-01, 9.1337218952e-01, 6.9390367108e-03, 1.8554491863e+00, -3.3554491863e+00, 1.4478043547e+00,
0.0000000000e+00, 0.0000000000e+00, 0.0000000000e+00, 7.0710678119e-01, 7.0710678119e-01, 0.0000000000e+00, 1.0000000000e+00, -2.5000000000e+00, 1.2000000000e+00, 7.8539816340e-01, 7.8539816340e-01, 0.0000000000e+00, 1.5707963268e+00, 0.0000000000e+00, 3.1415926536e+00, 1.0000000000e+00, 2.0000000000e+00, 3.0000000000e+00, 8.0000000000e-01, 1.2000000000e+00, 1.5000000000e+00, 1.0000000000e+00, 2.0000000000e+00, 8.0000000000e-01, 7.8539816340e-01, 4.6708668105e-01, 8.6503758455e-01, 1.8313931776e-01, 2.0461858039e+00, -3.5461858039e+00, 1.9678049083e+00, 4.6708668105e-01, 8.6503758455e-01, 1.8313931776e-01, 1.4277245931e+00, -2.9277245931e+00, 1.3239021773e+00, 6.0275777831e-01, 7.3715866524e-01, -3.0541801347e-01, 2.0461858039e+00, -3.5461858039e+00, 1.9678049083e+00, 4.1061545566e-01, 7.7928434110e-01, -4.7340348889e-01, 1.4277245931e+00, -2.9277245931e+00, 1.3239021773e+00, 4.6708668105e-01, 8.6503758455e-01, 1.8313931776e-01, 8.4953565822e-01, -2.3495356582e+00, 1.3023363653e+00, 5.3044120905e-01, 7.9209406120e-01, 3.0202503529e-01, 1.0336796262e+00, -2.5336796262e+00, 1.4391036862e+00, -7.5207139095e-02, 9.3896259407e-01, -3.3569797908e-01, 8.4953565822e-01, -2.3495356582e+00, 1.3023363653e+00, 2.6722086357e-01, 9.3333826254e-01, -2.3973464028e-01, 1.0336796262e+00, -2.5336796262e+00, 1.4391036862e+00, 4.6708668105e-01, 8.6503758455e-01, 1.8313931776e-01, 8.8274863226e-01, -2.3827486323e+00, 1.2967857573e+00, 5.3044120905e-01, 7.9209406120e-01, 3.0202503529e-01, 1.0123707617e+00, -2.5123707617e+00, 1.5640884293e+00, 1.1722944862e-02, 9.2240192747e-01, -3.8605343771e-01, 8.8274863226e-01, -2.3827486323e+00, 1.2967857573e+00, 2.3884092479e-01, 9.5419317945e-01, -1.8019541877e-01, 1.0123707617e+00, -2.5123707617e+00, 1.5640884293e+00, 5.1658909152e-01, 7.6356322080e-01, 3.8743634105e-01, 2.0461858039e+00, -3.5461858039e+00, 1.9678049083e+00, 5.1658909152e-01, 7.6356322080e-01, 3.8743634105e-01, 1.4277245931e+00, -2.9277245931e+00, 1.3239021773e+00, 5.1658909152e-01, 7.6356322080e-01, 3.8743634105e-01, 8.4953565822e-01, -2.3495356582e+00, 1.3023363653e+00, 5.2253171344e-01, 8.0807545050e-01, 2.7198285747e-01, 1.0336796262e+00, -2.5336796262e+00, 1.4391036862e+00, 5.1658909152e-01, 7.6356322080e-01, 3.8743634105e-01, 8.8274863226e-01, -2.3827486323e+00, 1.2967857573e+00, 5.2253171344e-01, 8.0807545050e-01, 2.7198285747e-01, 1.0123707617e+00, -2.5123707617e+00, 1.5640884293e+00, 4.0706644811e-01, 9.1337218952e-01, 6.9390367108e-03, 1.4277245931e+00, -2.9277245931e+00, 1.3239021773e+00,
2 changes: 1 addition & 1 deletion ...est/monte_carlo/source_test_data_generation/Unit_Tests_MonteCarlo_Helpers_SourceToolbox.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@

% unit test for all static methods in Func
Test01 = Func_GetDirectionForGiven2DPositionAndGivenPolarAngle(V, polAngle);
Test02 = Func_GetDirectionForGivenPolaAzimuthalAngleRange(PolRange, AziRange, RN1, RN2);
Test02 = Func_GetDirectionForGivenPolarAzimuthalAngleRange(PolRange, AziRange, RN1, RN2);
Test03 = Func_GetDirectionForIsotropicDistributionRandom(RN1, RN2);
Test04 = Func_GetDoubleNormallyDistributedRandomNumbers(RN1, RN2, LimitL, LimitU);
Test05 = Func_GetLimit(Factor);
Expand Down
Loading
Loading