changed sign of temperature offset adjustment of d and F in razorbill
This commit is contained in:
parent
5d0c980e22
commit
4c71e44cd2
@ -61,7 +61,7 @@ class Displacement(Readable):
|
|||||||
# calculate displacement from temperature and capacitance
|
# calculate displacement from temperature and capacitance
|
||||||
d0_T = self.d0_curve['a'] + self.d0_curve['b']*temp + self.d0_curve['c']*temp**2 + self.d0_curve['d']*temp**3 + self.d0_curve['e']*temp**4
|
d0_T = self.d0_curve['a'] + self.d0_curve['b']*temp + self.d0_curve['c']*temp**2 + self.d0_curve['d']*temp**3 + self.d0_curve['e']*temp**4
|
||||||
|
|
||||||
disp = self.alpha290K / (cap - self.Cp) - self.d0 + d0_T
|
disp = self.alpha290K / (cap - self.Cp) - self.d0 - d0_T
|
||||||
|
|
||||||
return disp
|
return disp
|
||||||
|
|
||||||
@ -94,7 +94,7 @@ class Force(Readable):
|
|||||||
alpha = self.alpha290K * (0.91 + 5e-5*temp + 9e-7*temp**2)
|
alpha = self.alpha290K * (0.91 + 5e-5*temp + 9e-7*temp**2)
|
||||||
f0_T = self.f0_curve['a'] + self.f0_curve['b']*temp + self.f0_curve['c']*temp**2 + self.f0_curve['d']*temp**3 + self.f0_curve['e']*temp**4
|
f0_T = self.f0_curve['a'] + self.f0_curve['b']*temp + self.f0_curve['c']*temp**2 + self.f0_curve['d']*temp**3 + self.f0_curve['e']*temp**4
|
||||||
|
|
||||||
force = alpha / (cap - self.Cp) - self.f0 + f0_T
|
force = alpha / (cap - self.Cp) - self.f0 - f0_T
|
||||||
|
|
||||||
return force
|
return force
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user