detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-23 23:10:02 +02:00
Code Issues Actions Packages Releases Activity

fixed warnings

Browse Source
This commit is contained in:
maliakal_d 2022-01-07 08:54:20 +01:00
parent 79affe1ea4
commit 549fef5680
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
slsReceiverSoftware/src/GeneralData.h
View File

@ -58,7 +58,7 @@ class GeneralData {
bool tengigaEnable{false}; bool tengigaEnable{false};
uint32_t nAnalogSamples{0}; uint32_t nAnalogSamples{0};
uint32_t nDigitalSamples{0}; uint32_t nDigitalSamples{0};
readoutMode readoutType{ANALOG_ONLY}; slsDetectorDefs::readoutMode readoutType{slsDetectorDefs::ANALOG_ONLY};
uint32_t adcEnableMaskOneGiga{BIT32_MASK}; uint32_t adcEnableMaskOneGiga{BIT32_MASK};
uint32_t adcEnableMaskTenGiga{BIT32_MASK}; uint32_t adcEnableMaskTenGiga{BIT32_MASK};
slsDetectorDefs::ROI roi{}; slsDetectorDefs::ROI roi{};
@ -69,7 +69,7 @@ class GeneralData {
// Returns the pixel depth in byte, 4 bits being 0.5 byte // Returns the pixel depth in byte, 4 bits being 0.5 byte
float GetPixelDepth() { return float(dynamicRange) / 8; } float GetPixelDepth() { return float(dynamicRange) / 8; }
void ThrowGenericError(std::string msg) { void ThrowGenericError(std::string msg) const {
throw sls::RuntimeError( throw sls::RuntimeError(
msg + std::string("SetROI is a generic function that should be " msg + std::string("SetROI is a generic function that should be "
"overloaded by a derived class")); "overloaded by a derived class"));
@ -150,10 +150,6 @@ class GeneralData {
virtual void SetReadoutMode(slsDetectorDefs::readoutMode r) { virtual void SetReadoutMode(slsDetectorDefs::readoutMode r) {
ThrowGenericError("SetReadoutMode"); ThrowGenericError("SetReadoutMode");
}; };
virtual void SetTenGigaEnable(bool tg) {
ThrowGenericError("SetTenGigaEnable");
};
}; };
class GotthardData : public GeneralData { class GotthardData : public GeneralData {
@ -571,7 +567,7 @@ class ChipTestBoardData : public GeneralData {
dataSize = tengigaEnable ? 8144 : UDP_PACKET_DATA_BYTES; dataSize = tengigaEnable ? 8144 : UDP_PACKET_DATA_BYTES;
packetSize = headerSizeinPacket + dataSize; packetSize = headerSizeinPacket + dataSize;
imageSize = adatabytes + ddatabytes; imageSize = nAnalogBytes + nDigitalBytes;
packetsPerFrame = ceil((double)imageSize / (double)dataSize); packetsPerFrame = ceil((double)imageSize / (double)dataSize);
}; };
}; };

4
slsReceiverSoftware/src/Implementation.cpp
View File

@ -171,7 +171,7 @@ void Implementation::setDetectorType(const detectorType d) {
&framesPerFile, &frameDiscardMode, &activated, &framesPerFile, &frameDiscardMode, &activated,
&detectorDataStream[i], &silentMode)); &detectorDataStream[i], &silentMode));
int ctbAnalogDataBytes = 0; int ctbAnalogDataBytes = 0;
if (myDetectorType == CHIPTESTBOARD) { if (detType == CHIPTESTBOARD) {
ctbAnalogDataBytes = generalData->GetNumberOfAnalogDatabytes(); ctbAnalogDataBytes = generalData->GetNumberOfAnalogDatabytes();
} }
dataProcessor.push_back(sls::make_unique<DataProcessor>( dataProcessor.push_back(sls::make_unique<DataProcessor>(
@ -896,7 +896,7 @@ void Implementation::setNumberofUDPInterfaces(const int n) {
listener[i]->SetGeneralData(generalData); listener[i]->SetGeneralData(generalData);
int ctbAnalogDataBytes = 0; int ctbAnalogDataBytes = 0;
if (myDetectorType == CHIPTESTBOARD) { if (detType == CHIPTESTBOARD) {
ctbAnalogDataBytes = ctbAnalogDataBytes =
generalData->GetNumberOfAnalogDatabytes(); generalData->GetNumberOfAnalogDatabytes();
} }