From 3aaca5296f5409f7449e0899f6a6413f67595ec3 Mon Sep 17 00:00:00 2001 From: l_maliakal_d Date: Fri, 21 Jun 2013 14:26:51 +0000 Subject: [PATCH] eiger:fixed module to be 1 and getmodule saves dacs to variables in server for now git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@625 951219d9-93cf-4727-9268-0efd64621fa3 --- .../bin/eigerDetectorServer | Bin 64689 -> 64693 bytes .../slsDetectorFunctionList.c | 10 +++++++--- .../eigerDetectorServer/svnInfoEiger.h | 6 +++--- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer b/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer index 2a00b4ab09d9024c2625be732238ebe8a8ec7411..a0e5f2ab8a8481a97d0a90ea2ccb349b6c4992f4 100755 GIT binary patch delta 10593 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 m<0BUanD$+^M`#)TnknAND`i56Ub6 delta 11533 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ЭlE+nHK3byIKU6?$A2BZ%HT!R{8ffC5P_8^X{+IhGVsd43s|qR4N%!2O$gYk zvLA;4mMRDAR@u|l;IEbapFyx)?zbS|=PFy|f_$laz?&*NR11C?$N}vtQ{L#IqCaJf zD1q25x|qOtr~wl^Y6NBiZlPvyiOy>z*IK-5AHetomcd=Byj4(($4}YptMVY*gjtG1l=Oxr&LzojsfMO8+-sBuu|1G_oFJl`b|b?7I>vMgYQt; z_6|z?bA}UBt+;dv!FQ`{ZU;2nBVjDd1KH>$O$>fOWg#iZ3I<7Ej%98EU1}7JbT!6? znD+2*_MNlf$5ehf9sDjm6$U?n?P6OuRPK=i-6{*mq$zR|f|0*ouR{k9{DR76hV=V9 z_%#gB0J@yi;8S?lK9Gk`@UK*M@LS6IOU81cW}-ey2xhXn3R3J64uh1dpi3zs!{NAE qz;e_O%p^{2OevN8b5!ndac;i++) + myMod->dacs[i]= dacvalues[i]; + //template getModulebyNumber() from mcb_funcs.c - return FAIL; + return OK; } int getThresholdEnergy(int imod){ diff --git a/slsDetectorSoftware/eigerDetectorServer/svnInfoEiger.h b/slsDetectorSoftware/eigerDetectorServer/svnInfoEiger.h index 22ced92ae..944f9f1e0 100644 --- a/slsDetectorSoftware/eigerDetectorServer/svnInfoEiger.h +++ b/slsDetectorSoftware/eigerDetectorServer/svnInfoEiger.h @@ -2,10 +2,10 @@ #define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware/eigerDetectorServer" //#define SVNREPPATH "" #define SVNREPUUID "951219d9-93cf-4727-9268-0efd64621fa3" -//#define SVNREV 0x616 +//#define SVNREV 0x621 //#define SVNKIND "" //#define SVNSCHED "" #define SVNAUTH "l_maliakal_d" -#define SVNREV 0x616 -#define SVNDATE 0x20130619 +#define SVNREV 0x621 +#define SVNDATE 0x20130620 //