diff options
| author | Stan Seibert <stan@mtrr.org> | 2012-07-25 11:39:25 -0400 |
|---|---|---|
| committer | tlatorre <tlatorre@uchicago.edu> | 2021-05-09 08:42:39 -0700 |
| commit | ffa5050e538463e5aa55fa112a1b3617f6a7e5e7 (patch) | |
| tree | 4800fae552a6ab060c608c05a858333fa481fc97 | |
| parent | 32a188b475e3021b7ddcaf22193fad206234cadc (diff) | |
| download | chroma-ffa5050e538463e5aa55fa112a1b3617f6a7e5e7.tar.gz chroma-ffa5050e538463e5aa55fa112a1b3617f6a7e5e7.tar.bz2 chroma-ffa5050e538463e5aa55fa112a1b3617f6a7e5e7.zip | |
Remove some placeholder DAQ properties.
| -rw-r--r-- | chroma/cuda/daq.cu | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/chroma/cuda/daq.cu b/chroma/cuda/daq.cu index e1ab10d..71c3050 100644 --- a/chroma/cuda/daq.cu +++ b/chroma/cuda/daq.cu @@ -130,14 +130,14 @@ run_daq_many(curandState *s, unsigned int detection_state, int channel_offset = channel_index + i * channel_stride; if (curand_uniform(&rng) < weight) { - float time = photon_time + curand_normal(&rng) * 1.2f;// + - //sample_cdf(&rng, detector->time_cdf_len, - // detector->time_cdf_x, detector->time_cdf_y); + float time = photon_time + curand_normal(&rng) + + sample_cdf(&rng, detector->time_cdf_len, + detector->time_cdf_x, detector->time_cdf_y); unsigned int time_int = float_to_sortable_int(time); - float charge = 1.0f; //sample_cdf(&rng, detector->charge_cdf_len, - //detector->charge_cdf_x, - //detector->charge_cdf_y); + float charge = sample_cdf(&rng, detector->charge_cdf_len, + detector->charge_cdf_x, + detector->charge_cdf_y); unsigned int charge_int = roundf(charge / detector->charge_unit); atomicMin(earliest_time_int + channel_offset, time_int); @@ -154,7 +154,7 @@ convert_sortable_int_to_float(int n, unsigned int *sortable_ints, float *float_output) { int id = threadIdx.x + blockDim.x * blockIdx.x; - + if (id < n) float_output[id] = sortable_int_to_float(sortable_ints[id]); } |