Commit 2e5c1789 authored by reiche's avatar reiche

New version with higher response rate, new TOF channels of Didier and fixing...

New version with higher response rate, new TOF channels of Didier and fixing the bug of LH for intermediate positions
parent 1994da6e
......@@ -36,20 +36,7 @@
</rect>
</property>
<property name="channel" stdset="0">
<string notr="true">SF-BC-SERVER:STATUS</string>
</property>
</widget>
<widget class="caLineEdit" name="serveractivity">
<property name="geometry">
<rect>
<x>280</x>
<y>300</y>
<width>281</width>
<height>20</height>
</rect>
</property>
<property name="channel" stdset="0">
<string notr="true">SF-BC-SERVER:ACTIVITY</string>
<string notr="true">SF-BC-SERVER:ALARM</string>
</property>
</widget>
<widget class="caMenu" name="camenu">
......@@ -152,7 +139,7 @@
</font>
</property>
<property name="text">
<string>Server</string>
<string>Alarm</string>
</property>
</widget>
<widget class="caNumeric" name="canumeric">
......@@ -423,7 +410,7 @@
<property name="geometry">
<rect>
<x>280</x>
<y>330</y>
<y>314</y>
<width>281</width>
<height>20</height>
</rect>
......@@ -534,7 +521,7 @@
</rect>
</property>
<property name="channel" stdset="0">
<string notr="true">SINLH:TOF</string>
<string notr="true">SINLH02:TOF</string>
</property>
<property name="unitsEnabled">
<bool>true</bool>
......@@ -550,7 +537,7 @@
</rect>
</property>
<property name="channel" stdset="0">
<string notr="true">SINLH:R56</string>
<string notr="true">SINLH02:R56</string>
</property>
<property name="unitsEnabled">
<bool>true</bool>
......@@ -566,7 +553,7 @@
</rect>
</property>
<property name="channel" stdset="0">
<string notr="true">SINBC:TOF</string>
<string notr="true">SINBC02:TOF</string>
</property>
<property name="unitsEnabled">
<bool>true</bool>
......@@ -582,7 +569,7 @@
</rect>
</property>
<property name="channel" stdset="0">
<string notr="true">S10BC:TOF</string>
<string notr="true">S10BC02:TOF</string>
</property>
<property name="unitsEnabled">
<bool>true</bool>
......@@ -598,7 +585,7 @@
</rect>
</property>
<property name="channel" stdset="0">
<string notr="true">SINBC:R56</string>
<string notr="true">SINBC02:R56</string>
</property>
<property name="unitsEnabled">
<bool>true</bool>
......@@ -614,7 +601,7 @@
</rect>
</property>
<property name="channel" stdset="0">
<string notr="true">S10BC:R56</string>
<string notr="true">S10BC02:R56</string>
</property>
<property name="unitsEnabled">
<bool>true</bool>
......@@ -747,7 +734,7 @@
<x>0</x>
<y>0</y>
<width>636</width>
<height>25</height>
<height>23</height>
</rect>
</property>
</widget>
......
This diff is collapsed.
......@@ -30,7 +30,8 @@ class BCcal:
if (BC=='LH'): ## calibration data
self.magtype='AFL'
self.off2del=[ -0.000000e+00, -1.885013e-01, -1.569589e-16]
# self.off2del=[ 4.31e-18, -1.885013e-01, -1.569589e-16]
self.off2del=[ 1.2567e-2, 6.2833e-02, -1.04e-16]
self.ang2del=[2.444974e-01, -1.728179e-03 , -0.000000e+00]
self.ang2r56=[ 1.471816e-01, -2.076526e-03, -5.625735e-19]
self.off2cur=[ -8.616596e-18, 1.340000e+00, -1.115774e-15]
......@@ -38,6 +39,7 @@ class BCcal:
self.Energy=self.refEnergy;
self.cal=True;
if (BC=='BC2'): ## calibration data
self.magtype='AFBC3'
self.off2del=[4.398750e-04, 2.720996e-04,-9.118231e-02]
......@@ -67,7 +69,7 @@ class BCcal:
res=x*x*pol[0]+x*pol[1]+pol[2]
return res
def invertquadratic(self,y,pol):
def invertquadratic(self,y,pol):
a=pol[1]/pol[0]
b=(pol[2]-y)/pol[0]
arg=0.25*a*a-b
......
......@@ -21,7 +21,7 @@ freq=5712e6; % C-band frequency
% measurement LH - artifially do a line
Offset=-[0 10 20];
Offset=-[0 15 20];
Phi = [4.07 2.035 0];
I1 = [ 0 13.4 26.8];
E1 = 137.04;
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment