Skip to content

Mccomposite #107

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

Jump to bottom
Draft
yxqd wants to merge 55 commits into
base: main
Choose a base branch
from
Draft

Mccomposite #107

yxqd wants to merge 55 commits into from

Conversation

@yxqd
Copy link
Member

@yxqd yxqd commented May 1, 2023

fixes #100

yxqd added 30 commits April 27, 2023 22:44
@yxqd
added method forward_distance_in_shape: acc/geometry/propagation.py
e9d9aa9
@yxqd
added acc.scatterers.homogeneous_scatterer module: currently only imp…
e478f4d 
…lemented

`interact_path1`; added a test
@yxqd
added acc.scatterers subpkg: setup.py
5e97e55
@yxqd
ignore test outputs and build dirs: .gitignore
38a6659
@yxqd
refactored using new object _numba.coder: acc/kernels/composite.py
4f82ed2
@yxqd
trivial cosmetic changes: acc/kernels/composite.py
bb617f0
@yxqd
use method factory instead of pickle: acc/kernels/composite.py
805d780
@yxqd
refactored so that only one module needed for all composite kernels w…
9b66016 
…ith same

number of subkernels:   acc/kernels/composite.py
@yxqd
handle overflow: acc/geometry/arrow_intersect.py
df0a2ee
@yxqd
started implementing acc.geometry.composite with an example methods f…
2ad8744 
…actory.

tested `forward_intersect_all`
@yxqd
implemented find_1st_hit and added a test: acc/geometry/composite.py
4de8a86
@yxqd
fixed assertion: tests/components/samples/test_homogeneous_multiple_s…
5369c92 
…catterer.py
@yxqd
set pytest marker: tests/scatterers/test_homogeneous_scatterer.py
d158181
@yxqd
geometry.composite: added method "intersect_all"
0c6ee4d
@yxqd
geometry.composite: added locate method for union of 3 shapes and a test
2dc4f88
@yxqd
partial implementation to handle translation and rotation for locate/…
958dbf6 
…intersect
@yxqd
expose calculate_attenuation: acc/scatterers/homogeneous_scatterer.py
a95a79d
@yxqd
composite_scatterer.intersect_path1 preliminary implementation and test
7df43ed
@yxqd
preliminary implementation of acc.scatterers.ScatterFuncFactory.onCom…
ab984dd 
…positeScatterer
@yxqd
added a real CUDA test of homogenouse_scatterer interact_path1 and fi…
3ae877a 
…xed a few bugs
@yxqd
minor refactor: tests/scatterers/test_homogeneous_scatterer.py
5fa2fe9
@yxqd
minor (increase ncount to 1e5): tests/scatterers/test_homogeneous_sca…
72ed97a 
…tterer.py
@yxqd
simplify with pytest fixtures: tests/scatterers/test_homogeneous_scat…
de67bc2 
…terer.py
@yxqd
composite_scatterer.interact_path1 for three elements passed the sani…
0beaf02 
…ty check
@yxqd
refactor: moved methods for 3-element composite from acc.geometry.com…
10cfe20 
…posite to composite_3
@yxqd
minor refactor: acc/geometry/composite_3.py
52fd950
@yxqd
minor refactor: acc/geometry/composite_3.py
3bb47ae
@yxqd
renamed: tests/geometry/test_composite_shape.py -> test_composite_3_e…
d4d7598 
…lements.py
@yxqd
simplified loops for intersect_all methods: acc/geometry/composite_3.py
9eed2b1
@yxqd
started working on coder -- added _intersect_all: acc/geometry/compos…
e6149da 
…ite.py
yxqd added 25 commits May 8, 2023 17:53
@yxqd
implemented method to create createMethods for N-element composite:…
5b825ad 
… acc/geometry/composite.py
@yxqd
trivial cosmetic: acc/geometry/composite.py
9880dcb
@yxqd
method factories are classes now: acc/geometry/composite.py
ee8ae4e
@yxqd
test the module made by the composite-shape ray-tracing method factory
38feaa7
@yxqd
added a real CUDA test: tests/geometry/test_composite_shape.py
05ad8a0
@yxqd
renamed acc.scatterers.composite_scatterer to ..composite_3
6e687cc
@yxqd
trivial: acc/geometry/composite_3.py
e6dff8b
@yxqd
make most methods protected in geometry.composite, and added two publ…
946a551 
…ic methods

get_find_1st_hit and get_union_locate
@yxqd
added a sanity check of public methods in geometry.composite: tests/g…
35f2e53 
…eometry/test_composite_shape.py
@yxqd
minor: made method names in geometry.composite_3 consistent with thos…
67b87f3 
…e generated in geometry.composite
@yxqd
fixed bugs introduced in the last couple commits (method renames): ac…
52b93ab 
…c/geometry/{arrow_intersect|locate}.py
@yxqd
refactored codes around composite_scatterer so that we can add "coder…
994272d 
…" for composites of arbitrary number of elements
@yxqd
added scatterers.composite_scatterer._makeModule
2ed20ce
@yxqd
use module created by "coder": acc/scatterers/composite_scatterer.py
ed64b71
@yxqd
composite: implement and test single-scatter methods
5075426
@yxqd
added composite sample component and started writing a test module
dafc8bb
@yxqd
part of an effort to simplify test instruments. see #111
883423c
@yxqd
refactoring: tests/components/samples/test_composite_isotropic_sphere.py
3f65d73
@yxqd
scatter method - match signature to component.propagate: acc/scattere…
7725e57 
…rs/composite_scatterer.py
@yxqd
composite.py: 1.added SampleAssemblyFromXml method to create the comp…
235529f 
…onent class;

2.directly register scatter method created by mcvine.acc.scatterers.scatter_func_factory as the propagate method
@yxqd
make sure mcweights and packing_factor are floats: acc/scatterers/__i…
fc7e27e 
…nit__.py
@yxqd
Merge branch 'sans_kernel' into mccomposite
5d7ac94 
resolved conflict in acc/kernels/composite.py - discarded changes in sans_kernel
@yxqd
minor (inline doc): components/samples/composite.py
2c289b6
@yxqd
debugging: tests/components/samples/test_composite_isotropic_sphere.py
4e2367e
@yxqd
Merge branch 'main' into mccomposite: fixed Conflicts in .gitignore
ec256ce
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Support mccomposite

2 participants

@yxqd