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

eiger bug fix: multi hv and eiger should not return -1 if different, ctb : dacs are 24 not 16

Browse Source
This commit is contained in:
maliakal_d 2019-02-06 17:07:13 +01:00
parent 076faa62e0
commit 0c1a3b7756
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -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");

5
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -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;
}
}