From 722fb5801082cc60d7b84bb7edb168afdd5e73b0 Mon Sep 17 00:00:00 2001 From: Dhanya Maliakal Date: Thu, 17 Aug 2017 12:04:54 +0200 Subject: [PATCH] bugfix:trimval gave first pixel value and not -1 if all are different --- ....0.16.7 => eigerDetectorServerv3.0.0.16.8} | Bin 288747 -> 288747 bytes .../slsDetectorFunctionList.c | 23 ++++++++++++++++-- 2 files changed, 21 insertions(+), 2 deletions(-) rename slsDetectorSoftware/eigerDetectorServer/bin/{eigerDetectorServerv3.0.0.16.7 => eigerDetectorServerv3.0.0.16.8} (71%) diff --git a/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv3.0.0.16.7 b/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv3.0.0.16.8 similarity index 71% rename from slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv3.0.0.16.7 rename to slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv3.0.0.16.8 index 7aa847bf13c28d25fc7a00ad29fb19f728e9e407..b485fa5dd08202b72c4c10ba4d295ded9b6198ff 100755 GIT binary patch delta 25604 zcmch<4_uVR_CNm2?6TsD^ni$nhzlYjqOFLAhKh#vsA#BIXsD~9p`oIoVS%iQhK7bd z>QJFlkztXcV2g!DhF$GaVQFb$QP;X!nAF8Cb+P@v=XquU?S8+X*X#HCeZRb3sXOymn2$HeR4)}qa@as;rB_rMC%My!m(@0p zNIJ__VeP()&{-L3t>;Em70O-SK=ajPd6IcnahAc5sTeBvsFwTttDneDI;&i*_d>tg z3Zu6_7#mbekD+u{i<;15LQZ0BR#)ni)y zTSbx@1s((Z9PoO9#{qv2c#Xglfgb^0F7RaFF9I(Xcna{HN{%EI2tpbN8^B-}cn0uQ zz|#eu1$-fJo51sc&j6kv@ZG@21CJGW5%6KatpYCr9t7MX@G{_D9w5kqP+3vrbFvG4 zFu5W*V62%wSXfaMO5Ny#)oStJ(e%LvwE@*blIjze@?pL-saZWUY#B{zQ==ls(mC#G zM&u4UCr-7@^-=wXhtoNUYTWQpIwx688-9|`Nl_!B=F>TOYJSw(oCWeuZqDgieGF4N(MCBVfT&ap}l%RqLE1`FUk z0b2oQ2{;aLx_}b^rwBM1aFT#A0U9r0On}A;m`@-|z{P;W1Y8a{CqN))faswkJ z3VMqo5zXmVDcK!xlTJ_e1KcR!2*BqB3`NNq0Ve{k7O)L)xqzW4DbeAaWN1nXMMDAL zd;ymLwhI`Vk_-V?15OoiJ>X;kLuryA;AX&aIy{dn9W7uVz!3rt0c?rM(Ne^`C?Gzf zfzQBQz?gy5Cg60y%>vE?d_}-8sdQ1mReL(hm z0QL}Yn_B!+uZlOLXLX^rDAgDnPHia_*4S`DZJBEGL|=36a-Gvwpk|F9No}QS<@hPY zroNe+LJHKB2?wdIUiG*yoG$dJh`#S2p$lWx#yEev(4t!Em#T{=Zq+3PQb>>|_3M5% z%ho5epq~_=NEa_u#7vrkE{d9W{~}s4s-o$BZ=x=Gpr_jF?Yq?A$uV?cfohu!;SFm3 z+Pv@FQJxRkbb+R`(~kV_Iry!iV&cFg0yv zu=(+=g3m)Oo&jnasC?>b;mi-|;y5*B)&y>V(pkauk#Z!*d(|$92YeSNXbG?jwyc5h zl@^bS6V&R&U+E(?YWZxJp6-5tY17Fg-Yr-Nf#An_P zm+Gkl+EuTeH;`;ro92bmM?F-Z`JsH+nE4p?QAMpeG($bKU^;oPqIH286r1jbM}F6P z!=ToMAJRvQH8%t<(%cZX=u`S=qgqfKr^Y@qnm*d1`{)sO9$BT2{76#OXKN>-t&93i z%5a*h@OJZpYwZffF8-XR=Ba*5G>^qC`IM&CspY9t)ttf}>e@#wLZo@#;`T1JkN!wg zu>+>A*BiO*)a0d*)1q5_?%8&YZOi_oOQTfVW2Kh`A%Z5StIMoUg-&Q=_C_DjgC2S#xf?zT(P`29peUnv@}BJJy|#;+Pmms!=U zRl(eB#j65M2fP$%{~@(@)j*Q1Hmw>NxUk`N%gyS}4=$KAwt>9tirCfb30;Oo@%Y>H z^?hnqMj%~Qs1{}T``>BugmpLqAPc{KS*_3L?5)%_f%NssYTg=`x415rwSn}t$!hG{ zPENT9+M$VRE2n8rfujnZ2%J!Qsl)cA8#-)X`hAD(OK%A{4z{;IeQPv|W;DsZwW9fn z37AH;8nsS~R@=G{`AUm;GLk+fskSG-6bo+tl=fV4yHzG%fL|IEspOTcrF}9ngv{+f zexDTQvX<_r$Na`v;P$0w>#~f7O#8c%tQe+@YIl42Q-O5-G`0SzvGlQMRnF2@adZ|| z@nh*o@Nug3=m7OZ_89t7U$reekUr*zeCF$a{~H+H52O0&6Uur;Ox8!WvPtT$^|k7! z+eWJeIm_r{H3yuOAAp9_Z?Rx zHCrv%?8_Zx-1q}ci@_pWpibSS$+2(JgLad@IW0*sjQ>`Vb}e_YH*5lXx@s?*rS{tF z8rB?}-EM-k&FF@+du&fd+8N~PR=W8+y7M_Tf6J#_Q`^(p2==FEnz!$<=SbM+=`ciruV_{x4mt=Z*ISH!6eySUb>yBbKJxu%AxllUCc)zyTql=vKC z_iS`o-RhS=slHD=cAH<#x4K2B_(KHMI-&E}<)v)z-aQ@LL$RzLkYy;}}j? zmchos=7`DdS~eDbPFG$PZV6JopWp3r&B^CA*PMAilFpo`wxL?trdnSZ%EQ+7LNJd1 znv23Gx|FOac>zl;Jp%`py)?Z*P1>iel-zxXY5IBW+R@?^YfDix_V1_ZSG4Uh>A*&Q zA!|4=g{HUiQ=B@sm=9c`6u(92D!*MX{phks@MYIfs>jPi>8c1d=HRqum?$O%CG)Q1m-kdFY3rI|C- znuF8ntnRA(>V0I7#<%*_A>^1^{OU}qEJQU>?Nd6KD&5uQ(t+yA(g<=~gWd=6{>1=4 zrmJvzJMucmF4v*Vy094=ecHj`=aXo3N8c5ij=11 zX)HiDEIND#|QNBRCIZXJg(*(>u>hx-L9B?{8#$; znO&2E)zG(dT`|+O>JK#*x<0_ok|7^PE)3dryQN_8r*up;inXakQRL}VP zlbSF7uCd8={&dZGHKH!i*Ft!HLrh!7@0aY+Hhw_scU`sBMbb5`xU~g!qpeHZ4PR4t zFFB;P)!ozenoe6ArN(^ZPse+yNgrX~!rA7dU+G$&jOP1Kn3lDze>MZg?Ofp6 zm(~_kw0#^*=-ToMOFe2Hl9+7E=JsJy&TXM<>(!=nnzkOF4y6;;sWG2M(kFb>^iQ?m zEcz6#d?Hyb|7;t5A_I2=EihBhpQKMzYInE&7cBINdK|&E#NTw`1DYvo8?5n*(KIsz z3rcH9`{GxcX;W<%zvgmS6uw+2i~`)VK2?B!!m+d|M^P$d~+}V;Jq$g+wSNOAL-;L z!_=&=mw7)W3-Sz|{1kSXuSa`7Wfx?zS%Dn)&1m1JS~wX;Wm%!$A8YTi`sxAK z<9>SiIkly6zBwyhYqVz-s>$CDrCCL4{fDk3gCop;rB4G{;(a6{T9Q%s2JLsc7nCHS_yW z_3bNubm~p@{FU(F>E|>JY}wHYZQP?sXHN(`0r+M`GEP)2-_JA!;JI_kVssvBp6cc5 zq1JrAHs?cb5o1v}>k}*5erP1oI59~4;^C^%g&#{@dh8aj z)M3~~+!G~vG(R|vvN)a0=1rp1M&CZ_je%aVQ=PY#qZhT>*5@j;p|4AtMw8YzxZb)q zOqGmSY(7|Q;wfkSl~Fkoc9I=E4fLzos_okS*i}of4W;Xg)%0rtYRffW`sGuaXw~+UiJsWb;Skn1h{$TuPs{vsLbwq70UU+t#rI$UaTC}&M71=npg*ir3z|aB zIk9NPHEi1)wWeu>e~z|H(8)ugUp$9SLX&N?Rpt8IIXML&4}p;rgtEFBY&mf77l=cN zJA`5qE;=0j`7O}Jc{-=9L#NL-^E)ZF{tTGeV3q6Z*RsGpI z+hDcX6^Q275LXQFAvrxAbpFWyUxvJJNgq-=BZe&M81lji)$hg&UR;qHL3LN?1uxYe zH$?sZLvPj4+~0RYjdt=j;~gnndq)EMh8i`dxsRJ+n9Y7sO>XW-=BQcCeaI!Xu=xuw z!|)n=8?GZ3m^4Ho{f?>jU;5z$UHnV0?tMGaS8;mpeXfk2-G6FkcHAsHI6gB1 zeWzadOEc+vLACyh!H3su@KF z4qIEa1z4m#jdEd89l8b1;G@&=*<7&ax#OK$y7LzQ@uU9BAh;;y&*9BEQ&#<@nFOrr z7@tIR8lR^HoQQ% zj*)oVkallSZ~g0t=Z4GE4%`L$c2pX}r~XVafijPqi!7WvAz zKjs&v(|miXsW$@yH)>ZWt(m9Ct$tzXK8mjhSW{6;ZidtT*=qgG`^f;+@3+zZ8{;(1 z=*L)R+H*U?bR)v_o@%l5!`fAnQh#?vJ`TkE)`@7_SfI=Lh^QC; zy^F3MQ<2t+3rfGUYToZ#=*CJ_{==7kctj2RW3_2xtwKM1PA&dpis!~gVF1MR*>5Xa z|2Rd=nCWyebV_1!W z?DfvA@8GFfgXol0c|a)JVI*tFDrR&eq29U83a#P$FqZu0kg3jwQCQa{yv?GnUD_r*)WjefK!CyOCZwLE?d{O?%+luYJ4tyD4bb#1u9cI~* z4u>bWVg_`6G{7?0k_CEIC;Dtb&jUT66Mc-J?*=`$6MX=D5R7T~L`&?XJF$9hDemyl zJC|9TJGS)Wb69j&GSmO$d#<2B7K_%jwQVU^=sSB@NmnxVw!Uv)W6fPjB&}M`Ld;}V zZ|&V#oTws1*BXVseaKN@CV|9z%lVFRkM~ui{##j1H{wg9hw#Yh!~WHc{LQp}u_CSC z$H6hN?oJj_`zT(=Yv+wkT{(OYb9N{9(mlsnj3>E!@+EjOy5N9>7w=TpgQKiS z=?g(eAW0tZ7=L1ukhvF)J6W4%UWYsGk*=Ab`6=Y?rA-=}>F$N6*lWEFgdqo1L6uiEsD&X*%0qVdWbbG^K6IyJo#Edcem=NRdnheQT%_0eth<}_|AJ}rIRt;vEug4O$wvF5FI9Y1`X`Sm2>=B*_HKhENN zlCh?(bqYOv!BNnYY$X0$uPF2lE)XYl?WThqw6z7aQ7obtdC-5GmSh!LwoV^xTa+%W zY$+@1Mf}HZOG4Wr+$D~QrOO|ZV+C*ShH=9j>`Y)`d7a1D3tqd~8 zaQlw3NR<0w=U~@Cb6YKo^+PPZzM0wl$fu@lR~7pD5Ek8=OfWrTRp@KqGkb3`)bxxU z@DWzo4re>A_9nfI#A|OL@uzh+9Ra8f^yTg>K9q#hm%epmhLSEsJ`v5YA(0#w_P5VCLO`p2c-5}gee)fFk47UkZq^wZ&1XHZY8tQY7 zGAr3n%sUrinVA*3ld!}{GB@%WEe`>o1|zuwGDA1&&N-UlZ286*yx`f4UR0q416X4u z36IQ|Igi$E&o_d8O?MjQM}92%{LDMr&$5`|n0Y~8mNcAef^%D!Qqu;aFSU?o-H|&4YZ>QEzJHd7y z@7bL!BZ^F+`7Nv_iUddIw_ztyIP0A<)-K`-S%NR)6W`HwT=YdLu7OQ1wDxJ`!YF_ggI>Y5O2fK?e*9R{H8juFTP#Q z)^*UF?>PK2z`u)uv&ar3D;|yQZtFBwHJU8*-x00%ZPM0lhYopX9WnP3Gx6Nvnrf;- zpFYA8W5`VU^cYqeL;j#UN?FMmGLmi?#2R?L`5Y@BO9ENsSQ0>Yw6KJ+B$RI6E*eMh z#?kayD{JEP++TEh?sJ?Tz*5JN>85AX6qJI!(jHf=V76h}=k0V25vO{q5Z(mE0$fWEXI2<9<1!0-fJ`^<(xwi4v%~%X;)JR` zEI$DW`tdo;`VfvrD`$}&f!a5Tpr)!tpH)&j9W7UX%Zg`_Uc(Y~jaQ3>s(mjEc}y*W zqVD2TVGO+b8ply@V97H`uvrzm+3IYTH-k(Wsy2-pC&{-fyPCiI@!^}1C)(Q}!)@>CQb(+P_M9xmXrqOeD>o*v>YP`rH+GEWy%kG%l#jOg$Fd~J2P^V8P z{d69NOq5Jx;n>Hq{)A(9CyDm!LZ+6sA(J1ZJE@rdQ8XL&5E;qs*vEIbI9lwkbxlyA z>9e{0e9gPHT?hC?Rx^tXr7KUfX3#_T$ofbtZ|Wl%EV=<#_Jmh`MB4@ykqAqyT*~56 z2e$XwsrRAPop`siyhJk6bH#O+99;NQnQaCM40kzWrI+XzgW6o!Pa4Q^esa=O97muBAvf)^CU;T0+!4B5?OSgM9L>|6<@Ovk&Xw!;6uI=*S4LXLM%V7` zJ=!Hl;o~GEk#THXck08QdWgL5z2_p=gl8J`Mp!>~jB|YIx!1MGBNV#q0<+E`{@#1} zcQo49A?Sx3$#cjD2G6~&tO5Z`z&sCWb;&ENAQ$KKoO?(FdvzY^MVEZUYUYuH=Di|N z7Vlx{^T}JDds~DGNPsElSkwaCqF5M9U4S&3f}FDe`Isf6Z6Pz-aDHUzy73G!lL<>nC7)~X z!vk3CQnHNB9mUF)k`<=HM1{_s=&&p!ONhBp+k+IEw1yQtMm{wc3bQ`+97{_hKbi|` z_0b-LCd+Cohz zE6ye!EN&en?K`8;DYzG{gNgTt06xJ=HP{AtCp!<=f4>%|`UsP6=_BlKL;DQo^CYeh z2Nb|vS@M&RaUesXlP`-=?j>E>=_kn$^8pcWle@CECvnL*Pz^2^>nYv?Q4f0ZQ^enN z0P|9=>AlOJBEFM~<&McI!-SQhp@MP4IBag(4d;FBmNd*#tZ=%1oqj*om0J{g|LjZyM>w8a5Jh&iHBAK*YL?oxvYcboF0S^v!AfY}fHdf8dV2 zF4|M3I{&4;opu~`W3{Odv%F;QDg~smTjaKQUO3g9m zSna_Kc%yFlSR{>2Sj8`Ek)Y6V*{uFqGFbftwyMoV%)A^8;s$ml7t#DOqITS57O)vN z{+Dr)9fzd2nM^UgT&B>mxT$X@zY){R2>F;xniTfUCgRf-EAHhc&=BrVldsJsVsF29 zvOW^L;%Lnye-K&{%UZVKgb@8L3wZ`UFUizRAN?Xrc?M~O4_+ zqj;7q2|nnj(5OLJ<$98`9gG6rTQjNcAhw7oynhs6KRGB=9gd_}K>W=IOLRHIVcr5V zWx~Ol4&R-!b@(pwTWp=Kv$Y7ry>rJ(Bepc$Fc9$>-)$ZB&H@!Dk3Gh7|v}=}@dfEy(CEBVip% z27Hdcq6|>qi0i^?UM5HBp)8hBLMG6D(;QVL}lL!E^>@KEd4L6XE% z;B$lV!zReYL)-o_7TGXr5O^vNksoRAd93&~*sAwLR`nVQ_wU`C^9{2|X{dcVbm&bS zZLg6XB=}GpXVCMiBy}+KTFAXN%<`HCt8XMeISTEiISv$y7`oGxdJPcV{QaG)mDWj; zw(Fvw(rKjnj&|Q`qHnV3JGxWbN1|;+x@g?rsZq;35S-gd@cB;dJNdT)Sn(UUR{Jhx z4R7E8)$isaS#xay%j0n?tBxH4ATYlRB!xsRPWOdg~@ zBben)ve*3DMLo`Zu;Sh%!Tzsd2ldI;_@&pil!IXL0IjQ|?MW&E}>iqJH%veEw;QUP$;J*vcmz89PsVqXFcO7SC zl~ATk(Rn>_jz2~gnaffHj#rIi>!!uGBG0$DC8jF zo@FhZNe_7sym~pvlE60t^p4%mVfpL%LwZ9D-VINDRb+1H8yOw_y3Gckcno?&%Tc<# zZev*UTX@U(u8I`XuD`I{<9IH4qk&Z)C-dnWEiB+|oB|K?Z$J2{)(a2yER4o;lj~`B znB{PU)?!-_#UkFpJH_ERF=U=X-Em9>&3sr(x4`GI(s#%t-@`S$k1JSk%Ybv-2{Tq> zH##h)-enZ4t48X6)2L6g3))YRUFJ8Vblil6d;&-RH8LzX-&gO=@1v*hduE=dENhr%RTNeyPraw=lJ?XWW=!M!(?Fh0)6I3 z($RF2rPq=tO-FJ8uW>ZjlIaHXks{5U#>-+ULJ>8j`9!qWmi0c$93S# z*nmFVBH$?mPuy+Eiu|_S&W_ZPAkU*2@SCKa=g7a8v&K5IEcmx0cPLhLyJEk6%hEo= z4)fb$miG~vKK-|z{QNf9E*WC?>DxI5``fe+AR;>E3irwtZ%Iiq5=h31L zy>9-__3GomWAm#<^HI%R3Tejk;%DTr>F5=}J00ggBg=^SXd5@QLViBsP%eFXY`L7WU8%DauwI@FNuHe3Vn5xYy6u< z8Ss?r;|g~FH>5wkI)GjM5=o?@MW4{s?;Vz}2qpekNhjV+9vQmxuHpdXg%w)dKmr^Y z4P-qrRbtLREN88k@%B(@WwBr50qc8wSI3o0E47@9NJVgcuOGQ>m1%&l@#D2sE%?K1 zs>E{o{t&axBT=mRYhp52=4n?Aa>Z@$H#jj=?q+`9z@}HkgP4RR_m3A@+&3gN{2wp! z0M_mfNv%Hn|PGyn)A( zJtx+W=N$g5ijTyGaM?V-tx}~cA7LJsaVGwOj10bq)qaGEDc?HzcZGhgGkRW^YS zciJDwq~OYC5erz=m$ew>3sSfQi|3fk*yH4hL9&SqEtB!_*g3LqkikLg;33aLeobCT)*we9_zdt~}KeShAbt8^JX z^$SZR^dkw=6pa(sxv{aAr zLKO1WY)5%_>e-!!csOeOsizz5Cpqf-(Jy<@ZefnH;dDh;N~#?JW9X?K^m-d>OrVqK z+sj$l4Ekg6@oRR1=XrO-!RR1Ko^F>cvT=e%maOqIof&{q?}(a7A0#>NTAjDvt-qs4 zI)1Vlb+Kr(+`)5apIEfpP!j$JzT5ld{B`i#8UFumFTYc{oI40Lci{hDlu7?T$gtnh z*89!@WWiA2u*{}!x#xWD?~U6fEfQ2bCrP^>61C<;mlpz5CI{8J6*J_gR)KT$;8x z#Vk2*wX`^I-SqpP3PSmRX8OO#Ge~IIQU#4`QR-0|P_AN7%;KiU6RVeIEVg8Fo9Gq8q&^Q1 zk6b=JEzOd#dg<~-OEVs~q%K^$*s^Hx;uV(15f2$FEdx@_eIB+hm!t<5rmb0QS-Hfr z5d4XPe>87*(5LA_Yfik=nPNk!Me)$<#pRuF-iD&l(7rgPqolMroy$U;&ZV*_C8*0p zsYdO>In3$6m!)@3k@bB^;*%d!|Z~TQNxdkDpUholaXT%Rf#>hdO=1u8x=$;6 zir4+3*bBV2SlBzf4svH-@jAqv{fF0ss#%{})Zqc_US1DQW)Jf^B8ff4>!>U21zyJl zuy=SpCYpW4>#>RKKfI2!us)|z$JerZc|Fa_9@gq+_7tzDm$4Uk{XhwOhu1T5*;l-t z>Bs(an(n~=gvOrvfCiamql~%1!UG*Q&eOkBw&5(DVA84V>{wO1PBiIMmT{i0 zGI_hpFrDM4^Yo&dK-k$Y={)Kk$HKm%%;cRf(;imG>96QZ#N?YKa|18GOpm$Xu&?Qj zxqi`z7q|CGgiL$Y0yKWCf#sZfl7s%G96Y8`qc}qg2Ys({@J9`-P94w)NxD-*O8AJHQ$q?kRdZ@sItMkU4v6Cnno~nsIjA``M2iK@si94rS99tB zBiry34KRhsn71E$`6v2UZ zuhV->;Q=yVvtM1Oe|N!UKhqU7yod$dpnXi?NHXEkY|ITh!#p@y#=4fIzNh|+16H%i z&G4zt!{#>ANBa-1_r??&;f9U!n$-&=f=|Ar@%VoE_dPHuVrg&&yV4B75m*mVS0t&Q z$L)fPyt=)m&tM@RnKL=Of2F<1+@XySts8Y{Dj!8N>d;tD)r=Zh!$HlcL&`XVX4D}e z9Mp^&!6oP`#k!mGYDOJmWt;v*kC>xiq8J#mf6yHo?Y)UfMqTBt4zHWE4>65E;Eu35 zB7dWHVj2}A(^2PH)xYUUQw&UtbeGji&k5Ku>vuYan8!rR$bU#x#XQtcvE=_ircQJ$ z{|}u=%wrLvaTZA$)bozv+4@`H9Sc*$Ssc&a;^U7kgtSst{wICcJRZZ3k3;nS&I7X# z+wG*|OylE0Ok|gw^oA)8%Es63`PgtyfR0y)p*NX3sm==~&@xY48$jKjapyTzv*(l& z4r=zCBy$GMo)hypsM&L390#=^RqUKsv*$!SNE!^s%<;7{oo1D!ySMVdoWj=sLc6d_ zZiZ~RTYHG=JnWd!aMnBxVK=QAq4NCg{7;+o7PiD>xMrT#EMtR^q+!3^Zl+gFdJBti z2iNp68QTX|!4%H*5)1S&JS`6+A$(>0jSJw-jwG|epO_ygk+H?#9qdRu?@p6WbR6?A zbS35)xp<)PlcbRmd@nddS%GYrXws?dE7|aXwGHb>0_!;kopU=))l8AdyPh%!h8{*5b=A=~(co*~(LUlK zLk2-WJ6=yRq!2nb$>BBEkVttTKALRkYeZZ*w%EA9X;#N`3k}HtnjQaMWSBu9S;QM%6s^L$(_pr95h6((961&V0$i6Ym#w_lK4qV>1GTbI?D#wCP_=O1Rt+leRcxo zeJKC0RwWcxh(4yb3nlt?p`)go@p)q;gyGMC9|!Up!fm_;-ksN4M;-Unadga=jYBCt zk;1CIje*`gE--{7bwhOp0zw>3-p1*M(2d0)QZTEHP7u;$AUxwgIlSwIZ z5pfsz7MYyMXCA$bfpkqJei&oCo7A!7UdExpJEOoRy17NlbP1kZ=8M;Mw zR^4rdOh$H6%T1NZ4yaB1M87v>lHAJLAm8L23wh1V>W3+=_hIpV#<9T}XF!YBc}*Eu zD)qpP0?(C6SQRVtgQ|nFSRJo_t!GWBgXf2UuR!PP(p#3U$z@o8mc{>Gu+{P^MG?<&j0BbPOSPJ5=XfIb-SffyFk z$2gs?!8gu<2lwk_26Hc&q;a_=x?D3njnz}v$2b-%k9h>3|FexOBEYy{SPPawv(DCS zh)ljJM7Jh^kCe%W7hx5?eIn?(O_s^yGOG?S4xNyl3O?c4ZhK`iqy)H&uS_O)qhGt6 z_q8bUQ1PvNJ5AFVvVAz~cKNfT~y)N5f@S)Ymvam>-B-@#b+7HX`;+ev-K&M|@SW!PXXLuc~!jCSnis!2`c}r#uyxmgA z+WHySNBX2du87IIR_KRY>8ifW?piC8&$x5MQod`KOd>K_nZ+15^CrAOh2D34BvVoh zJreYB?z)O#iblT>9mmCmypaT4w99b%`gq`3qWxZ(tczse?dk=VYlh1NY>(M8$$)sNM&K(Ek1~r0 zLHM7pV`(ACK%YRoYnk@=r%Wu(z=dUfs7!K!x-yVYh)lv`SvC53^POMXt*h;`5YsPW zO^`dmS_?CY1nE1MHUNRk#fW9pvp2E< zpS7@V&oG&s%wyF9V5OhVvxWhf&Q&7|2nD{)!eT;U)ueo=9j1%*jhD%sN>;?%r!})` z)RFwe=w70$@B6$=2E{|ZRq$8HMlh9$$}Fbb2qCrxgpzD8}j4 zQ@c0BgO9Gf!qNs}Ik&K)fyS|sy({5lkyCq};rCzQ#rp8Q&OtoHN{SHs9Y1$6k1$N@ z>+>w0*KO4-KMZRB6KYFhc)u;O^v4z8Vtx5NCzBHez*}`We#d08tCTgMzxO#zhx+LB z-aay^xxyj_8CT%HQDjAfpzbeLRy_zw6zkg~9C&C5iwHNKq^cil3OBCs_9}whG+p05 z2*R_?ENw8%+)xj?O_$r}7nxYF2@Hmr_|?ZfU*``9!d?^rzDk`hU>MR^8uN%i6uq4Q zH^&M(^3%u`7Q^YDGWdo00}dc+uCg@HCnUn$1~I>Yo5-H2;1h1^Ylhpf=%hGZUSD5~ z(*j)Nk-mY5{xVh<0lgQbz>PwmzPJ=bU1bqNFzyx1lbjd*t7Yo2s`)v zO(w7LC~naC0&#M}5v+*wO+}becR@$K+|2b6@&au#*_Ol_hQJ?Y%-eOW2*fz2-C4v? z^#(nho>!5cnT5DbIy|V*d#0DU;ZG=3#}rp&l&4YFx3%9sHzO z=MQR@N!CTkE70*^__KtMC;S_Xdyb(2{35RhL%;QB&~6v}%VcsGIH?x+YGjuP)@DWW z-rR(^F$(&JGU=|MUy8sl;Cu!>+s8p14{Ged`*-J00>Ev0Jom@`@&l6YFvQC@?x5G{ za{50k6F&9C(7jVb{1+77>X!&TGav!agC`lm?Zt{74**@I+Z1iGA%*G7A_EJ%?~Ti}d~j zaJtDUX7Qj0mlc98`VYvK$+Ka=s|4Q*kmtwphhv-|#072B=QH3>nap%&P3XU573}KT zze8uqiyh9x_=?}Y6;m^>&%cO@D z?QJYQ$~bza54VBf9f&QVAQ5<@E^FX$nH-FOErg8+J|L5BSI}N8+ULsTR10viCI&u^ zv8}8v3c1-4gMJZ$?-Q8}Ed^hyz;V_%QiBvPY(EgTzpsF$jezYaZ0}kNVfV?z*$6o` zdcQDiIiIz#vJuFs@5Zw>@Y7K^s*Qwio@r$9y#D4q%Nhwe=330TK<_u`37Jfbf*i3| z3@VUGeHg1AX#pXy|pOoW(?=zukiV(YjuPAC_r%*qg`#&*F~(EGrs0 z!@}(qBItkDp2+IZpIUra6Ke0r5Ie3M9Dx(W^n4aD3ip*J1@b)fei8Tu)0hCPQQ@Bm mCX;_iENc|>`Byb713&!(dlAQXHL`%wsNLNi@uQ6ghWszTcGGVF delta 25433 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 KjMX0;{=WcaVts!A diff --git a/slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c b/slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c index 9ab1467ab..515aa3a61 100644 --- a/slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c @@ -299,6 +299,12 @@ void allocateDetectorStructureMemory(){ (detectorModules)->offset=0; (detectorModules)->reg=0; thisSettings = UNINITIALIZED; + + // if trimval requested, should return -1 to acknowledge unknown + int ichan=0; + for (ichan=0; ichan<(detectorModules->nchan); ichan++) { + *((detectorModules->chanregs)+ichan) = -1; + } } @@ -554,7 +560,7 @@ int setModule(sls_detector_module myMod, int delay){ if(myMod.nchan==0 && myMod.nchip == 0) cprintf(BLUE,"Setting module without trimbits\n"); else{ - cprintf(GREEN,"Setting module with trimbits\n"); + printf("Setting module with trimbits\n"); //includ gap pixels unsigned int tt[263680]; int iy,ichip,ix,ip=0,ich=0; @@ -1063,11 +1069,24 @@ int setAllTrimbits(int val){ } } } + cprintf(GREEN, "All trimbits have been set to %d\n", val); return OK; } int getAllTrimbits(){ - return *((detectorModules->chanregs)); + int ichan=0; + int value = *((detectorModules->chanregs)); + if (detectorModules){ + for (ichan=0; ichan<(detectorModules->nchan); ichan++) { + if(*((detectorModules->chanregs)+ichan) != value) { + value= -1; + break; + } + + } + } + printf("Value of all Trimbits: %d\n", value); + return value; } int getBebFPGATemp(){