From e19a27bf62e9f19408c273ab8228c87b16511649 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Tue, 22 May 2018 10:59:04 +0200 Subject: [PATCH] eiger server: bug fix for saving trimbits to file, was copying from destination to source in server --- .../bin/eigerDetectorServer_developer | Bin 297671 -> 297671 bytes .../slsDetectorFunctionList.c | 31 +++++++++++------- .../slsDetector/slsDetector.cpp | 4 ++- 3 files changed, 23 insertions(+), 12 deletions(-) diff --git a/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer_developer b/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer_developer index b98c544462d6ce6667e82a68298215f8ec2241ac..3bc7e6f2786e13f946bf1b163504111f64d555af 100755 GIT binary patch delta 23361 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 delta 23387 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 + } //trimbits unsigned int* tt; @@ -620,9 +626,11 @@ int getModule(sls_detector_module *myMod){ } } - //copy to local copy as well - if (detectorModules) - copyModule(detectorModules,myMod); + //copy local module to myMod + if (detectorModules) { + if (copyModule(myMod, detectorModules) == FAIL) + return FAIL; + } else return FAIL; return OK; @@ -1309,8 +1317,9 @@ int copyModule(sls_detector_module *destMod, sls_detector_module *srcMod){ else printf("Not Copying trimbits\n"); #endif for (idac=0; idac<(srcMod->ndac); idac++) { - if (*((srcMod->dacs)+idac)>=0) + if (*((srcMod->dacs)+idac)>=0) { *((destMod->dacs)+idac)=*((srcMod->dacs)+idac); + } } for (iadc=0; iadc<(srcMod->nadc); iadc++) { if (*((srcMod->adcs)+iadc)>=0) diff --git a/slsDetectorSoftware/slsDetector/slsDetector.cpp b/slsDetectorSoftware/slsDetector/slsDetector.cpp index faa1a38bc..d61c605ce 100644 --- a/slsDetectorSoftware/slsDetector/slsDetector.cpp +++ b/slsDetectorSoftware/slsDetector/slsDetector.cpp @@ -3460,8 +3460,10 @@ slsDetectorDefs::sls_detector_module *slsDetector::getModule(int imod){ } if (dacs) { - for (int i=0; inDacs; ++i) + for (int i=0; inDacs; ++i) { dacs[i+imod*thisDetector->nDacs]=myMod->dacs[i]; + //cprintf(BLUE,"dac%d:%d\n",i, myMod->dacs[i]); + } } (detectorModules+imod)->gain=myMod->gain; (detectorModules+imod)->offset=myMod->offset;