From 40210ae26f9067e40fb76108e8e17d7147117b41 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Wed, 14 Mar 2018 17:20:26 +0100 Subject: [PATCH] jungfrauserver adcphase fix: bug was if adcphase was same as previous value, it still shifted --- .../bin/jungfrauDetectorServer_developer | Bin 110884 -> 110892 bytes .../slsDetectorFunctionList.c | 8 +++++--- .../slsDetector/slsDetectorCommand.cpp | 4 +--- .../slsDetectorServer_funcs.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer b/slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer index b77199c10404c6ecaf1e9cfd59d33fdd2b0a00cf..7fed40ec485cd66fe40ea799c985938ea418956a 100755 GIT binary patch delta 26954 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 delta 26882 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 65535 || st < -65535) return clkPhase[0]; - clkPhase[1] = st - clkPhase[0]; - printf(" phase %d\n", clkPhase[1] ); + clkPhase[1] = st - clkPhase[0]; + if (clkPhase[1] == 0) + return clkPhase[0]; + configurePll(); clkPhase[0] = st; return clkPhase[0]; @@ -1249,7 +1251,7 @@ void configurePll() { u_int32_t val; int32_t phase=0, inv=0; - printf(" phase in %d\n", clkPhase[1]); + printf("Configuring PLL with phase in %d\n", clkPhase[1]); if (clkPhase[1]>0) { inv=0; phase=clkPhase[1]; diff --git a/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp b/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp index e5fe9c137..f99f69747 100644 --- a/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp +++ b/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp @@ -5829,9 +5829,7 @@ string slsDetectorCommand::cmdSpeed(int narg, char *args[], int action) { return string("cannot scan speed value ")+string(args[1]); } - // -1 could work - else if (cmd=="adcphase") - t = 65536; + myDet->setOnline(ONLINE_FLAG); diff --git a/slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c b/slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c index 4da1ae734..5dca4b587 100755 --- a/slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c +++ b/slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c @@ -3167,7 +3167,7 @@ int set_speed(int file_des) { #ifdef JUNGFRAUD case ADC_PHASE: retval = adcPhase(val); - if ((val != 65536) && (retval!=val) && (val>=0)) { + if ((val != 100000) && (retval!=val) && (val>=0)) { ret=FAIL; sprintf(mess,"could not change set adc phase: should be %d but is %d \n", val, retval); cprintf(RED, "Warning: %s", mess);