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

changing g_108MHz enum to g2_108MHZ (similarly 144), adding readoutspeedlist command

Browse Source
This commit is contained in:
maliakal_d
2021-10-08 11:05:25 +02:00
parent b1ae47d189
commit 417bfbaf38
12 changed files with 37 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
slsSupportLib/include/sls/sls_detector_defs.h
View File

@ -377,7 +377,7 @@ typedef struct {
enum readoutMode { ANALOG_ONLY, DIGITAL_ONLY, ANALOG_AND_DIGITAL };
/** chip speed */
enum speedLevel { FULL_SPEED, HALF_SPEED, QUARTER_SPEED, G_108MHZ, G_144MHZ };
enum speedLevel { FULL_SPEED, HALF_SPEED, QUARTER_SPEED, G2_108MHZ, G2_144MHZ };
/**
* burst mode for gotthard2

8
slsSupportLib/src/ToString.cpp
View File

@ -247,9 +247,9 @@ std::string ToString(const defs::speedLevel s) {
return std::string("half_speed");
case defs::QUARTER_SPEED:
return std::string("quarter_speed");
case defs::G_108MHZ:
case defs::G2_108MHZ:
return std::string("108");
case defs::G_144MHZ:
case defs::G2_144MHZ:
return std::string("144");
default:
return std::string("Unknown");
@ -718,9 +718,9 @@ template <> defs::speedLevel StringTo(const std::string &s) {
if (s == "2")
return defs::QUARTER_SPEED;
if (s == "108")
return defs::G_108MHZ;
return defs::G2_108MHZ;
if (s == "144")
return defs::G_144MHZ;
return defs::G2_144MHZ;
throw sls::RuntimeError("Unknown speed " + s);
}