HIT-PAT/HITDAQ
HIT-PAT/HITDAQ
4
1
Fork 0
Code Issues Pull Requests repo.project_board Releases Wiki Activity

the calibration now accepts 1 channel at a time

Browse Source
This commit is contained in:
Blake Leverington 2024-08-06 15:59:45 +02:00
parent 818fdc8197
commit 7fb74c4bcc
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hit2023v2_RMS/device.cpp
View File

@ -111,7 +111,7 @@ void Device::configure(DeviceConfig &cfg)
ctrlSetGain(deviceConfig.gain); ctrlSetGain(deviceConfig.gain);
ctrlSetClusterThreshold(deviceConfig.threshold); ctrlSetClusterThreshold(deviceConfig.threshold);
ctrlSetClusterSize(deviceConfig.clustersize); ctrlSetClusterSize(deviceConfig.clustersize);
//ctrlSetCalibrationFactor(deviceConfig.calibrationFactor); ctrlSetCalibrationFactor(deviceConfig.calibrationFactor);
ctrlConfigBunch(deviceConfig.dma_bunch, deviceConfig.eth_bunch); ctrlConfigBunch(deviceConfig.dma_bunch, deviceConfig.eth_bunch);
ctrlConfigPeer(ipshort, DEV_BASE_DATA_PORT+ deviceConfig.device_id); ctrlConfigPeer(ipshort, DEV_BASE_DATA_PORT+ deviceConfig.device_id);
} }
@ -519,15 +519,22 @@ int Device::ctrlSetCalibrationFactor(int calibrationFactor[320])
QVector<unsigned short> rxdata; QVector<unsigned short> rxdata;
QVector<unsigned short> txdata; QVector<unsigned short> txdata;
int status = -1;
// Append each calibration factor to txdata // Append each calibration factor to txdata
for (int i = 0; i < 320; ++i) for (int i = 0; i < 320; ++i)
{ {
txdata.append(static_cast<unsigned short>(i));
txdata.append(static_cast<unsigned short>(calibrationFactor[i])); txdata.append(static_cast<unsigned short>(calibrationFactor[i]));
// Perform the queryCtrl operation with the populated txdata
status = queryCtrl(COMMAND_SET_CALIBRATION_FACTOR, txdata, rxdata);
rxdata.clear();
txdata.clear();
//if (status == DEV_CTRL_ERROR) {return DEV_CTRL_ERROR;}
} }
// Perform the queryCtrl operation with the populated txdata return DEV_CTRL_OK;
return queryCtrl(COMMAND_SET_CALIBRATION_FACTOR, txdata, rxdata);
} }