From 0c1a3b7756c84000625a1a73227362f78df674cd Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Wed, 6 Feb 2019 17:07:13 +0100 Subject: [PATCH] eiger bug fix: multi hv and eiger should not return -1 if different, ctb : dacs are 24 not 16 --- .../multiSlsDetector/multiSlsDetector.cpp | 11 +++++++++-- slsDetectorSoftware/slsDetector/slsDetector.cpp | 5 ++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp index fcfa95de1..c63e41f32 100644 --- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp +++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp @@ -1453,7 +1453,7 @@ int multiSlsDetector::setDAC(int val, dacIndex index, int mV, int detPos) { // multi auto r = parallelCall(&slsDetector::setDAC, val, index, mV); - if (getDetectorTypeAsEnum() != EIGER || index != HIGH_VOLTAGE) { + if (getDetectorTypeAsEnum() != EIGER && index != HIGH_VOLTAGE) { return sls::minusOneIfDifferent(r); } @@ -3642,8 +3642,15 @@ int multiSlsDetector::dumpDetectorSetup(const std::string &fname, int level) { names.emplace_back("dac:13"); names.emplace_back("dac:14"); names.emplace_back("dac:15"); + names.emplace_back("dac:16"); + names.emplace_back("dac:17"); + names.emplace_back("dac:18"); + names.emplace_back("dac:19"); + names.emplace_back("dac:20"); + names.emplace_back("dac:21"); + names.emplace_back("dac:22"); + names.emplace_back("dac:23"); names.emplace_back("adcvpp"); - names.emplace_back("adcclk"); names.emplace_back("clkdivider"); names.emplace_back("adcphase"); diff --git a/slsDetectorSoftware/slsDetector/slsDetector.cpp b/slsDetectorSoftware/slsDetector/slsDetector.cpp index d9c16b7e4..3cda23298 100644 --- a/slsDetectorSoftware/slsDetector/slsDetector.cpp +++ b/slsDetectorSoftware/slsDetector/slsDetector.cpp @@ -291,7 +291,7 @@ void slsDetector::setDetectorSpecificParameters(detectorType type, detParameterL list.nChanY = 1; list.nChipX = 1; list.nChipY = 1; - list.nDacs = 16; + list.nDacs = 24; list.dynamicRange = 16; list.nGappixelsX = 0; list.nGappixelsY = 0; @@ -1163,7 +1163,6 @@ int slsDetector::writeConfigurationFile(std::ofstream &outfile, multiSlsDetector names.emplace_back("vhighvoltage"); break; case CHIPTESTBOARD: - names.emplace_back("powerchip"); names.emplace_back("vhighvoltage"); break; default: @@ -5184,4 +5183,4 @@ int slsDetector::writeSettingsFile(const std::string &fname, sls_detector_module outfile.close(); return OK; -} \ No newline at end of file +}