diff options
| author | Andy Mastbaum <mastbaum@hep.upenn.edu> | 2012-04-26 13:23:12 -0400 |
|---|---|---|
| committer | tlatorre <tlatorre@uchicago.edu> | 2021-05-09 08:42:39 -0700 |
| commit | c5882fe78ca2a4c08784a03c589c4af2a12604e8 (patch) | |
| tree | 2b5437ba4b16ecb7675b9b0aa6bc40d382777f4b /chroma/cuda | |
| parent | 21f9525f4dc83a7d6aac13529c92e010bb046ce9 (diff) | |
| download | chroma-c5882fe78ca2a4c08784a03c589c4af2a12604e8.tar.gz chroma-c5882fe78ca2a4c08784a03c589c4af2a12604e8.tar.bz2 chroma-c5882fe78ca2a4c08784a03c589c4af2a12604e8.zip | |
update python-side gpu structs to reflect cuda changes
this fixes hybrid rendering mode
Diffstat (limited to 'chroma/cuda')
| -rw-r--r-- | chroma/cuda/geometry_types.h | 2 | ||||
| -rw-r--r-- | chroma/cuda/photon.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/chroma/cuda/geometry_types.h b/chroma/cuda/geometry_types.h index 7db7359..ab54dfa 100644 --- a/chroma/cuda/geometry_types.h +++ b/chroma/cuda/geometry_types.h @@ -37,10 +37,10 @@ struct Surface unsigned int model; unsigned int n; unsigned int reemission_n; + unsigned int transmissive; float step; float wavelength0; float thickness; - bool transmissive; }; struct Triangle diff --git a/chroma/cuda/photon.h b/chroma/cuda/photon.h index 26aa3e1..68ea92c 100644 --- a/chroma/cuda/photon.h +++ b/chroma/cuda/photon.h @@ -359,7 +359,7 @@ propagate_complex(Photon &p, State &s, curandState &rng, Surface* surface, bool float uniform_sample = curand_uniform(&rng); - /* thin film optical model, adapted from RAT PMT optical model by P. Jones */ + // thin film optical model, adapted from RAT PMT optical model by P. Jones cuFloatComplex n1 = make_cuFloatComplex(s.refractive_index1, 0.0f); cuFloatComplex n2 = make_cuFloatComplex(n2_eta, n2_k); cuFloatComplex n3 = make_cuFloatComplex(s.refractive_index2, 0.0f); @@ -503,7 +503,7 @@ propagate_complex(Photon &p, State &s, curandState &rng, Surface* surface, bool p.history |= SURFACE_TRANSMIT; return CONTINUE; } -} // propagate_at_photocathode +} // propagate_complex __device__ int propagate_at_wls(Photon &p, State &s, curandState &rng, Surface *surface, bool use_weights=false) |