Skip to content
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.

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

Add dbs to radiative splitting #974

Draft
wants to merge 58 commits into
base: develop
Choose a base branch
from
Draft
Changes from 1 commit
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
3b51ec3
First commit.
blakewalters Mar 7, 2020
2d05a10
Commit no. 2
blakewalters Apr 27, 2020
86f4c71
Commit I think third.
blakewalters Jun 15, 2020
6eefb24
Commit 4.
blakewalters Jul 28, 2020
5f955a1
Commit n+1
blakewalters Aug 24, 2020
c4a4ed7
All required functions in egs_advanced_application.
blakewalters Sep 21, 2020
0191dae
Trying to get it to compile.
blakewalters Oct 19, 2020
f847359
Compiles but hangs during run.
blakewalters Oct 29, 2020
5ceb688
Ensure latch bit 31 set to mark phat/non-phat particles.
blakewalters Nov 16, 2020
9bf7b73
Include Rayleigh interactions and eliminate some
blakewalters Nov 23, 2020
61f325d
Need to figure out how to not require
blakewalters Dec 15, 2020
058308a
Added output to Makefile.
blakewalters Jan 4, 2021
dec8b35
Override key macros from egs_interface2.macros.
blakewalters Feb 8, 2021
f48ea09
Forgot egs_radiative_splitting.macros file.
blakewalters Feb 8, 2021
a2e15ae
Midway through changes to implement all
blakewalters Mar 29, 2021
9458759
Major changes including:
blakewalters Apr 26, 2021
7dd7941
EGS_AdvancedAppliction::getParticleFromStack changed from void->EGS_P…
blakewalters Apr 26, 2021
293a399
Forgot to add array_sizes.h
blakewalters Apr 29, 2021
906ca73
Fixed a few bugs re:
blakewalters May 17, 2021
616d3bd
Add Ernesto's changes from 05/18/2021.
blakewalters May 31, 2021
27d18d7
Eliminate array dimension macros from AO.
blakewalters Jun 1, 2021
0a6eadf
Fixed bugs in updateParticleOnStack and getParticleFromStack:
blakewalters Jun 21, 2021
74b5e93
Pass values to getRngAzimuth by reference.
Jul 15, 2022
dd5d1e7
Fix incorrect updating of latch of initiating e- after brems.
Aug 26, 2022
b5fb044
"Essential" debug statements.
Sep 27, 2022
e22d7b4
Fix calls to alias_sample1 and egs_rayleigh_sampling.
Nov 22, 2022
41d45ef
Another fix: Did not properly copy region no. over during Rayleigh sp…
Nov 29, 2022
5a5e7fc
Replaced app->isWhere(x) with irl=app->top_p.ir everywhere.
Dec 2, 2022
97a4389
Debug statements.
Jan 16, 2023
f4647cd
Debug output.
Feb 7, 2023
3228194
Change $MXBRSPLIT back to default value.
Feb 21, 2023
13f3a58
Put interacting particle on top of stack.
Mar 4, 2023
c6e6f27
Remove debug output.
Mar 10, 2023
c6fbdf5
Revert to develop versions of egsnrc.mortran, egs_application.cpp
Mar 11, 2023
b663d3f
Halfway to changing SmartCompton to use BEAMnrc implementation.
Mar 21, 2023
265f016
Make SmartCompton identical to BEAMnrc implementation...2nd commit.
Mar 31, 2023
1d8cef0
Changed SmartCompton to BEAMnrc implementation...1st crack.
Mar 31, 2023
b9fb2c9
More changes to doSmartCompton to match BEAMnrc implementation.
Apr 14, 2023
bbe2fdc
Final changes to doSmartCompton to match BEAMnrc implementation.
Apr 21, 2023
f30144b
Some debugging statements.
Apr 22, 2023
682f922
Likely some debug statements.
May 5, 2023
ee747a7
Ooops, introduced bug in BEAMnrc implementation of SmartCompton.
May 12, 2023
07901a2
Remove debug stop from egs_phsp_scoring.
May 12, 2023
4fe6a53
Get rid of commented out debug statement.
May 12, 2023
0bf67af
Revert to default value of $MAXBRSPLIT.
May 12, 2023
189bf10
Get rid of repeat definition of getNp().
May 12, 2023
eb03a95
Fixed bug in doSmartBrems latch setting.
May 30, 2023
671bcdb
Implement beampp version of doSmartCompton.
Sep 1, 2023
aff3a1e
Fixed bug setting region no. for phat photon in doSmartCompton.
Sep 13, 2023
79ed4c4
Mid debug 12/05/2023.
Dec 5, 2023
b43a33f
Restore functionality after debug.
Jan 15, 2024
5e425f0
Subject all nonphat photons to RR before interacting.
Apr 2, 2024
d54adf5
Fix sampling indices in doSmartBrems.
May 16, 2024
b164dac
Rename some variables. A bit of cleanup.
May 17, 2024
3fb4dc3
Small changes, plus disable smartCompton.
May 21, 2024
631eb33
Latest fixes including eliminate unnecessary fat photon from smart br…
May 27, 2024
7f88689
Formatting!
Jun 3, 2024
c03fa23
(Re)implement doSmartCompton based on BEAMnrc algorithm.
Jun 7, 2024
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
Prev Previous commit
Next Next commit
Fixed bug setting region no. for phat photon in doSmartCompton.
  • Loading branch information
Blake Walters authored and Blake Walters committed May 31, 2024
commit aff3a1e9f831e2697076ec09f9a33107be12fb2c
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,11 @@ int EGS_RadiativeSplitting::doInteractions(int iarg, int &killed)
//label as nonphat to be passed on to descendents
latch = latch & ~(1 << 0);
app->setLatch(latch); //reset latch of interacting photon
// EGS_Particle p_tmp = app->getParticleFromStack(app->getNp());
// egsInformation("about to doSC: np=%d, iq=%d, E=%g, wt=%g\n",app->getNp(),p_tmp.q,p_tmp.E,p_tmp.wt);
doSmartCompton(nint);
// p_tmp = app->getParticleFromStack(app->getNp());
//egsInformation("after doSC: np=%d, iq=%d, E=%g, wt=%g\n",app->getNp(),p_tmp.q,p_tmp.E,p_tmp.wt);
}
else //straight-up compton
{
Expand Down Expand Up @@ -1222,7 +1226,7 @@ void EGS_RadiativeSplitting::doSmartCompton(int nint)
//
// sample interactions towards circle
//
app->deleteParticleFromStack(np); //overwrite interacting photon
app->deleteParticleFromStack(np); //delete interacting particle
if( method1 ) {
for(int j=0; j<nsample; j++) {
EGS_Float x1, y1; int iw;
Expand Down Expand Up @@ -1338,6 +1342,7 @@ void EGS_RadiativeSplitting::doSmartCompton(int nint)
p.u=EGS_Vector(un,vn,wn);
p.wt=wt*nint;
p.latch=latch | (1 << 0);
p.ir=irl;
p.q=0; p.E = E*br;
app->addParticleToStack(p,dnear);
}
Expand Down