Fix #1065: source collection fluence #1076
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 4 commits
October 20, 2023 16:49
In case where multiple transformations of a single base source are used.
blakewalters
requested review from
ftessier,
mainegra and
rtownson
and removed request for
a team
rtownson
changed the title
|
Great work Blake! Just a note that this should be rebased to merge into |
rtownson
reviewed
Dec 4, 2023
| @@ -87,7 +87,7 @@ REPLACE {$COVMIN} WITH {10} "min. no. of particles crossing a scoring" | |||
| REPLACE {$MXMED} WITH {12} "max # of media | |||
| REPLACE {$MXREG} WITH {3000} "maximum number of regions (absolute) | |||
| REPLACE {$MXSTACK} WITH {900000} "maximum stack (much less if no brem split) | |||
| REPLACE {$MAXBRSPLIT} WITH {2000} "maximum number of bremsstrahlung splits | |||
| REPLACE {$MAXBRSPLIT} WITH {5000} "maximum number of bremsstrahlung splits | |||
There was a problem hiding this comment.
This looks like an accidental addition to this PR.
There was a problem hiding this comment.
Yes it is, @rtownson. This file shouldn't even be part of this PR. I'll remove it.
There was a problem hiding this comment.
Oh wait, my mistake @rtownson! I've accidentally issued this PR against the master branch when I meant to do it against develop. Let me try that....
4 tasks
rtownson
approved these changes
Jun 12, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fluence for the source collection was not calculated properly in the case of a collection consisting of N transformations, i, of a single base source. EGS_SourceCollection::getFluence() sums the results of getFluence() for the i individual sources. If they are transformations of a single base source, then for each source i, getFluence returns the total fluence (of the base source), F_tot. Thus, EGS_SourceCollection::getFluence() erroneously returns N*F_tot.
The solution is to "detect" a group of sources sharing a common base source by looking for increases in the fluence of source i != j, where j is the source in the collection from which a given particle is being sampled. Before summing individual source fluences, EGS_SourceCollection::getFluence() then multiplies the result of getFluence() for source i by p[i]/p_tot, where p[i] is the user input probability for source i and p_tot is the sum of all probabilities of the N sources sharing the same base source. We are thus able to obtain an estimate of the fluence from each source i.
A further issue occurs when the results of parallel runs are combined. During a parallel run, we store the fluence for each source, i, in the source collection in the .egsdat file from each job. On recombining, results are first added up for each source. If these share a common base source, then these separate additions are actually cumulative with respect to the base source, with the result being that each source, i, will have (erroneous) fluence NF_tot. Then, to obtain the fluence of the source collection, we sum over the N sources, resulting in an additional multiplicative factor of N, so the total fluence is NN*F_tot. In this fix, we now detect when results are being combined and, prior to summing fluence from individual sources, divide by an additional factor N. Note that in order to determine N, we make use of new information written to the .egsdat file for each source i listing the other sources j != i sharing a common base source.
Fixes issue #1065