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.

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

[bug] update srcparam2 after volume preprocessing, close #206 #207

Merged
merged 1 commit into from
Feb 21, 2024
+25 −25
Merged

[bug] update srcparam2 after volume preprocessing, close #206 #207

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
50 changes: 25 additions & 25 deletions src/mcx_utils.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1634,31 +1634,6 @@ void mcx_preprocess(Config* cfg) {
}
}

// for all point sources, precompute launch voxel index and media value and store those in srcparam2.z/.w internally
if (cfg->srctype <= MCX_SRC_CONE || cfg->srctype == MCX_SRC_ARCSINE || cfg->srctype == MCX_SRC_ZGAUSSIAN) {
if (cfg->srcpos.x < 0.f || cfg->srcpos.y < 0.f || cfg->srcpos.z < 0.f || cfg->srcpos.x >= cfg->dim.x || cfg->srcpos.y >= cfg->dim.y || cfg->srcpos.z >= cfg->dim.z) {
*((uint*)&cfg->srcparam2.z) = 0;
*((uint*)&cfg->srcparam2.w) = 0;
} else {
uint idx1dorig = ((int)(floorf(cfg->srcpos.z)) * (cfg->dim.y * cfg->dim.x) + (int)(floorf(cfg->srcpos.y)) * cfg->dim.x + (int)(floorf(cfg->srcpos.x)));
*((uint*)&cfg->srcparam2.z) = idx1dorig;
*((uint*)&cfg->srcparam2.w) = (cfg->vol[idx1dorig] & MED_MASK);
}

if (cfg->extrasrclen) {
for (int i = 0; i < cfg->extrasrclen; i++) {
if (cfg->srcdata[i].srcpos.x < 0.f || cfg->srcdata[i].srcpos.y < 0.f || cfg->srcdata[i].srcpos.z < 0.f || cfg->srcdata[i].srcpos.x >= cfg->dim.x || cfg->srcdata[i].srcpos.y >= cfg->dim.y || cfg->srcdata[i].srcpos.z >= cfg->dim.z) {
*((uint*)&cfg->srcdata[i].srcparam2.z) = 0;
*((uint*)&cfg->srcdata[i].srcparam2.w) = 0;
} else {
uint idx1dorig = ((int)(floorf(cfg->srcdata[i].srcpos.z)) * (cfg->dim.y * cfg->dim.x) + (int)(floorf(cfg->srcdata[i].srcpos.y)) * cfg->dim.x + (int)(floorf(cfg->srcdata[i].srcpos.x)));
*((uint*)&cfg->srcdata[i].srcparam2.z) = idx1dorig;
*((uint*)&cfg->srcdata[i].srcparam2.w) = (cfg->vol[idx1dorig] & MED_MASK);
}
}
}
}

if (cfg->vol) {
unsigned int dimxyz = cfg->dim.x * cfg->dim.y * cfg->dim.z;

Expand Down Expand Up @@ -1701,6 +1676,31 @@ void mcx_preprocess(Config* cfg) {
}
}

// for all point sources, precompute launch voxel index and media value and store those in srcparam2.z/.w internally
if (cfg->srctype <= MCX_SRC_CONE || cfg->srctype == MCX_SRC_ARCSINE || cfg->srctype == MCX_SRC_ZGAUSSIAN) {
if (cfg->srcpos.x < 0.f || cfg->srcpos.y < 0.f || cfg->srcpos.z < 0.f || cfg->srcpos.x >= cfg->dim.x || cfg->srcpos.y >= cfg->dim.y || cfg->srcpos.z >= cfg->dim.z) {
*((uint*)&cfg->srcparam2.z) = 0;
*((uint*)&cfg->srcparam2.w) = 0;
} else {
uint idx1dorig = ((int)(floorf(cfg->srcpos.z)) * (cfg->dim.y * cfg->dim.x) + (int)(floorf(cfg->srcpos.y)) * cfg->dim.x + (int)(floorf(cfg->srcpos.x)));
*((uint*)&cfg->srcparam2.z) = idx1dorig;
*((uint*)&cfg->srcparam2.w) = (cfg->vol[idx1dorig] & MED_MASK);
}

if (cfg->extrasrclen) {
for (int i = 0; i < cfg->extrasrclen; i++) {
if (cfg->srcdata[i].srcpos.x < 0.f || cfg->srcdata[i].srcpos.y < 0.f || cfg->srcdata[i].srcpos.z < 0.f || cfg->srcdata[i].srcpos.x >= cfg->dim.x || cfg->srcdata[i].srcpos.y >= cfg->dim.y || cfg->srcdata[i].srcpos.z >= cfg->dim.z) {
*((uint*)&cfg->srcdata[i].srcparam2.z) = 0;
*((uint*)&cfg->srcdata[i].srcparam2.w) = 0;
} else {
uint idx1dorig = ((int)(floorf(cfg->srcdata[i].srcpos.z)) * (cfg->dim.y * cfg->dim.x) + (int)(floorf(cfg->srcdata[i].srcpos.y)) * cfg->dim.x + (int)(floorf(cfg->srcdata[i].srcpos.x)));
*((uint*)&cfg->srcdata[i].srcparam2.z) = idx1dorig;
*((uint*)&cfg->srcdata[i].srcparam2.w) = (cfg->vol[idx1dorig] & MED_MASK);
}
}
}
}

if (cfg->issavedet) {
mcx_maskdet(cfg);
}
Expand Down
Loading