Skip to content

Fix for #2436 (McStas+McXtrace) and #2406 (McXtrace) by sync #2440

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
willend merged 2 commits into from
May 6, 2026
Merged

Fix for #2436 (McStas+McXtrace) and #2406 (McXtrace) by sync #2440

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
22a3613
Fix for #2436 (McStas+McXtrace) and #2406 (McXtrace) by sync
willend May 6, 2026
476c5bc
Merge branch 'mccode-dev:main' into main
willend May 6, 2026
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
1 change: 0 additions & 1 deletion mcstas-comps/misc/MCPL_output.comp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,6 @@ INITIALIZE
buffermax = mcget_ncount ();
}
X = create_darr1d (buffermax);
X = create_darr1d (buffermax);
Y = create_darr1d (buffermax);
Z = create_darr1d (buffermax);
VX = create_darr1d (buffermax);
Expand Down
19 changes: 7 additions & 12 deletions mcxtrace-comps/misc/MCPL_output.comp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ DECLARE
DArray1d PHI;
DArray1d T;
DArray1d P;
DArray1d U;
uint32_t *U;
int captured;
%}

Expand Down Expand Up @@ -206,7 +206,6 @@ INITIALIZE
buffermax = mcget_ncount ();
}
X = create_darr1d (buffermax);
X = create_darr1d (buffermax);
Y = create_darr1d (buffermax);
Z = create_darr1d (buffermax);
KX = create_darr1d (buffermax);
Expand All @@ -219,7 +218,7 @@ INITIALIZE
T = create_darr1d (buffermax);
P = create_darr1d (buffermax);
if (userflagenabled) {
U = create_darr1d (buffermax);
U = calloc(buffermax,sizeof(uint32_t));
}
captured = 0;
#endif
Expand Down Expand Up @@ -250,10 +249,8 @@ TRACE
P[cap] = p;
if (userflagenabled) {
int fail;
double uvar = particle_getvar (_particle, userflag, &fail);
if (fail)
uvar = 0;
U[cap] = uvar;
void * vptr = particle_getvar_void (_particle, userflag, &fail);
U[cap] = fail ? 0 : *(uint32_t *) vptr;
}
SCATTER;
}
Expand Down Expand Up @@ -282,12 +279,9 @@ TRACE
/*weight in unspecified units:*/
particle->weight = p * weight_scale;
if (userflagenabled) {
// TODO: Reconsider this passing of uint32_t flags through a double
int fail;
double uvar = particle_getvar (_particle, userflag, &fail);
if (fail)
uvar = 0;
particle->userflags = (uint32_t)uvar;
void * vptr = particle_getvar_void (_particle, userflag, &fail);
particle->userflags = fail ? 0 : *(uint32_t *) vptr;
}

MPI_MASTER (if (verbose == 3 && mcrun_num < 10) {
Expand Down Expand Up @@ -384,6 +378,7 @@ FINALLY
destroy_darr1d (PHI);
destroy_darr1d (T);
destroy_darr1d (P);
if (U) free(U);
#endif
free (outfilename);
%}
Expand Down
Loading