From 4b91d841d67a705b73ff9019e4d17e9b6bfe3016 Mon Sep 17 00:00:00 2001 From: koennecke Date: Thu, 13 Jul 2006 07:24:53 +0000 Subject: [PATCH] - Added log instrumentation to devexe - Added a hill climbing option to optimise - Added hrpt files --- libpsi.a | Bin 1887598 -> 1887774 bytes sinqhmdriv.c | 2 +- tabledrive.c | 6 +++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/libpsi.a b/libpsi.a index 3a15d81f5acb8e91811de333984574a7e9f81140..f710425cf5238bd5f090c6135ec41c0157b25c1d 100644 GIT binary patch delta 8574 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 delta 8447 zcmZXZ30zgxx5xKB_a3--jtqj_dpR-)hzh89WfD|SKp_Ow9CFBc9?=-e)N4+a=wFC` z?x&WTnWhceUth=SZ+}e7G8N4sOH)I8X`+&u)zjjwbn|dXhy4%e(oeNEJy70$lpwdRyusvgpvv*IO(B zqX_$lC8`I>>#IzWrYBvL@2w#rjE>~a_E|Z`vOps)z44e&=K`w&bWNITxs9=8J?Hzz zzfDWJ4k;EK?U(U5}WiRJu=2tKXM;G>22 zv@(K6i?2^Zf)7RH8D$>y1khf*cSb3c&T$cSMu`)NXF*INvFWUmY-i1-4sr3UGL#pI zlrN#nKkKW%R4({%mp=WXvPI(MddqK>ft<&PF%3#TeqL;EP@dxB^tM-&)tsNwcU@H` zacS07G54fjYY})=vFly_N6{pnrWamQWSe(ZOUA159vse&IvPZ!*h8(T)S*)dl@f1Q zrKD4>$(HQzq*D4uHmt z4i0(#yQPixsyxRtPqvvQZrxDY$P9mUN28K0@uhmfEoED4K1*-1se8GM19(^Lkkw5x z<~$&ZeAH)T%z0Ft!Xl3AkQnZ(&XaLqox}-W^+y>;c0+vPP{+$Sv{Ry!pPDP<*!)F> zpL$fr!EMz0wNP7e8HaaDAFZf9T*d*87SmL9oQxy9ChApnu#7{TC_1!MUy*T)SH$s_ zYN~t%ilc;|znUkHYRlMC{ZW6llZ_A6p9xYwliRI?)@teBU(0AiJqG{jbDU}>=VQei zF12H@EOkzr&>05Dph4qjmiXSKMjB&R#F_`bPGjt5kslRVZdK!l#7MUq!#fEtsvBYh z;*`+Q=r7K@)dap#_=c(N!Pq5C)r^s?tgS!dEcs=ywO1A0ngthc{oxzwkn zJPf)5vuFH_5(mT7k+43InmW>7TH01574c|&V@Gwd-8)ugOk$i3gHT+t0!V^-3}{?7 zg`0W`Xk0r>&jXDM_$v_Op9114PNVoGpm8ZbB>zevuIDwXSfR>;;tXYtR$*`<>O>62BsDbXB|XQM%?)ANBE8 z;+WGITaQd;tR9)p*d5YcVIHLJjP*liFt!}X9gM9Z{*$;4{T&$FO8RZ$9^yXoe?t0% zNiRD?hOa5$4) zKXkB>^gV-K#_p4W!HQylKM)hRh~dO&@^?pOGj@*b4aDz>jp&CwzmVpzGccbIQ30ag zjoJ&27;B#h_^*>4i>5Pv~GB$8pPVFLlg5TYB1{xoE7#?F)dJK_&OFIK#b z0TB2*Iedf7geoxzi2gT`ePE9uVXtJs9>)5)!~$Y55aUOYo=luUEG7Ti5au-!{YnlA z&Js-MOH_fFD2#M0u_LiF`G=F9hB}F{`AFErKal+{@i*ch=!d*&D6Bs=7#eC)BSrx+ zpacmco`+0kY$pk#nRQh~E<%$?t6$27%CUED#eF zqK1Zt!SN#H!&D-n;g^xnpiaC3#Q2-UJH%hm4-Lz3{GdO87(#Rd(ccqU0P8=S98VG# z5|>~A1Xhz?PuxV@O8$?Lk1%$Y>{7Vduu2Rfh5|8PEa}b$Vg0+2A)NxALw05CRV2(z z9r+93YXxUuE)YldG;uL;Ir^c2TGB5Qw-C3J|1h$Uu`@_7B>V#lMT|v6nu%kG2|%fs zu~gET#2m60lYW#qlI)X7&mcZQ_C=(Z603k-Y+x-JHV|J0qWx{sdx#&9{S(rk6Hk%- zBIzr{8)Uyn`aaPXW#;#fVqRk^gTa7Ps*xj(bONy(*?W=BAr_MTF(fS293;%>Y9wsp z13)e@_Brtk@e=WR)G#yPCo=p_^lfX}gNPcj9kC0sJ28h?M4YPYS!ztM@!P&9NxwWu zy*Q49fO}V{{`Fq9f1G78u2DJXRd0!9F>W}Q<6BmkS1nJH*ge_bt(RA|d^w9Q47YO~ zVS3lkTRv`HV?14jarb&7-oH81Ow(0|N^e{7kxpN?zF?dG**WADaA|Stb3+5(GjA>) zj}G^gkIb8y$0Mr!LR@-aeZc4rW(AMgK-Dh+dJ^@a1nxlkxDJ6krcj6;SRLq}Va0=R z={=4F`lOkbZa8+QK86PcL|YakW>rj3Sh{5~hH-FYP)zdQEVk+(8x5?RFlH>~^Pp#o zDMp72RmBLaf^oabEo=41aO&u#L8@CHd%V@!31&z#-bCGcYftdUG~Q(W^0MFt^LFP+ z7Dl%&9}nJ1gGtt5I*!CsZGCKVNZ$x6mD%AzA-=s#ONxG?I^<3w3G*U-X@AJ2U6ute z>-zawt%F~*EXJN_VGG?ydm_c0>q{L&pY3MGq|%-A@z9-*SQcXz3SSScGOypBRI}Dk zAuGf9%j<2yqQ$<+cDR#U+i;Jl|OdotPEW>VZtv>Q^U)bHmY#-g1hFm2hGjROAiG; zpVzc>VG}EtZsZA1nwBHo*rU%+)B362=a-+m4oqhVDj3bGh1Fe)pREzs=3xoP!qsG+hJ}7@$Lkvt5&+{^8|Up)nhj zuKOuQZKLWIk&vs!NKFsKfLv{SMg=5?abQyQj*-EvXUBTO4X4#;{O{HvtMZzjUoIMR zwPHR&Waep!DU)z?hXTLK3AuRStI;8UX?y$MyYgQkslCqPr93Tc(2cS`2ayL8`EVX> zWdr{7xPSeBBi{0x5o~k@hk7FcF2K`UOm&IGzFIRc7K!~djSmoy=WCtCx_nI$&-Bwe z+Mk3$iN*O^toWjzHU@5Ro_sByZ^f`F_PU48#(d2qeFv`!1=>^gyJU_Lbp_fl_E?xs zapIaBDo#G4McE&FD3wAjoG%e$`#ansZH+BJi8Z_QFe0TVWP&xSVu!OGGvW7qEN9z6 z?0|`}MBsk7>sTTr(N}y^+H@DAEdfop`QD%auNr#PK3+qI69X$;Da>pDrFN z)>5ULlBh1$R!Db^$~oL7MwMs-xGLT%(V}!un%l<3dkr?XC{A~Wi4!k|1c=ASw`nbQ z<^(??4qf(hiIoGj0)9b1Jy27F_zv;yc&$Xnk!6XL3GkAa1*89+i)|CMQS$Flt`xo# zwQRW(Ch(@{KT(@0--M!5?4PJr$WGXUw?+CS?P>Wo6un~KByF1Pg=dXK5jR=;mz?Me zcOvo4WNn1(g74~2MUN>E@F^5+V&@cXr)+D%Sh*NJRZEe}q1a2*PSuvky%feyi?C_h z82L05_lrf-v`sQj`AiW#U0dK?#d$C21}@KbyowD84}nJcD#I$(IHC)3QI){Bq#8A% z4|IdC=D*@Ct7ZX<90R|}?t)h_zK(OFK3=2R06-cfer~*Os$$@YV{4DB=c#Mw>d+K#fMBVd`_E|QXu_k{J zRm`J(-b!Wc3!B)?{i3C^St7~i+g{FKEZHUo9FU@Y_V$F^p-t3b=z>{{m2$Be?DDy6 zxUP!kPI8RYIJ520(nv>jpIT z0_na$YeS$Pri9^%UP1mDKs?stVbh==Hx8cd=g7YThzEQ%=^7xO@^6{(UbX=Yc-A*k zz}rA;?_k3Hpz+kV9xFcsjYt1Hia!s;^B?UPe;tTl0&7X%1L8LU+R<-^hOJE{u{6%Y zz+mkl4Co9RPxcX1p*v_ip2LlgA!j+DBgB7JYHksANE)QaS7}>0Y^nNHS_waCe55RU5&aUV;_^fB_4yZFhj_8u*H$_@C1&G zW9%Rh^9Ew)5*Uldlf(}W%XBnA#gRy;xEh(r*cQ@1BO!qgtPLjU43s)CHUtUv<|Cor zCgN@+#D7luB54P#CD!{VGM2ITk?r8HuEzrO=zAbG@GI)h@IvDQgb~L8(Vl?13uE7q zzJ(g%WY`lJ7mAEyY%mbxN0EIJ>006jvTsH0#l)~_utx)t?ci+-hzVw(h6WdsUQSv^ zLPJ-PFrxcNsNWXqVEvm&@DIgP8Okex=--V5|4+yy*u1dWycjqT3K&p^gn)OEU~dLu zf);SJ;Yc+k#Pvo(+)!i!V^fguGPDAS@f%P>{F_L~v&yHWX zO&Sw^hx9-Xkx(%McC%3dD8UDQDCsGvp@Bt6NVFLVk8$sjAO8q}_IhLrW4|F&8EY2= zOoP7{AUiUa9R%x-4fF>CPiO2=baaQQM-BD`sG*@+BqV$V2?_Tjp}|u?j5|;M>*Vj$ z%CvU};$H`*A>rhIo$R|&L%t8aSb&5L6d=Lbk2(k0gR$924`VMN;T+yf`~-*%A4d&| zen4iyXE?;PJAi2Kh|Gq!ZnF14-5dUdgX{zAKZP7~&;S)yqlVAwdg6BCUg81babjj` zGd>%c!`J|z@#KUWI=C1$%%DI*{@_s49t#A!mt|rB9FLG=IqEz(7D>O1I-arrM)rlN zCi@lCP%j!^iu=K)1Y(2u#EkI^k>G!s>|4qH5fbwJh-?o%ZpH#6Xb0cMm>?C1JuX5* zg6U+Riy9JdK|=foWIw2X@S@i2uQzPf0=eG+Jm=uyadata->iDim[0], xOff, xFac, - self->data->iDim[1], + self->data->iDim[1] + pInternal->extraDetector, yOff, yFac, pInternal->iBinWidth, diff --git a/tabledrive.c b/tabledrive.c index 0b51db3..70e1c48 100644 --- a/tabledrive.c +++ b/tabledrive.c @@ -40,7 +40,7 @@ static int TableDriveHalt(void *pData){ if(moti.pMot != NULL){ moti.pMot->pDrivInt->Halt(moti.pMot); } - status == LLDnodePtr2Next(self->motorTable); + status = LLDnodePtr2Next(self->motorTable); } self->state = OUTOFSYNC; return 1; @@ -383,6 +383,10 @@ static int TableDriveCheckStatus(void *pData, SConnection *pCon){ return status; } break; + case OUTOFSYNC: + SCWrite(pCon,"WARNING: tabledrive out of sync",eWarning); + return HWFault; + break; default: SCWrite(pCon, "ERROR: programming error in tabledrive, invalid state",