From e571f7bb3efd22de204357cdf7335f64d26ffe6c Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Wed, 1 Jul 2020 09:10:49 +0200 Subject: [PATCH] WIP --- .../bin/ctbDetectorServer_developer | Bin 243172 -> 243172 bytes .../bin/eigerDetectorServer_developer | Bin 356223 -> 356223 bytes .../bin/gotthard2DetectorServer_developer | Bin 184104 -> 184104 bytes .../bin/gotthardDetectorServer_developer | Bin 199100 -> 199100 bytes .../bin/jungfrauDetectorServer_developer | Bin 214548 -> 214548 bytes .../bin/moenchDetectorServer_developer | Bin 238128 -> 238128 bytes .../bin/mythen3DetectorServer_developer | Bin 177952 -> 177952 bytes .../slsDetectorServer/src/sharedMemory.c | 6 ------ slsSupportLib/include/versionAPI.h | 14 +++++++------- 9 files changed, 7 insertions(+), 13 deletions(-) diff --git a/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer index fe40c00f20bb7a3202c6ff8b2bc8716fcbaa9be9..90d4a39e46ceb2b014f934151781052fa8e5781a 100755 GIT binary patch delta 65 zcmaFzn(xVLz6qMlf6U%Yzj%pBVx!9pPBBLI6<&-9j4v1%1Q>t-NGm*KWZ(RWlgEjP Tk-f>M&4;nghiRJ+^OH;fB^(u} delta 65 zcmaFzn(xVLz6qMlzr!S_U%bR5vC(A)r0t`R^q!k_-uxYRi Tz}Do`=EKtIG4u96?JUjD E0nuq0ivR!s diff --git a/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer b/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer index 2c9856b3516cd0eefab553e63b462ee24c62a551..9e11892d3c7b1d771c7274d0a371b9f251ccb4b5 100755 GIT binary patch delta 3732 zcma);e^69a6vyB9fg~`9-N!qVXKkGNW9RIC?s<3L{oH%* zz3awpM?d=gB@EL$ zC%Dhmrc&lCVYOB#S1iF|F5o{5&fr1q?>n~UdvjoA) zn8gX^vDlQLC;=-tv6oRl0~fmp96?v*|PRGW-C9(&Z1- z6E^BeD)gjuGepufGxVmVW{9S(W{4%P8RAI)P=!8}Vul17YleRGh8dEn(hLKr&I|*o z!wiFs=#MZ!kGjQkdQqtItJYPjk+%|QLAPzcpSFC0496{x+pq0y`=^Uh6ul8nN~}cR z+jjE=O{>J1_*=XA-PdNnF1mWgXsX0qU=BU92Fvj#dDp;&MKtMC6-vl!1`kbItHNsX znqd=7TBm|RUNh{YN$ZvRBUHW~#b~CKDhx*}JF_T3c!%P-&A7-+M6Pd{(PGKgCc(BFt{EB!eC(0ro#!MD*CNo*YBbmt} z9!=TR%Fkm)do|_;VlmCEQJyAKT@40fI(3?1CZ%l0Va%qE?Wo3URJj8gaM9Tv_{p`5 z`;-h&h6kndzBhuoW) z9I}I%9P(Y!)~23Bp51r|Y4q)G9K=XkyGIqoXsX+zcA|%=V-Hf1L;dz*wQC~xB6Z|3 zlR9QFlREO5NgXdTlR92yCUv}SF@GHkI8o|Y$V}=eVkUJgV!uG_N(n=o$XN8Uk?x>$tS?0@nxe~7#XRV6i2W-Z3SODk%Xxfa@GhF1Ev7HPOd z(O)Tnm-&CCz^lxp!0XJUz(1KufrzozjuaTgObQIOn7=?9CrW`4%%s3*W>TP&nH1PJ z##&FwM*3m3m0%dUDC z<7H;j$6RL8$9#+V`*?>FrH@6-q>o}|(nkq1>7&f@5#q^BR!5Gu@5?wEvr}CSnvWwE z8>r(r)?q7o8n6)CD6Ub3160|lYOjtCHNtQ;aGz4nNoG<`3o|L_JToch0y8P+GBYXX zipBip{K|<^&L7OAoEyxfoPbzsl}b6?W39y!Mx9@)`f$*YCS(LBuDZADRPIl6nlSF4 zp983=2|0;_p0X}tgH?a=0b0aPb)KtF+?|@uuCAb6*U=2hKA~z+opmSFO{@8YT6E(n z`y`y0Km{k&)qXNHoWv}3-laDq2G7xiW_5RYff}0CdYnzyn$^q9p+VoMi{4ulc}o3S zM%kxO?JDI#$l35Ple6&&GdUY;naSDM$V|@0XUybmY`2*IZ0zDhIU9SK$=Rr7CTHU) zGdUX#JR2wIjnkMF_1&tQo89-T)Mm%`&I@$oG*ZL-nkmx@J1)}%FIM6Tb$HbRzDAKP z>O={mycTtp3#alHEJg(NYgI>UtO?WTuU3peU&=hA3=cIE;;8ftW+2^cj-fMW(N`bg zAm3@VH2R#w15|bvcVm=jee`DQOBgE}CRz=~)pMxN4R~e7t5lJpM;c#e=&1=t_bK{R j2j&^i&)0o0;{v_-F;#!R9n+oN=DntC^Ngr^Jv`uVTBs1A delta 3727 zcma);e^69a6vyB9v5=gbtIX#+bQ{Vj?hM zE_y-@3xAzd*SR9}~5IgBg^rjNx9+LnnvbZZWt(r-_2 zov%%xlv$W+)V_tw{_r-oEy8IV0%`FQIDLaDC@I%BD96tgf7VXRpFlVb&Os4+8ud8{ z^FoZ#vJ5VuFLlXBENxwm;TS+I%aMU0l$wWReOMZ;pN@gFCl4=TqSvhd>4k@-*l)53BEVe`gLTp&Cplj3gAaSuU1b4 zQdd&pVM;PXFikUqo$|~OLX~C+BexkMNdH&`2gRA87mYPTZ(3l6zEo<4I67j6{?uxQ zcq6nJkLn@!c}~jpSANyH8fZ*ii$tFXwkOgTpCLKozQ^r1_ch-gVg!Y5S8vq26fqAR zW*ki`#h9r3hq=|>Z2v6=w3CAS&2 zQ~DMac9Gi*`zXCksjs7wGUVeF#cjn9G*aePIQ7dD&6Tuk8-NGC<~2i2Wem_pnV(}l ze8{gH)8R{5<%o{*d!?VfZAh~g>!sQ5?7LuZb1DbELHmQf)bdqJ)t4$&H*}`&%dyrO z5c2OL?#4_OaVRrc#13Y%h+~+^BJRgb7ID1Arg{`{0(X=}{3J73#Dkg1A|A?27V#)b ztx$fRH(Dz2jtw8s>s89rWI9rX0hmU2%rJxEcA^fmsdXnRFqcYqAsLJ4+%8;m7VwyI zhg-=^$|+_h<&-d!ayBrNa>|%VIpr4flvBwar5uBql=BrcDW`^+lyk_EbCgC_D@TpS zkJU)jomaT0obq*Ma>~CmlT*IUOisCtnVhm$sI}(glsj3>b5jrCj&jOfnaL^JnaL@K zGm}$}3bi)%KD1^JMqvR1zGbu1S z%vw)UDC zV-7RvV?HzK<6Vn+`gor^N*_y^NgsL4q>n;o(npcy!>@Q!KXv42`@f8&G1UmAhGPiF zR%$(lE!aV8j$;WbDe{C0HB@>+)!tz`bOMI+7>_CCoMa~DxS2^g=b1@4mzYU8SD8sU zEf({X^BZ@Ra&9q`a{gu}<>=woDwT2`3bz(ZXS(y9s*i9QSdV1in01eLoXW8@zaHc6 z{*0sgdZhJ!Y_fF`i&x`Cd1=Ab>O5DU$ZlGYU0p#tuA@nmdQ#P*I_pj%ni@{3MfWnL zo`M78DeIKF+E1qAr!Y&McS#Kh!%UjcpzbcS=y-!#kF)7!gL;{H6#u=t=q;okr`4|l zNzi$!u(6CbLn&OlG6XVxHNk=8iHOdzr~>9AGB1@eMPX zjbogRdRlM>vqCPeySLf>uug4ueDAzOZD)`W;L%JeZrE{^Cb+Q{E!65(3-|{0XjCVP zH%)C+SGg`!(uif~PJPa*qczNgiS+kbJgpLx(xeP0m>nXis0lOhl-V3cP3I7!4~d}m zGwSx-^E?LAs&nX%5u)|Ed#!Wul4wY?8jN4hBS`gm!K4c delta 65 zcmdlpnP<;ro(Y=FzxkF=XN+Ky*yv)wA!fj~!izD1@dX2e00R&JX@!RdY@53{JoK0h T*qX1HwO=t~+BS`gj?)yN diff --git a/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer index 20e2bc15268f5db707cbcd3e013416e2c539bd05..c2527a9b166ac4d7d84a03d0b1241738e6e958e9 100755 GIT binary patch delta 69 zcmbQz!#kyicY-GKAG3GU1>2Y;HoAOZ7h_~!;l-H1_=15!fB^`Aw8BG1_RU@#9fnMd V?9Ep!+pkzM0x{F}E0)X-JOBex62Y;HoAOZ7c*d6;l-H1_=15!fB^`Aw8BFJw#{A~9fnK> VY|U3J+pkzM0x{F}E0)X-JOKLT6?gyu diff --git a/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer b/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer index ab58d6b9498ef44e423735559f7259fb21b92d9d..39d03f89781852781dcd9e91c07c8ae9d3d32935 100755 GIT binary patch delta 69 zcmdmRgm1$Uz6qMlf6P8iFWk>0vC*Z2Q;d;)g%@K2;|m4`0R|ud(h3h5**8DpJYm7a W$lkohseO$TBM>ufU*p8w5)S}PVHY+4 delta 69 zcmdmRgm1$Uz6qMlzrz%!7w%`0*yz&1DQ3X7!izD1@dX2e00R&JX@!RdY?~i(p0Hpt WU~69E)V{`v5r~<#uW@2-i3b2S9v2S) diff --git a/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer b/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer index 4ceccdadb0bbf4199cc20314cdca6875af985995..cd9521aea2e751a4f92e8afa149447509c908f43 100755 GIT binary patch delta 36 rcmZ4Rj%&d?t_?@zm|PA_{wJqC`K=s3klFlCuKk}J // errno -#include // O_CREAT, O_TRUNC.. #include -#include // shared memory -#include // fstat -#include - #include #include -#include #define SHM_NAME "sls_server_shared_memory" #define SHM_VERSION 0x200625 diff --git a/slsSupportLib/include/versionAPI.h b/slsSupportLib/include/versionAPI.h index 907f0765e..1e6663839 100644 --- a/slsSupportLib/include/versionAPI.h +++ b/slsSupportLib/include/versionAPI.h @@ -3,10 +3,10 @@ #define APILIB 0x200409 #define APIRECEIVER 0x200409 #define APIGUI 0x200409 -#define APIGOTTHARD 0x200630 -#define APIGOTTHARD2 0x200630 -#define APIJUNGFRAU 0x200630 -#define APIMYTHEN3 0x200630 -#define APICTB 0x200630 -#define APIMOENCH 0x200630 -#define APIEIGER 0x200630 +#define APICTB 0x200701 +#define APIGOTTHARD 0x200701 +#define APIGOTTHARD2 0x200701 +#define APIJUNGFRAU 0x200701 +#define APIMYTHEN3 0x200701 +#define APIMOENCH 0x200701 +#define APIEIGER 0x200701