mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2026-01-17 18:53:44 +01:00
jungfrau: special dacs have defined values for settings. getsettings give undefined if different values for special dacs
This commit is contained in:
@@ -294,7 +294,7 @@ int getAllTrimbits();
|
||||
#ifndef CHIPTESTBOARDD
|
||||
enum detectorSettings setSettings(enum detectorSettings sett);
|
||||
#endif
|
||||
#ifdef MYTHEN3D
|
||||
#if defined(MYTHEN3D) || defined(JUNGFRAUD)
|
||||
void validateSettings();
|
||||
#endif
|
||||
enum detectorSettings getSettings();
|
||||
|
||||
@@ -1687,7 +1687,8 @@ int acquire(int blocking, int file_des) {
|
||||
// only set
|
||||
if (Server_VerifyLock() == OK) {
|
||||
#ifdef JUNGFRAUD
|
||||
if (!isChipConfigured()) {
|
||||
// chipv1.1 has to be configured before acquisition
|
||||
if (getChipVersion() == 11 && !isChipConfigured()) {
|
||||
ret = FAIL;
|
||||
strcpy(mess,
|
||||
"Could not start acquisition. Chip is not configured.\n");
|
||||
|
||||
Reference in New Issue
Block a user