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

WIP

Browse Source
This commit is contained in:
maliakal_d 2019-11-06 19:07:00 +01:00
parent 1797d39216
commit 615b3b2557
8 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer
View File

Binary file not shown.

BIN
slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer
View File

Binary file not shown.

BIN
slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer
View File

Binary file not shown.

BIN
slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer
View File

Binary file not shown.

BIN
slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer
View File

Binary file not shown.

2
slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c
View File

@ -5654,7 +5654,7 @@ int set_clock_phase(int file_des) {
sprintf(modeName, "%s clock (%d) phase %s", clock_names[c], (int)c, (inDegrees == 0 ? "" : "(degrees)")); sprintf(modeName, "%s clock (%d) phase %s", clock_names[c], (int)c, (inDegrees == 0 ? "" : "(degrees)"));
// gotthard1d doesnt take degrees and cannot get phase // gotthard1d doesnt take degrees and cannot get phase
#ifndef GOTTHARDD #ifdef GOTTHARDD
if (inDegrees != 0) { if (inDegrees != 0) {
ret = FAIL; ret = FAIL;
strcpy(mess, "Cannot set phase in degrees for this detector.\n"); strcpy(mess, "Cannot set phase in degrees for this detector.\n");

8
slsDetectorSoftware/src/CmdProxy.cpp
View File

@ -407,7 +407,7 @@ std::string CmdProxy::ClockFrequency(int action) {
os << "[n_clock (0-8)] [freq_in_Hz]\n\t[Gotthard2][Mythen3] Frequency of clock n_clock in Hz. Use clkdiv to set frequency." << '\n'; os << "[n_clock (0-8)] [freq_in_Hz]\n\t[Gotthard2][Mythen3] Frequency of clock n_clock in Hz. Use clkdiv to set frequency." << '\n';
} else { } else {
defs::detectorType type = det->getDetectorType().squash(defs::GENERIC); defs::detectorType type = det->getDetectorType().squash(defs::GENERIC);
if (type != defs::GOTTHARD2 && type != MYTHEN3) { if (type != defs::GOTTHARD2 && type != defs::MYTHEN3) {
throw sls::RuntimeError("Not implemented for this detector."); throw sls::RuntimeError("Not implemented for this detector.");
} }
if (action == defs::GET_ACTION) { if (action == defs::GET_ACTION) {
@ -437,7 +437,7 @@ std::string CmdProxy::ClockPhase(int action) {
os << "[n_clock (0-8)] [phase] [deg (optional)]\n\t[Gotthard2][Mythen3] Phase of clock n_clock. If deg, then phase shift in degrees, else absolute phase shift values." << '\n'; os << "[n_clock (0-8)] [phase] [deg (optional)]\n\t[Gotthard2][Mythen3] Phase of clock n_clock. If deg, then phase shift in degrees, else absolute phase shift values." << '\n';
} else { } else {
defs::detectorType type = det->getDetectorType().squash(defs::GENERIC); defs::detectorType type = det->getDetectorType().squash(defs::GENERIC);
if (type != defs::GOTTHARD2 && type != MYTHEN3) { if (type != defs::GOTTHARD2 && type != defs::MYTHEN3) {
throw sls::RuntimeError("Not implemented for this detector."); throw sls::RuntimeError("Not implemented for this detector.");
} }
if (action == defs::GET_ACTION) { if (action == defs::GET_ACTION) {
@ -480,7 +480,7 @@ std::string CmdProxy::MaxClockPhaseShift(int action) {
os << "[n_clock (0-8)]\n\t[Gotthard2][Mythen3] Absolute Maximum Phase shift of clock n_clock." << '\n'; os << "[n_clock (0-8)]\n\t[Gotthard2][Mythen3] Absolute Maximum Phase shift of clock n_clock." << '\n';
} else { } else {
defs::detectorType type = det->getDetectorType().squash(defs::GENERIC); defs::detectorType type = det->getDetectorType().squash(defs::GENERIC);
if (type != defs::GOTTHARD2 && type != MYTHEN3) { if (type != defs::GOTTHARD2 && type != defs::MYTHEN3) {
throw sls::RuntimeError("Not implemented for this detector."); throw sls::RuntimeError("Not implemented for this detector.");
} }
if (action == defs::GET_ACTION) { if (action == defs::GET_ACTION) {
@ -505,7 +505,7 @@ std::string CmdProxy::ClockDivider(int action) {
os << "[n_clock (0-8)] [n_divider]\n\t[Gotthard2][Mythen3] Clock Divider of clock n_clock. Must be greater than 1." << '\n'; os << "[n_clock (0-8)] [n_divider]\n\t[Gotthard2][Mythen3] Clock Divider of clock n_clock. Must be greater than 1." << '\n';
} else { } else {
defs::detectorType type = det->getDetectorType().squash(defs::GENERIC); defs::detectorType type = det->getDetectorType().squash(defs::GENERIC);
if (type != defs::GOTTHARD2 && type != MYTHEN3) { if (type != defs::GOTTHARD2 && type != defs::MYTHEN3) {
throw sls::RuntimeError("Not implemented for this detector."); throw sls::RuntimeError("Not implemented for this detector.");
} }
if (action == defs::GET_ACTION) { if (action == defs::GET_ACTION) {

4
slsSupportLib/include/versionAPI.h
View File

@ -4,9 +4,9 @@
#define APIRECEIVER 0x190722 #define APIRECEIVER 0x190722
#define APIGUI 0x190723 #define APIGUI 0x190723
#define APIMOENCH 0x190820 #define APIMOENCH 0x190820
#define APIJUNGFRAU 0x191106
#define APIEIGER 0x191106
#define APIGOTTHARD 0x191106 #define APIGOTTHARD 0x191106
#define APICTB 0x191106 #define APICTB 0x191106
#define APIGOTTHARD2 0x191106 #define APIGOTTHARD2 0x191106
#define APIMYTHEN3 0x191106 #define APIMYTHEN3 0x191106
#define APIJUNGFRAU 0x191106
#define APIEIGER 0x191106