linse/frappy
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

secop_psi.softcal: default path for calib

Browse Source 
Change-Id: I5ad2159587f13e1a0bcb75764397d4c784ed1c87
This commit is contained in:
zolliker
2021-11-08 14:24:09 +01:00
parent 3d9e9c59d6
commit 7690481938
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cfg/sim_uniax.cfg
View File

@ -40,5 +40,5 @@ value.datatype = {"type":"double", "unit":"Ohm"}
class=secop_psi.softcal.Sensor class=secop_psi.softcal.Sensor
description=temperature sensor, soft calibration description=temperature sensor, soft calibration
rawsensor=res rawsensor=res
calib = /home/l_samenv/frappy/secop_psi/calcurves/X132254.340 calib = X132254
value.unit = "K" value.unit = "K"

2
cfg/uniax.cfg
View File

@ -49,5 +49,5 @@ channel = A
[T] [T]
class = secop_psi.softcal.Sensor class = secop_psi.softcal.Sensor
rawsensor = res rawsensor = res
calib = /home/l_samenv/frappy/secop_psi/calcurves/X132254.340 calib = X132254
value.unit = K value.unit = K

6
secop_psi/softcal.py
View File

@ -22,7 +22,7 @@
import math import math
import os import os
from os.path import basename, exists, join from os.path import basename, dirname, exists, join
import numpy as np import numpy as np
from scipy.interpolate import splev, splrep # pylint: disable=import-error from scipy.interpolate import splev, splrep # pylint: disable=import-error
@ -109,7 +109,9 @@ class CalCurve:
calibname = sensopt.pop(0) calibname = sensopt.pop(0)
_, dot, ext = basename(calibname).rpartition('.') _, dot, ext = basename(calibname).rpartition('.')
kind = None kind = None
for path in os.environ.get('FRAPPY_CALIB_PATH', '').split(','): pathlist = os.environ.get('FRAPPY_CALIB_PATH', '').split(',')
pathlist.append(join(dirname(__file__), 'calcurves'))
for path in pathlist:
# first try without adding kind # first try without adding kind
filename = join(path.strip(), calibname) filename = join(path.strip(), calibname)
if exists(filename): if exists(filename):