Commit 0e9a5010 authored by Tobias Winchen's avatar Tobias Winchen
Browse files

Consistent datatype of sidechannelitems

parent fa121f7e
...@@ -85,7 +85,7 @@ public: ...@@ -85,7 +85,7 @@ public:
private: private:
void process(thrust::device_vector<RawVoltageType> const &digitiser_raw, void process(thrust::device_vector<RawVoltageType> const &digitiser_raw,
thrust::device_vector<RawVoltageType> const &sideChannelData, thrust::device_vector<int64_t> const &sideChannelData,
thrust::device_vector<IntegratedPowerType> &detected_G0, thrust::device_vector<IntegratedPowerType> &detected_G0,
thrust::device_vector<IntegratedPowerType> &detected_G1, thrust::device_vector<IntegratedPowerType> &detected_G1,
thrust::device_vector<unsigned int> &noOfBitSet); thrust::device_vector<unsigned int> &noOfBitSet);
...@@ -115,7 +115,7 @@ private: ...@@ -115,7 +115,7 @@ private:
DoubleDeviceBuffer<RawVoltageType> _raw_voltage_db; DoubleDeviceBuffer<RawVoltageType> _raw_voltage_db;
DoubleDeviceBuffer<IntegratedPowerType> _power_db_G0; DoubleDeviceBuffer<IntegratedPowerType> _power_db_G0;
DoubleDeviceBuffer<IntegratedPowerType> _power_db_G1; DoubleDeviceBuffer<IntegratedPowerType> _power_db_G1;
DoubleDeviceBuffer<RawVoltageType> _sideChannelData_db; DoubleDeviceBuffer<int64_t> _sideChannelData_db;
DoubleDeviceBuffer<unsigned int> _noOfBitSetsInSideChannel; DoubleDeviceBuffer<unsigned int> _noOfBitSetsInSideChannel;
thrust::device_vector<UnpackedVoltageType> _unpacked_voltage_G0; thrust::device_vector<UnpackedVoltageType> _unpacked_voltage_G0;
......
...@@ -181,7 +181,7 @@ void GatedSpectrometer<HandlerType>::init(RawBytes &block) { ...@@ -181,7 +181,7 @@ void GatedSpectrometer<HandlerType>::init(RawBytes &block) {
template <class HandlerType> template <class HandlerType>
void GatedSpectrometer<HandlerType>::process( void GatedSpectrometer<HandlerType>::process(
thrust::device_vector<RawVoltageType> const &digitiser_raw, thrust::device_vector<RawVoltageType> const &digitiser_raw,
thrust::device_vector<RawVoltageType> const &sideChannelData, thrust::device_vector<int64_t> const &sideChannelData,
thrust::device_vector<IntegratedPowerType> &detected_G0, thrust::device_vector<IntegratedPowerType> &detected_G0,
thrust::device_vector<IntegratedPowerType> &detected_G1, thrust::device_vector<unsigned int> &noOfBitSet) { thrust::device_vector<IntegratedPowerType> &detected_G1, thrust::device_vector<unsigned int> &noOfBitSet) {
BOOST_LOG_TRIVIAL(debug) << "Unpacking raw voltages"; BOOST_LOG_TRIVIAL(debug) << "Unpacking raw voltages";
...@@ -199,16 +199,16 @@ void GatedSpectrometer<HandlerType>::process( ...@@ -199,16 +199,16 @@ void GatedSpectrometer<HandlerType>::process(
CUDA_ERROR_CHECK(cudaEventRecord(_procB, _proc_stream)); CUDA_ERROR_CHECK(cudaEventRecord(_procB, _proc_stream));
BOOST_LOG_TRIVIAL(debug) << "Perform gating"; BOOST_LOG_TRIVIAL(debug) << "Perform gating";
const int64_t *sideCD =
(int64_t *)(thrust::raw_pointer_cast(sideChannelData.data()));
gating<<<1024, 1024, 0, _proc_stream>>>( gating<<<1024, 1024, 0, _proc_stream>>>(
thrust::raw_pointer_cast(_unpacked_voltage_G0.data()), thrust::raw_pointer_cast(_unpacked_voltage_G0.data()),
thrust::raw_pointer_cast(_unpacked_voltage_G1.data()), sideCD, thrust::raw_pointer_cast(_unpacked_voltage_G1.data()),
thrust::raw_pointer_cast(sideChannelData.data()),
_unpacked_voltage_G0.size(), _speadHeapSize, _selectedBit, _nSideChannels, _unpacked_voltage_G0.size(), _speadHeapSize, _selectedBit, _nSideChannels,
_selectedSideChannel); _selectedSideChannel);
countBitSet<<<(sideChannelData.size()+255)/256, 256, 0, countBitSet<<<(sideChannelData.size()+255)/256, 256, 0,
_proc_stream>>>(sideCD, sideChannelData.size(), _selectedBit, _proc_stream>>>(thrust::raw_pointer_cast(sideChannelData.data()),
sideChannelData.size(), _selectedBit,
_nSideChannels, _selectedBit, _nSideChannels, _selectedBit,
thrust::raw_pointer_cast(noOfBitSet.data())); thrust::raw_pointer_cast(noOfBitSet.data()));
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment