detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-11 12:27:14 +02:00
Code Issues Actions Packages Releases Activity

merge ocnflict for white background

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-11-28 11:29:15 +01:00
parent 4466213882 a351fa8f28
commit a89847538d
17 changed files with 101 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
slsReceiverSoftware/include/GeneralData.h
View File

@ -157,7 +157,7 @@ public:
* @param tgEnable true if 10GbE is enabled, else false
*/
virtual void SetDynamicRange(int dr, bool tgEnable) {
bprintf(RED,"This is a generic function that should be overloaded by a derived class\n");
cprintf(RED,"This is a generic function that should be overloaded by a derived class\n");
};
/**
@ -166,7 +166,7 @@ public:
* @param dr dynamic range
*/
virtual void SetTenGigaEnable(bool tgEnable, int dr) {
bprintf(RED,"This is a generic function that should be overloaded by a derived class\n");
cprintf(RED,"This is a generic function that should be overloaded by a derived class\n");
};
/**
@ -175,7 +175,7 @@ public:
* @param nroich number of channels in roi
*/
virtual void setNumberofSamples(const uint64_t ns, uint32_t nroich) {
bprintf(RED,"This is a generic function that should be overloaded by a derived class\n");
cprintf(RED,"This is a generic function that should be overloaded by a derived class\n");
};
/**
@ -183,7 +183,7 @@ public:
* @param enable true if gap pixels enable, else false
*/
virtual void SetGapPixelsEnable(bool b, int dr) {
bprintf(RED,"This is a generic function that should be overloaded by a derived class\n");
cprintf(RED,"This is a generic function that should be overloaded by a derived class\n");
};