From 8ed87df48f6942eb64087bf43bcf47c7a0dbe6b1 Mon Sep 17 00:00:00 2001 From: l_maliakal_d Date: Tue, 18 Sep 2012 15:12:08 +0000 Subject: [PATCH] edited writesettings for gotthard to not include hv, ipaddress etc and edited loadsettings to allow .settings git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@258 951219d9-93cf-4727-9268-0efd64621fa3 --- .../slsDetector/slsDetector.cpp | 5 ++++- .../angularConversionStatic.o | Bin 12720 -> 11384 bytes .../slsDetectorAnalysis/energyConversion.cpp | 4 ---- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/slsDetectorSoftware/slsDetector/slsDetector.cpp b/slsDetectorSoftware/slsDetector/slsDetector.cpp index e27d44653..515ed58ba 100644 --- a/slsDetectorSoftware/slsDetector/slsDetector.cpp +++ b/slsDetectorSoftware/slsDetector/slsDetector.cpp @@ -5103,10 +5103,13 @@ int slsDetector::loadSettingsFile(string fname, int imod) { for (int im=mmin; immyDetectorType==GOTTHARD) + myMod->reg=thisDetector->currentSettings; myMod=readSettingsFile(fn, thisDetector->myDetectorType); if (myMod) { myMod->module=im; diff --git a/slsDetectorSoftware/slsDetectorAnalysis/angularConversionStatic.o b/slsDetectorSoftware/slsDetectorAnalysis/angularConversionStatic.o index b8f022cf9038c4d75cc1e9c0b56bb9fc16aa7d15..0bc7d3b3dc0482914539a8ee3ba66f0cf940a83c 100644 GIT binary patch delta 2992 zcmaKue{56N701uJ_Df9S*iK?4j$?xBIEF&PG6-GQ(2Y790i2)bwcaK?9B4+<$h~r*#(5Bhn*^WQYN!d;y&w0^yLV3;)Z6_Sh zvj%J{n&&(OCv9cM-@7#X&eZdLYEG5`k7l>ovCS0!#Q7qeF>AqIWZ3R)q5jIGwJG9s_%RA@CduNi?e5=*$ zePRqlCI;ro`}iwp!5y7)487{;@-H?WmOq_8=HzHPcs(eP3kqBha;Hgx5(7T!kGEWp z4dr4(*JFJ*G$+r?gL4i4{~0~L9i(KX;iO887(;4qiB8{Kb;4ROkcid_E9yP=$B(mF zy}wCo>iF;1t2zfejn??>x&(50rCj=uQNNwhCueWSi7PL;xzr=D^RhGg#O|nb@;~{x zap!`u;F|`=^P_#a=v+z`*YN3~lU+XJ)uFEGy!iCajFi!}^v<`_*4ya}is_*0_rObs zqM3zkHoMr9w5HRGJ7(uChAmz!AH2hmN?7woE^k)Ad+YhSo7k|YJ8|8e! ztTTfA6n?|}EBrR`K4;K1wkhgdgG{lfxY`y?B9;~}=R1pPd5de%XyuEpsL{!js+N6A zJ~B$#T@pw=T5_8*PI1cpOFmh)&*+vQZuC5pdfii^{D(2fV%bMHY1kP<`?x9gD<%Ryl%H(YSXK$v znNKOY^;zRBgFZB*{e1;@M48-HRmb0{IPl(KB2AN_~nck^SFwec6wdIQ7Wg0j0|r1peEW*Wi$&0?YwjOMI_$gM>8Pr=$# zLUf-z-}dQ#Dd&+=qQRStPwjW5TK!!Pb-9dBR7Z;Tt{~ds;NMh7RELKrt7B$|hsfZ+ zR#$Q;;1hFoAf{el#rFf99zGO^nfD{4k{=6H^4WmT+za(MzZIxA=h52DqcxT6uJNf| zUaqT&sf(+4GjPDm-vu(O_$2VCm(SJ2%%{CX0eh|mJaBatdx9}@7^cfMJAyvtYUBrC zo`G3m5B+S=XTAXy;#0wTGtfx1i^qfYD&ymi5m;4@gxG=WYkjJ!oVV7-)b0R(5AfIV z^R)*Rswo&+S%tVyE(iJOZm1E(TS9fExqVdRN+m*FhT2@lmzJ)M??8y$7389G$nG%O zKGck82bjBjXw(+y6$N@-fxZWN4R(Ab#+C7YP|$x&QJlI_FMD->iQwEN6W&>%+Y9uz z0)4DNKUbiC0i7#TSy0yT<=k|5YcyBe#k=U)3n3iRm${SWS1wpP7Y#7CFaHTY5R zF^nZMox$O_0~)ny>v3rNK=7N(o-ysx=iczw)ktaTLO7~88mZxJ^-H-v66A2SiQkX( z@NBf6BasmAjXuB!>Ngf|-Tv^NK5I9huHTw+H*^~AmY#?A_tQ7Nw!ME(ACK1i`JLtE zsYI;TjK79yjV1U7VFwJX`CU*gCz=zDHC+?p&We94(Q+h8;u=A<5|xRzLS6m=lyUwn zdNtACg`XjMU;F>oei2?zH4}M2#K);h3_Q@FJDL_dXr1;qX}?4J_i4XJ`wwZqPy0u- ze^mP?wEv>^eculz3_ITwL*OB+k~Gd>H_6WyM=cU zJt#h2;1OXf(LvpRMEgfYW5N@n@dxCLa6QUR7+*_tNgMwHjVMxsYEWOmp#nv>Xx**Z zC)`MMNb@JcyKtU`n~44-w1{Sen~6Ts+Uz4aiAL%>g%fRhK7eHeP&om!ten}1t delta 3994 zcma)94Nz3q6+Z7RZ(R`C4J_;`e+#S|3reA4Lt;#n@ce81i{O|hG!j_UWW^}hS`FPK zTRU#n81<%Or|nS3&NRQxw8dI&X$5us%@~trIyKoPI~meop=Q(3*0Cn^J8$n(vNoN( z;q7<7@0@e*x%ZxXce%RqS1r3d>fL#}OJ5Z;EHl)DBm$P11@4pe-Za8NfSZk>B!H9mjKdxHznh0&{>s-i7G7&CvNyOIi z>DiaV5W`Ndu|DijDu%83!HXv_kP&XN=(ZR|{X@}B@e5r8_TT9P2Qu5jdi27&=zC3x z3+o0VdSa$tWqzjZQeAY0;grv0V=I$0j8$?Bq6`-0T!Y z-U!Hy5qpKY9MoBJ)3?C%Ex6gC<8#e{(;PQE`Txhr?hPlElkh~;P@fW3BX`P-F+i-T z&m0b^#hOl;46}(folgc^bWg;nxC*ghd`@K|by2IZ>fyBHB8MNwg3C59_;m3{ZIbv% zvkR-WxO_NWZt}1zq+eFB1v7Q8eaG2PM@MB5M)cm$@rH+*#M!hCWwy9i^C%0%Dy>L) zKm_r*Qgq|fk4}q}$3)a<|3}kXQ0KCw%{n<|ZZRsv$rWPX`I;$V@v)-D+;41!G4~`x zMHq8WmX|X*_YPz3w-nTup8Le)%JN3o#*`kKVoq9~%Pgl%(}wL!wK+^%vK%-r$Z?TI zhjKLB7#(AdHO2XGU5hmxis^@9LpWkv)Xpquv4Z4AB`py>8cP<4Ve~$6(^7M$Pvxbx|ER9#$(=%+%Q}SDIJ|m5`=k$@(GU?_Othi+b zr;n)~8D$>fPpo-8ZdFD7$*9GBZ@?U(w0H>8PHF z>O)ce{OM!VO=59YX-&&Ue{<*B_SK$s{*9{{n>TK3{%(hdTGlkTxBCMg@~rLfJlfpq zq2^Y6c_lUDu_bsY$Xhiwi zOIDh_C85z7<(d*pqwSgx+c2imHiE zvJ1s#`{v+EOh?CS-0^d=Y}?ej32>nTytDCk<8|TvU-nhd58`!xf&D4yXYfY8z`l>D zlvd!V6j@RRs1I20oid=~IWQgf$o75S6(;?GjvaM0IYC2;@36+igT~@pNvPHiVX6Y{<(I zy}1r`X|_0rm_(KM7hp}cD9ZDxwrVjK5Xctoc|L7>Hj&#H>$NZlffg18T&%@D6c zoKh{aTt4k3h}lNh_q!ZgFW8f!*;S_1RugR&VON=2>lClUv5hyh-DeByxTQylhzn}x^&e3)YY z7`zj8_XHAQ`x=yyS&q#2gPRZc|6&S1XjyWzJ~<%WDB@%Y2h^tUc`1BH3hx(M!F2Vi zP25#bG`R?c?L#Nr@gW?NdhjWdUjR1>Uvw4xL^DcU6c#?DqL#N5dQ~yW(<%-X7g(2f z*0ikOBwQtP$D!$OZw-i&+jB*zqze+r-Widrw{2x3u85F}i}3w*uA4_&LKIDehs!TJB~2cA_K9;dh)lQhtXy zj^TTZRrsy z(KhDj=m<89J2=6JfzJYY;3y;F2c>;P>Q|-Cml4O=fb8#LtU|H*j0VvRiL-z_pw1iv z{*5^TFEK~pC?f_Mhy7yR4rINEu?qc3y;AD4q^?VSk<=e%3?iUa8UoU=l@WSK>Jh2` zSnB(w{)*HOOTC|UBz~GX5?^RdCb*0dE42d1iLPeE1l9wCJcI8@Lr5ATK-PuS_cJ1) zUrX$hcnZh^o@b5$_uyJr@zwoz#;@bsi}4Pu5bhfl|6~+0-bplz5m(wbY}kMGE}};u z@PKWM$nDRU&M zWq>2mQpS3sI~aAGh9EcQ5;aMoopB!aUh)?te_8V1Oa7+hamlYpZXKVD&u7E{Qzd_& zaXu20n1@NJ3$XtyxUmq$An_TAFG~CaBbM|7#`}r>!HAW*0_2ss&RC9j0`v;pY>b%s zBp}bclsRTTjS;mlk8u%EBjaN1|0ZtC!HgMk_wEI9$K8zR_~)#n;{%N7xR>>5xQLje zQ{FswCDkVgh>^A0TRQ0GH$U1yIQpCn}zqf1K|sTrYzX)A+6epTLN2 Qy^>Fpyk7D}lDA6!Uk=5CAOHXW diff --git a/slsDetectorSoftware/slsDetectorAnalysis/energyConversion.cpp b/slsDetectorSoftware/slsDetectorAnalysis/energyConversion.cpp index 455ca9908..c69b52b1e 100644 --- a/slsDetectorSoftware/slsDetectorAnalysis/energyConversion.cpp +++ b/slsDetectorSoftware/slsDetectorAnalysis/energyConversion.cpp @@ -271,10 +271,6 @@ int energyConversion::writeSettingsFile(string fname, detectorType myDetectorTyp names[id++]="Vin"; names[id++]="Vref_comp"; names[id++]="Vib_test"; - names[id++]="config"; - names[id++]="HV"; - names[id++]="macaddress"; - names[id++]="ipaddress"; break; default: cout << "Unknown detector type - unknown format for settings file" << endl;