From 2b3d2bb4d7eab8f1a1aa15dffbca109afbf4fd60 Mon Sep 17 00:00:00 2001 From: Dhanya Maliakal Date: Thu, 21 Sep 2017 16:36:33 +0200 Subject: [PATCH] removed changing number of samples by setting dynamic range --- .../jctbDetectorServer/firmware_funcs.c | 2 -- .../jctbDetectorServer/gitInfo.txt | 8 ++++---- .../jctbDetectorServer/gitInfoMoench.h | 8 ++++---- .../jungfrauDetectorServerTest | Bin 118796 -> 118716 bytes 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/slsDetectorSoftware/jctbDetectorServer/firmware_funcs.c b/slsDetectorSoftware/jctbDetectorServer/firmware_funcs.c index 528515fa6..66843d3dc 100755 --- a/slsDetectorSoftware/jctbDetectorServer/firmware_funcs.c +++ b/slsDetectorSoftware/jctbDetectorServer/firmware_funcs.c @@ -2309,8 +2309,6 @@ u_int32_t* decode_data(int *datain) int setDynamicRange(int dr) { if (dr%16==0 && dr>0) { dynamicRange=16; - nSamples=dr/16; - bus_w(NSAMPLES_REG,nSamples); } getDynamicRange(); allocateRAM(); diff --git a/slsDetectorSoftware/jctbDetectorServer/gitInfo.txt b/slsDetectorSoftware/jctbDetectorServer/gitInfo.txt index 71571fdc3..cab8f9b7e 100644 --- a/slsDetectorSoftware/jctbDetectorServer/gitInfo.txt +++ b/slsDetectorSoftware/jctbDetectorServer/gitInfo.txt @@ -1,9 +1,9 @@ Path: slsDetectorsPackage/slsDetectorSoftware/jctbDetectorServer URL: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git -Repsitory UUID: a45cc31a576153e251cfe904b3b459c7a2a9abdb -Revision: 9 +Repsitory UUID: 2ed351b29db70212973e15b26f604a0a7fef6fcc +Revision: 14 Branch: developer Last Changed Author: Dhanya_Maliakal -Last Changed Rev: 1553 -Last Changed Date: 2017-09-07 11:20:19.000000002 +0200 ./server_funcs.c +Last Changed Rev: 1582 +Last Changed Date: 2017-09-21 16:35:15.000000002 +0200 ./firmware_funcs.c diff --git a/slsDetectorSoftware/jctbDetectorServer/gitInfoMoench.h b/slsDetectorSoftware/jctbDetectorServer/gitInfoMoench.h index 004265b6b..f9d5ebc89 100644 --- a/slsDetectorSoftware/jctbDetectorServer/gitInfoMoench.h +++ b/slsDetectorSoftware/jctbDetectorServer/gitInfoMoench.h @@ -1,11 +1,11 @@ //#define SVNPATH "" #define SVNURL "git@git.psi.ch:sls_detectors_software/sls_detector_software.git" //#define SVNREPPATH "" -#define SVNREPUUID "a45cc31a576153e251cfe904b3b459c7a2a9abdb" -//#define SVNREV 0x1553 +#define SVNREPUUID "2ed351b29db70212973e15b26f604a0a7fef6fcc" +//#define SVNREV 0x1582 //#define SVNKIND "" //#define SVNSCHED "" #define SVNAUTH "Dhanya_Maliakal" -#define SVNREV 0x1553 -#define SVNDATE 0x20170907 +#define SVNREV 0x1582 +#define SVNDATE 0x20170921 // diff --git a/slsDetectorSoftware/jctbDetectorServer/jungfrauDetectorServerTest b/slsDetectorSoftware/jctbDetectorServer/jungfrauDetectorServerTest index ea64c10b9d94873da957e5ac0ab1d501598fbf8c..6ad6ee1be4cad429cb1fbd946cf156252654779c 100755 GIT binary patch delta 35456 zcmb`wdqC7x`uKm|FoOf44vI1e>L4g6UPi^lJKm905K+M^DkdeG6&0E_=ytKvgx)G@ zreoQzl__3IMyx2^@>6b0t=q?K+g;whjkR)HEGsgL@9WIWn;9>;`}=->e>^B^R3#Ir&|KHZQ^{e5aGS7lQe5t zIFP1AmI)xoF0E>1adWy3($*JhUO2hf1v3Hd!2jjJJz+0E=!iRzqNdnW*w^lLjUt4BD~Kvb=bxt z9chzSTJlpVeU{Ref~(69qx`UrWO@|_CacJAsBURb(iZXL5ZPT$+Q*fX?0gn z`$1k|XF9qr5qctm%I54LKcF|2c&mECF7jQ~Ix!D?P`r-9ZjVVZSI zjoYf$xP|^dy^zM1rmY}9pg&vk<07fHB)ibx4Yt}d$V-0p<>2@zZ%J#p&@=m_X{D3^ z^n2CMgS+&8a=s-zj8?5D7SQL?DxqgQp1NCvPlf*;;`fXjy!*0C=o{63rY>=D`GOoN z`4`=a!zpB~qSHsq?iOi|7Y(130!2}Sdb zP>nv`BTFRLOY>`{)K%BHt>G4%=8g^@YNH#&V{KDuPpldSq~=>y%ym5GI({%E;!85L ztPNp68YvlCF5%n_f^bfA8JUu%rHmI&{*0nf=&u%%jelvKQCYgDU=fuSjh{%$zwS3G zs|lzqiE!uU%4F5DDI4dneJAZVsGHJ&{zu9>Z!D=%T|{}Bwu9_|UUh$?ON0m8g#P;h zX_|ez07hv?#w)F^kZi*YFjfDcB8lkeF0H}*l1yBIgmr$#r z04N=5D-;0rDbx`t0P4?BXQ2S758_5SwR4aFiISWMX@dfwMnfe*0Z>Ds z(x3pS6sTM%0ID}s5flK`9jX)xfa(HO1_eObp!PrkP!UkaCpu|`hYW)}O(H;IFw|Kn z0P2dJRzLwz-$7l10-(NzvScU{p#BLJ3k5*cK_x)}P=A3+fdZgDf=bU&obnIk`;fUL z0#GNR3ZVd~*P%+G0I1iX)Cx0N< zLyBAR^0!Lr5hxoJ0QC@*0}6n;A8ITV0JQ=t7Ycy79jXWlfLaK(8VZ1#4OIpOK;=NW zpj=K5IT^AF5+HFr)F~(cY9!RBPykdaR09+M)ep)t3FS|cR8J@y6aW