From b11b7c1c0999c472e60d02e35db713e7517958c3 Mon Sep 17 00:00:00 2001 From: Dhanya Maliakal Date: Fri, 12 Jun 2015 17:45:43 +0200 Subject: [PATCH] beb stop acquisiion return, some minor changes, increased the check time for receiver frame after detector read out done using acquisiingDone variable --- slsDetectorSoftware/eigerDetectorServer/Beb.c | 4 ++-- .../eigerDetectorServer/Makefile | 2 +- .../bin/eigerDetectorServer | Bin 242164 -> 242164 bytes .../slsDetectorFunctionList.c | 3 ++- .../slsDetectorAnalysis/postProcessing.cpp | 2 +- .../slsDetectorServer_funcs.c | 4 ++-- 6 files changed, 8 insertions(+), 7 deletions(-) diff --git a/slsDetectorSoftware/eigerDetectorServer/Beb.c b/slsDetectorSoftware/eigerDetectorServer/Beb.c index 1174392b6..77408c82f 100644 --- a/slsDetectorSoftware/eigerDetectorServer/Beb.c +++ b/slsDetectorSoftware/eigerDetectorServer/Beb.c @@ -568,6 +568,7 @@ int Beb_StopAcquisition() *(ptrl+7) = 0; *(ptrr+7) = 0; close(fd); + return 1; } int Beb_RequestNImages(unsigned int beb_number, int ten_gig, unsigned int dst_number, unsigned int nimages, int test_just_send_out_packets_no_wait){ @@ -637,9 +638,8 @@ int Beb_RequestNImages(unsigned int beb_number, int ten_gig, unsigned int dst_nu ptrl = (u_int32_t*)(CSP0BASE); ptrr = (u_int32_t*)(CSP0BASE+0x100); - int i; - #ifdef MARTIN + int i; for (i=0; i < 10; i++) printf("%X\n",*(ptrl+i)); #endif diff --git a/slsDetectorSoftware/eigerDetectorServer/Makefile b/slsDetectorSoftware/eigerDetectorServer/Makefile index effb17e9c..462930bac 100755 --- a/slsDetectorSoftware/eigerDetectorServer/Makefile +++ b/slsDetectorSoftware/eigerDetectorServer/Makefile @@ -1,6 +1,6 @@ CC = powerpc-4xx-softfloat-gcc CCX = powerpc-4xx-softfloat-g++ -CFLAGS += -Wall -DDACS_INT -DMARTIN -DEIGERD -DSLS_DETECTOR_FUNCTION_LIST -DDACS_INT -DSTOP_SERVER #-DVERBOSE #-DVIRTUAL -DPCCOMPILE -DMARTIN +CFLAGS += -Wall -DDACS_INT -DEIGERD -DSLS_DETECTOR_FUNCTION_LIST -DDACS_INT -DSTOP_SERVER #-DVERBOSE #-DVIRTUAL -DPCCOMPILE -DMARTIN LDLIBS += -lm -lstdc++ PROGS = eigerDetectorServer diff --git a/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer b/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer index 249c97ce420554a1dc58f5fd4af30d4a17d03ecd..c4d92e50ac408e73bed8f69d08effb84badc191b 100755 GIT binary patch delta 23813 zcmb_^e_T{W_y3()Tmca;iu_z)`Jwz&7k`4HqLQwPg@%TPxtb*!8m1N ~@lSm>C8 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 EKhH~DAOHXW delta 25011 zcmb`v4Omsh_CLO74jcgyH;90MaCk>WJ@^WWii)~bQZy_z)T5zdqGDp9fgDOp4GSH0 zv{13kmr}#fjusXbmKApOUb!S!>PS8(RP6)A}!;vS*DwYbDyVc5~@cuecnUYFCvTdB{MU{j0Lv{xH(U7&g6Q zKice8RoZb2q0K?e)ahy5s`hpA188O^ea6z}w6{9<1eD1VWYFeRS>#}VR#xcShc@qE zhkZvC|CCecN&O2u8VX8!Nm7a=Q?sPwJPrFNS=~%3&eB|`7@~SBlGLcfjexrYKCi<~ zfI9)M(cw155P1`Dr3U{b0saYag${cF{#q%Pq%s{L191)nRviukd>U|`4x0cU0c_FX z1i-rhXXtPe;7x#2bvPAp5n!_pD}a{(HtBE%;91^4$U0(rRh!>KzVv6QDkFM<8~r(& zos1tse@rexa1+2C7OP& zW5;_xM1QVl-hE;Ne!d6_UqONC+BAw5H>UKN9o!PF7>v7;B)c75YZZwu(WGe^z-szD zMq5%@Lf?tLC5jcr9MX*WQUg*remn z-ibe)uH)JWZrXB| zf}E3n#`J$Kcv^pta8W~g4#NCDZQq!mZ39+ z*QKXSpx1I)>bQWaqbUc;ZGuvEcK8q-GG41x==BS%Wo!rwpAjV{06qI+L=e4J&(5a? zuv?n#*0P$npJXqlhtps7vC8x(9GV#ZK(|gS3oRi9h#DsB z?O9dX5A*|lE!#0kol96~&SVd=nN=1|VsB5broS}lvc$1(GI|Ml1WoZ2GdaO3r;H{$ zS?iQo`l|;EojO*ZrfT)nP(puAWjh{pGR^Eof6ZZ~nf-|`tI51Yf309O(;j#5JMd5t z*~V%f3Z}mvuWEP*GW~j<$wm`8nlopF2DGNC8KeU;NSq^sw5GDs8LB6=%v?i% zZD!V)QEc(dE?Toc8N-gxbnVW2qz`Qkt*Us$htSq6xTz{k%gkkr%^D}>MbjOz`dN7T z>@eDz%kpOT3AirZo4c+{?D*^-Xlp5}m=i!-_py_6RE?W0gUKqEV~HbOS(&95yrSB& zo3_@mthu-7^%|BnZ-Ha|gCCXQD$1ih#XR|sMvXtGTPalAN7v88=%Ke`KfRC)N6@m4 z)LJT>!MaECSLlTZ*PLLMu3u)2kB%TSm?=A$UTW`C1_Bm~-0$-pElkTaz=0{#M4?a=^C|bV$vQvYk^a_-=0eu- zNx4%xG?}Mq`FELBJpMHOJps4uctu*iMCU&M?XG&;jP@$MorE^F%8E6@^Ue9AJxA&t zCYCq3FMA`usr!6^afuaUia7auJA5^ZT`s{&RN*44#=u@s-o#JKiX{)sU0%rN02kDacvyg#TuWTP1|zx9pLX^ z*0L_pQxtj-WPCR!KN~>XtSU{@A%9lz>@t z*ALKDL=SIfEgNEK*@i8H18CWDHekamj;=Shp(~DTLXX#rD|I>QnEZSIef_yJ8iyQlT?s6du#CDB;em`xy$j(3i2yB)&HbC31%h`$205Z&h&{DlS z%i7chK9;vh&Gtyf^uSKmys4jv5T+NRB6dQD7A#vX86gFg%#lLH#x9DPSWqEUn4VthwM3TJU2+aP% z2rM$;#kiO$Z~_=mG9@7!T8pJ5;i5?ul1EaFL?_xeCW?MmlNZHCWW=zV7mf6W8Oxr? z4vgwdH(YUD>YHVw^`JNNRgt4p#q?T^PWuwD*)=RDn*P&*_9a>*oJKUKc5#CnX$pN6 z6K)B%F?zDr#B9(TdQ$v6#107ZR<;xvy_Thx^_Iv+7?cF z+!p4K40e9o3hW@=IjoNQCV=jq!4mlBgirN2g}AMql@d*VeEKxm5`cpL_+6J>VIYps6H?a7( zVvT=Bqj`c=yexv&S^Pf1TJU=l3o7qRX0eL$KsKk`pCqcS=gYg$B6l=NPCX7yHR8A8s!ad4NWeQ|Iy`L%hpy++Rty}I?r^dj;E z={hOYrc;Z_yyE0yDO#WZVp2HCD0=jf0%tJWbOB)~8Udi6PSXII>37i_(P^?>_~hJ0 zvq7iX?!w0cni;N>&DV*#=5;j@iS1tgdX(7Q8p2s^(hYN2;Tz+`;5Xv1)oSJj zvTu%dp-ZrF5C2AQCNTL(F;c_51E1Z@(vObA!DZ{w{@C)`K!0)!<3_7T;k=RndQ(xi z$p>!+VCUc7*J`PoS1AOlJ~5bm^K@sL^Ql@J@Yv_E>yTr84jHJa8kaHZ_yJbx*eRP#xZ3L1BSYF{|cHr$mdb1j5 z%VH#eRGXIhabWtyww_F587JdNZ&q+Jmd-`IJ2{))Y}j&YAwurGY2c}WEaRO>db1Vh z&dA8sqNIz5NBE0vGqPNgMO(|By-z4opCWehol*2w5aNG0B3S6VBcRT#cjHKe8vJJy z5x@BR2As1R-}Uplbuh^yp;k4{XL5Z&Y{6B{32)WweudCf@TG9TOv&6&orV@%XGzsj z-mW2y0*4T_X>hF@L6y%GDoei z6e;$aMpQIIktX8-rC}ssFNLnS!dr$yi@R!i7{C5hkp^95bv034k7@6P!jJ2Ov39WVr zo#!jk0wP?HU<^IkaS(xJ@@Amw!+rU9ooQS02;zLgO7pI<^xBZF`f0F zu)FlvI^|I+`FRp8qTmfwt+hXUL4I+|NS@ zS;yAbjWtRrwsT5Yecgm$X{&RJg%_|a4*@IE*jef%51!jWO188{Gx>`y#YCuGRjoxj zuF!=Miex>l!{-4*Lg`!3IF4}=j&W&8mM-fN{85-MiE!}?^+AYPlGIG1&;>=V6}4F+ z391-$!F-2E$;JHHaU_^k)_AgWmpiiaUl@^dF>;k6mGmxL69SbhLxY^$zB;XPyMcXI zAK2+zmyT6h$268%KQNHcP4~`o@oQF5A4Vx&5Y&rGzp?%+ADSiBjWq-*bk0b2_RH-) zw7`j)y^H1k{VBwTroYD;=~ji#et`M^W4{lrb<)flS#|awl=#p_9f!S`mB=n$`~-=l z;!>EO0m1eW_59ht#xP)_{pwA2{!+MaH_eCC-ub|u+wxT;HLPdRUrqFk5PgXfpaMYW zR7$I1E35nJWzQbBp}ha|a`8G9k_^Y4lTTMuMWV@2i#?g)*pCXGenI7GGMoqgqznF( zjz_KL`gm@-8venj3HY@x^dcxnA}GsA65H6|?_+3nYGe8=cDUh{o^EcKuM_A@p!2te zlO)`ObXi@XeHxt$o@;uSh=FRS^ckI@YwciIxxDw+tL(~?sw=yh>ATz0mm43J1$30$`52yz|txEm= zpTy{{C^UT-Zz(0AEcNOny6H<+cJ+Il6ia{ZNhfTpI{9-4!o%b6JoEh3z^ZS43?gKt z+NX5Y`udiU=&H&8P9ey&r9byV^f~!+l?P5}xovM2$GGfykqgwor_hw%&RpP*wGCAt zUYI5K!sHQ>$*JL?KOvrI83=vOfIaj}fiKbf5>4(_)na#4;6pyOhO?J$B>1?m)mIJO z4jstqZ_J}ZNmbGx+eyH_?$|i+_#}}*kuj5YD$;=)?DC%zhP#(J#Yj3Wro)ERPDi_S z16tg%5t8P@xCroWYVB>dxE}}ZI?HXJ5a3=1sS5ARCxf@Ky7n-mI|63X2G-IZK;0Xd z$IV{D)RQ3gyJ6%m{RN}s-lPlOrqIDB#Og6feSz1%#^@nupYEi zXYDCi-YL(Z`Kx1S z-G_Dv;$@Wd@_ay(H}M3w1dv$U51=>D4hh?hB(V22hacg&pn8DpU(+E|xZy2P?0{P%_eX)`%?T)4>tsaunLT2XE{^9waCD01xs9?a;){o@6lD%PYLd zAlhp@uka*8sK)@_;7MX>FLw>!^N7HQ@tIyElzQax0xuFr7U_MyqA!%UdXY)R9*1?c zH7T^msge;=vlhEtw?~i7cV>Mz{c)$*9z6!?+anz==&ku{j~QZ_y@Yvo8Cr0TR;vo^ zVzFQDJhm3o_+9IP%#@77Vb7?MyA5Xrkzl0xve-#IHak2C{Ri*t7rx$Oxl8|g(Lc;2 z)1*Zn7q$AY#}r3D{Kb+yM;FNA(a2N1NpNJmyWUT*IW@nrct9cXKWYBl!<`p;lQ1t& zy`GH!l2>#h0n}68-kAi?j#CdG!X2H%J%ccOxi&n016<;wsvF7oC*=MeP7yr^Xd=eX zauG4dDWWz-pE$>Mb)5pwU*c})Q}{Zk*t3%tb|S%Eo)(RD+$Bv~eYIm_H{H8hPXy_> zl^U@PV5j)>vbK`Lbz9_&xreLA`cvmrTzDm45GkM2tP z`E)evICy0EYqspJAz=snToeULYXkY3~__YNgJ>GM5!QYh5@ygSbl_l@6jEAGJ?PdiQL*vQ@&6&my! zZ!9If#6yQ5ZVx5l^yLq@sXI8mbcm;SCw*e~JRn9EhCzD>)esObBKIT{Y_4#pJ zd`;aE&N*Hl#>>J;KL>p-y!m{&N`l$fuKsQ=47K^O|t-9qp9H zYV5)MLla4$9~bc!6A6K4#j^xHe*p;)YU;)_BB0P3|6z5Xj{F4<9TTW z=@ZZ?2li7x)3J8MXm%ZqOvnfog7&Q{^WN-%OFx_i5{2> zJuqF4KDB7a>rlw^K8`~X72YDf~NHv4-bz~TQkv`{j`LG$iHu1uqq#yNZ=aoH?r>nQ|i#)7Tlo-SY}B>_x(ioeR+ZfLHWFFnMYfZ|X&c7(4F( zE}6$Ch&BZAK&g~KBDMAfTUi2GV5Cnj;cflMB>H4`uJk9d#?I{uMYPH9PbSbOUgI_W z(f7nOE)Q_@#qg8?WHA}Z4-OzpjWU9rG=_%`B!4$*FW1Gfnwtj^pWvmJT&$|6OgTXz zc27Qi5LrX>Ht>ssNYCIr*SzMSOIOG(@EuIPFv>X!xw)LT3?>td@4e77p3?Fc`fLYC6UhVkfO(7A7o zLVmw#%N|BH(m}osPxMg8^-fx*@QX%!hVI&W^z+NqJpy#CSDdkXW-2*v^veS>k()=7 zenvlV{}mP$?JoXk!}=phK%Xx8P6oe@(I)D09Q~X1iS)`$#TAJOl6Ye(@!>s3krbo9 zn?ioM&T~hBtA8rmr};j#`}mhRx&ES_Kg<^Y^XOlGCs!3WOXF&ZCmuX)G&ptjR>(DY z>S(CBE3A3#6hEl8_o2Os*P|WWwbePpHKNHKkc57u&omVK0c+7lEKdWEfJ%k5T+(K# zNkd)?Xb^*e?8MvCNFQTB8`@CR7!U_SIV~8dw#^Fp*)ebo@$(5xch34V%IGoJaDj!} z$09aeb1Hw*SdvKt%X#WVbpLyd+QIjXBQpPeEP0d$p5$5MNI2PayJHUBvt+wMB8RM7 zcTYSg&E4+7Nfq6MPvNsX;6PDn1S!()V~&SJfRTiD z@8xw03HMbCkp4A6{yKU&9t?FgkRPve|MBqO-MxA0coIBh?F0ABPk#9J9-OpWEpnVP z?YhLbju#mx)C1TwL>1T~XZ=aZ{P#JNCN6LMM9 zwUHmxTKIO}B0s24anN5l(SBWx1ulK+R!KAk?EnvhR^Ie$za5;()t_|Ul@slMss(28 zM}GQQja*e9@|dNdI$^nR&qJzLNkMJGTw(NT2|pi3%>3j;vN|{_=H5-+EnXp45p2`R zL&k1t3TcAdro)}P<)V#XlTN~Vb}L1DmbMAV#fkQtjw)P4c|DkQI|&*D;s?kUQA|`n zK&H}{5K||S*Mn!MhS#%#gT7uN-(g!!g4=h4Cx3@PIGMa1Je}M}M$leaX=|QLz92L> zfmcs~g@Y3|^gyabF}Smr_Vodtv*r%NfhW1gefxGh`nWum{1E&w1+-XFNnTem%d~AxI%83MgnJS*1o!H4VZk~nHd*uvbq#>F7 z5S&_RDCQB zfshKmnt@|$Cbqu6m1&>lMZ&^DGvE^qV)@oR)S|wBA{P(oL%Q*tEb<9CCG} z?&7&~$RJ~AJKCpM#)c?9A`I1c=qTdF|2>BU8M{M*FQ;*D3zL|V@d`+YwRkc!BQt}8%cKT^uH~6Xe>T3r~ zfsOL{G2J}W@pLWG6qW*aavAgaYnuN``6U=5_<|-2G--GG4fnh>mY!pN4 zF30yIVcB;I{8{3C1Qt)c?-Kaax!V_$NS`o^Q`*nE*&r>WJ;XPh(U@igrt#L;k!;`+ zdRYy27hDE!UV`+9%;>$8Jmo7?vlc3H#4LrCec!bc`B=nKg9wUNPyWJElGt^muE%|M z6L%zMu8Gt?(cW@|pIu7+>K9grS8KAx4Nu@IaO@?u1Nq@)@X@e~3OR#k1j|rnd~}1i zEW^tvs^AeIyj=#>{8KS@B~3#MH7qQd-&jl2Z1KlwM|+#12-lz*OgA+;(80 zZsL6l`qFqy9tm_0Rh!<+$zXR`Z7R!2-(nM*+RL`x+H?L)scj7g>aQNc^@8RjUu~7) zNsd)kbnHK%Q0g!Mo|Lh9u9nf@>8aSfY1VHf#cIcggW`xfLJ}WDrYqz_HPe|bu3Es~ zFe&7ND{$p#5Jro?rVH~XS!Izo40v)tFiG?<>5SlUNO%(j zj|ZRl`|yD}Kh)jdAl4rb+63zyH1N_@>@)Fcqqw88biD2kKMO*C@zFC@iN6if{@6>L z=biiTgByYdd0YGi6JB$vAAfkJ?y}dQox#nIqhd(oWsjp!4a$`AB8yB0A?AR)dy7NW z-X3r)Xx|J)=#)wSk8+9UW%rd!Skf$o*E!==&9~NYEKn3C$tJCW!XH72?>7a`yJUnk zKvWGbIQc$w{-8^`i!Ky6)3hFKj=wV!Jk9r+$83fts1wcYVY-|6?#ToLb+Y@=Y7_Qq zlf=YDi%`GZDR_{;C-;!3sBO?rFX}b^?}DaSU!7q7ABhCb|C>49FTu+Hn>l*8*yH_a zh#SZm@6Xq5rKU!}!!SA7GA~?wti{dw#5g3}kxr1F-V@;lFH@SXiqwGl)JKfY$1Wzd zM8PH%v}br;KIzlblrqeOaCFs_AvWto`%hQ&G~!aon=C5**?jU?@bw$_>0gWfkvx4R znRic!tH#5Wm3oLfeS|lzB$36{i}bxJ!vJ`Le9xZ8UOhcu=owqF5bMBppz7Ad`jF~Q zdkS4@F&G5uqqT|G1W(aUv5vDUQc8&v9!f21J@*2qzW6H)R*6Qhx2$FT6)A1LgHVws z*j|1D^^Vb0p^$fDcuoNxE16F6$^txId`JBKqZX7TlWGqr62iPQO|_B5)Qa|AakLuj ziIUjV25>Iw-y}VdMIfTO#{QF6)z}{#fg0kJn(M*8RO1zaQ{}0zdF3kPqm#STe9$i< z4Y-}UQU>UBFwCiSP@*ulNqi5D$Ra~Y9>DkJrqyIZWQ2_Ggs4Jn;`3Dx(1~m;zH?Q1 zB$^^}dFg5r=5z9p&Kt(GZQ>_alh~fNO{ycQ{7%jl^W1B!i1ncVntMD&zMv6h>WRk< zm@&4Nr^xe!H1fhC5>zbY#axw`U;P6=M+}7y6SSi9g!m9f7+KUbDLQ>4=)Lv$YrcQ{ zJt1CScw^Iw_$wla&_zO~)bbt@N$SXQ`$;5?2rq>k--H)73FwS>cn$`s4?-u}Z^ZD* zA`)%7efE$dT2#Lx$MG&*Q`yMf_JjOl5qXrH<|%7XO}1U*g=>gaeWsaciWIuNV{Ka1 zRJDq?uOVRpzZXH5BJtpBJ)+rQH!0xeV$|XpJhvF{P=CA0%Zo|ez{{XY$nbD3+c7-J0|vVVh34=SD~a<(+>cDrmV=t-?3!8b$ai#<`fj@OouL6Mc(+hFqM2}rBG@7QJ6eLON-r3-zUjE#(RymK)r z$H7 z@zi-Jo*#XVOr(*AdF68?AmH^9-RJRIL;t%UOJp@~cn(iWUhl@u>q*Z(k##~Q5uB|a z{R^BHKlJ5&#y0Zx>oNAw5-~QA|GJ)ZF-9UV9onXz#8Wqrc|MVdOb2hMij|@U@X8H1 z`5#Q=K^x(LQQ2JCNIv#CkPLye0AY#R%0r*W1H}XGF!&VK@@$g$LmkjwwRnQ>YI+f-g@7tyZQ>yCtl_{ z0+@r}4u!mS!#Y@bqTk;Kuo;-1+pL@Mgc`PCS)wPw<-ILPlpCfoWGFWp6KUDMPlrPw5=0@*d5wwnycLy2d06Z|KOi<;pEz0}8+^qsg0b3o9tYFTuM$5#?GQOef4yn* zc%6LJf&Q6eyL^oJxYOUVY^`sTue#9xS!+B08CmK{F9q3B>&b^*=$Yx z^>w>zg6Ok4fxXU9`FV zO3EmodmS<9qwA<|ieJjK-+C$ZuIp~x-SGbx{oVcl8SbD>o@qP$I|=PzyL^iTbsrn@ zNdJCIM$Ml$XT|)b*>kez=Ffd3an_KS>0Tj^n3rG=-?!iN;FELn^5$pXrsIEv&{4&p zOFK72A77L|-_+ZbK7Z*DQ%t{XG{-MMYdRWf(DM+Jrec*o zrccszC!Dxs?4kwBObb@#=0-T=6M_vAe5Yc;|AklBpe1)Q!yr|HY?YJkT6g-R!5_@} zFBv=jVbh~ICahYOgf~Rcu;Q|8yZyxiTn)IQwR_oF7g+S+QgP@n%XGQC?e=XccKgjR=?_Tcfg`8@PN0ice(uS#r8w3cKg93TV-*f!)ObffR9x=ud0K^B*ZWjeqV{JtNrF>H{3z^+*aHh>~`_3 zztn;i=iy|OV7G71!adb)--296GO?00+_9pU+Hfzo+h3lJJ0>XKfjd^b3w+2$yM2GO zgtNEZegyqgvD=U42KdC{ z-(AHX#MOj4&9o2w@iNae(|3m7N|(v43|y!`ZcWFPh0B5~2Ui}h0$hc-*5WF~ zwG~%6t_ocHZ0U(~2BC-B_jj2^M@PsIJG2mfBZm+=n$1>DZ##Qk_VA1Cg%i+rKD zpRDE2iTkO;{D8PuALgHk`-c|(y?U?V9R>idm3W+bZ|CF0{oH!KP~7Wl_;cd^WdlDT z?tgFNpNM-yE&pEJujKF!1I4|b$BFxQTlqL~|2~5+6!#{DKPT=##Pb8{y_$bAkiLNb z2gV;BL?euc+hlUYVp}ta`WkeAZ%d{Ny^cUbM_~?n-Bvt|o}m2Q6#9Ts!*ZWtbfNL6 z2Pn#HPYn}8HGpqPrOz6V;#tWf41ik3ukB^~0&#Y{KJGd_+2{Nh7LDOxu+RPN#$3(L#T{P#4=9?Dm z;qAYQ73GnhP}iGy7Pmy|j1CC!j>LbSOar6d!J^(d348Shp%LF$p}7x)Oc1_v64!a& zBZE#hzI$0F?>6%_8FaK)HDvhEf(Ob!Y6kI4xNQ)vi$6UD26=C-(4lIO(~6KoHOT1! z0;?M21Aoy}4RX3k5U2(@T`rocK~Af7R1NZenV?k-a{3_ud@2n!Rv*WLtNBk;>C46s z;ddX_@E0DWpF7%fGU+qM57z@<#+x$fV6P8rWKs)7bnDF{7Sjp5;X(Siuh)J}_FOSu z^z+}Q(WOxzrTQWU?|=rkc3%1T9Esp72`OEYV*C1mupU)Vob<_80ShwkL{5x8bXZc;DYDsZH2R_l^8EH%H*#FoX(-|8S9}Z1eTBI z&vZL`gzV~E$^;c*R6eat22jJ}#_ZuL%Wfg-{irZnk#-?fu^R?uL}fLRq4MJ(NtCX&*OqXRp~zyL{nAi*G;0S zy5hIdf>u@OKa=>p#}E&$8Hjk@D#+>FLDK5YgaCzSB>9ol?h_) zo~6)~-hN^kz3TOShD@3i{9_Csv7A?U$K`ahQA65ZSx$qASCfL{aJ(cXuDnh09RGO* z^)hNbHv0G2+$^9cSO=I*U2K{IA!xs z3g~F#j~*aXxV(z?Gya$_hS-!4*a$rg2tjz**1mh%?v;zrMv+KS$$0R{?p-FAxR6Qnv@$9HKq zp?`0;Ew84T6v@u^$$PZB8?v44yAK7!EA_S;AJHs=d}n+344p!d@NBPtEJigcHu)@_ zU=S%U>vMXG{!qiS>gXtu!Yk@%Kas-g>*x@X!sT;xkXWrE?x44x10M9%0>*QS)^l{t zw%A5!`Sy>fWW>)ixJ2$ULZz1_Tzto)hR8n6ZW6&I4b2ur`j2DGX24<$75|%4!o`~~ z#uy(e(fClCoNai?tsj`-#~?}G;x4PqRJfB0i-Gt-zmEoEU_*|f52Zb8xc6d1n4jK-+>PJ=hZCN^7$*Y$d!szpLykV&!JP}o!n+R+mcY{v06k_;v9S#(M0XyxiHr&mm z=G=s3kaio$qEFGQ&G4a!~-C4qfY#( zEdA=n4=*=_MSjou@c#gr9>ImKx(Wr5c1nJSY77HBI+haZGYZ5Up!!}De7O$0eA=`ds-YeK(nJ5MG{ z*DC-!#vhWU--R`rb^020djSC$JHqp0{5j2o=K(7^0qVbX2~f&K9sW)x{;+yJ3~;TT z7v>u#MHafD-$U#7+9K**j6bOPq8DnE!|A*^AFlkQ!o61-`bMBSa9E(Dhb*0|1)QP{ z?--zF%&e7$Wxn-5>rT;ewJgaNkbn$*J(SwBa^8+cmt*p(Y+o0Q;%1`osu-M zI^B|`zhHL}-9kPcWwI(0(bSHS}7fj+FG z56UE^j@PYHEzpeH6d`1m)+@Wo(&e>)buX90WilZjlLYDgBW3BA1oZ3nlxJ(XS=y=z zD=)^POL^96!-&K(=*FTCdtH{!gn~_t4j+@H?=!&Wqz-=s-KOxm)o?1z=5TuXrYv2x z0M=FL>n%&QtvvK8m|*>Jo+9pRFY_$i{U(dO=%CvnOIOzO(x(g~e0N~hcx@KnCYeOl z@CJ}i{cbDBt2LqhLS$(Rq%#y~bbh_H+RbC1-aiPDEeZ7cqWvbzqzKZJOr1Upj#bI= z!XSJksH6rRy;~+v0VHlZ{H{#4VRdf0IDTJ<0v!FR`ZQnRzX<#D!-a-P{r-v7xO-^h zx{MH~KEM?kT^9w@!O>#fC|KN8vGz?3Ky<0=%L|y1U%UORcbaE%f41s`UpVTZ)pziUlU{2HZyG zVYF_vz-M4IY(FVYn>z4CB*U|S6Lgp(pbB+4;3`?#CGnIJq-?MuF+WrF=It0tv`s$BsGDTVpxO)+|qS4V$Bo*>%I|`4x4)Lx)SK`%VypT@{tXgr9~&_ zGMR{3r1Lub4jftx*Ig&*6PaWT0KG13&=pyFek)IZ8ZqlY8t8O=cZ-tA>}Fp2G>j;W zo1?Mo_JT~(%6P-m$aLvI575zPWb#Tn_kIR3!26#1ff&k=!em!Oc z_moMOX27~I!DD6ok4(VF_3;?|yEiX<1|IiZEAV;{2!2T>Ik12uwgkT>lkjL>{fwcn zD3YX9efTdj=>Sm5)Zh?gnvX&OZ`I*ogsg)+bgg0dsON-O%{m?#bl^U~y61)ed>fhUr@&G)5+`Wr9+-PUuLPj41=>GHqn&BQmLg z#KZwFm&vsAJYgMNCkw8zUMD+(Fj9wMW*z<%``-fCqPbG&-(>Pk1}|I(zh2b_e4R$u zJy4d;Tlrz&=ZTXNiX(MDbRR2A7eqYK!&Y~MrT7|*tJKHk$YdPEqKXc0grcw+9Z|CT zt1?+56qKR&zm19@h$lRYe0Ukt1Zn874iI|>&jp$k^73a5lYIpfeLsZZ5zII@-u^6H zsRC$yZTJX8y5`0cp2J?O=IPJD^rtEzO1ma{_&k|Jz=otynrCXisAo|NrAATzNB#Y{g1E&wd(XYkT9ZovzWGtd#~4ps?d5(!(}p~fu{gH zSFAfnN3WBK-(kQPb$G8V{Rtu5Q*`(fS$eS)la%T3monLN9`w4SnObF1UW3Kxer>vm z`UG)kJ%ZXk9=ZVq*6LcGwE;RfaMH;p;-XAK;SNOi&xmU>SzO7>Hz4|q14Ym&s^vp0E*I3#_2iH4=GBCL2>grwbbi;jhAa8=;X>Ub+!ROy|{r zBGzJ1lEyr04*mvPc$Tcgm<(t2_KgS|K_H9P(SN~%9f_wu4_+3Yi<|Fp^y=F_Iv#a$ zG%tVN&^IO&yu7tR(KtqQz~(XN(IEPHcwH;hkiuJ@H}s@s= 2){ + if (acquiringDone >= 4){ if((!nthframe) ||(!newData)){ #ifdef VERY_VERY_DEBUG cout << "gonna post for it to end" << endl; diff --git a/slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c b/slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c index 8cfa80dd0..ad749c248 100755 --- a/slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c +++ b/slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c @@ -2197,9 +2197,9 @@ int stop_acquisition(int file_des) { sprintf(mess,"can't stop acquisition\n"); -#ifdef VERBOSE +//#ifdef VERBOSE printf("Stopping acquisition\n"); -#endif +//#endif #ifdef SLS_DETECTOR_FUNCTION_LIST if (differentClients==1 && lockStatus==1) { ret=FAIL;