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

mythen3: settings file of dac -1 fix

Browse Source
This commit is contained in:
maliakal_d
2020-05-08 11:15:27 +02:00
parent 01d1c86403
commit ec2f7db729
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c
View File

@ -545,13 +545,17 @@ int setModule(sls_detector_module myMod, char *mess) {
// dacs // dacs
for (int i = 0; i < NDAC; ++i) { for (int i = 0; i < NDAC; ++i) {
setDAC((enum DACINDEX)i, myMod.dacs[i], 0); // ignore dacs with -1
if (myMod.dacs[i] != detectorDacs[i]) { if (myMod.dacs[i] != -1) {
sprintf(mess, "Could not set module. Could not set dac %d\n", i); setDAC((enum DACINDEX)i, myMod.dacs[i], 0);
LOG(logERROR, (mess)); if (myMod.dacs[i] != detectorDacs[i]) {
// setSettings(UNDEFINED); sprintf(mess, "Could not set module. Could not set dac %d\n",
// LOG(logERROR, ("Settings has been changed to undefined\n")); i);
return FAIL; LOG(logERROR, (mess));
// setSettings(UNDEFINED);
// LOG(logERROR, ("Settings has been changed to undefined\n"));
return FAIL;
}
} }
} }
@ -604,7 +608,7 @@ int setTrimbits(int *trimbits) {
uint64_t patword = 0; uint64_t patword = 0;
int iaddr = 0; int iaddr = 0;
for (int ichip = 0; ichip < NCHIP; ichip++) { for (int ichip = 0; ichip < NCHIP; ichip++) {
LOG(logINFOBLUE, (" Chip %d\n", ichip)); LOG(logDEBUG1, (" Chip %d\n", ichip));
iaddr = 0; iaddr = 0;
patword = 0; patword = 0;
writePatternWord(iaddr++, patword); writePatternWord(iaddr++, patword);
@ -643,7 +647,7 @@ int setTrimbits(int *trimbits) {
// for each channel (all chips) // for each channel (all chips)
for (int ich = 0; ich < NCHAN_1_COUNTER; ich++) { for (int ich = 0; ich < NCHAN_1_COUNTER; ich++) {
// LOG(logINFOBLUE, (" Chip %d, Channel %d\n", ichip, ich)); LOG(logDEBUG1, (" Chip %d, Channel %d\n", ichip, ich));
int val = trimbits[ichip * NCHAN_1_COUNTER * NCOUNTERS + int val = trimbits[ichip * NCHAN_1_COUNTER * NCOUNTERS +
NCOUNTERS * ich] + NCOUNTERS * ich] +
trimbits[ichip * NCHAN_1_COUNTER * NCOUNTERS + trimbits[ichip * NCHAN_1_COUNTER * NCOUNTERS +
@ -724,6 +728,7 @@ int setTrimbits(int *trimbits) {
detectorChans[ichan] = trimbits[ichan]; detectorChans[ichan] = trimbits[ichan];
} }
trimmingPrint = logINFO; trimmingPrint = logINFO;
LOG(logINFO, ("All trimbits have been loaded\n"));
return OK; return OK;
} }