Baselinelimit now im config
This commit is contained in:
parent
79c96824bd
commit
cad44b8f3c
15
JFSphoto.py
15
JFSphoto.py
@ -115,6 +115,7 @@ class Jfsphoto (object):
|
||||
self.baseline_start=0
|
||||
self.baseline_end=0
|
||||
self.abs_trans= tk.IntVar()
|
||||
self.baseline_limit = tk.IntVar()
|
||||
########## set to transition
|
||||
self.abs_trans.set(1)
|
||||
########## dataframe to load and save photometer data
|
||||
@ -168,8 +169,14 @@ class Jfsphoto (object):
|
||||
self.lab9 = tk.Label(win,textvariable=self.tnm_step).grid(row=3,column=5)
|
||||
self.bt3 = tk.Button(win,text="Calibrieren",command=self.calibrate,state=tk.DISABLED)
|
||||
self.bt3.grid(row=4,column=0)
|
||||
self.bt4 = tk.Button(win,text="Load Config",command=self.conf_read).grid(row=4,column=1)
|
||||
self.bt5 = tk.Button(win,text="Save Config",command=self.conf_write).grid(row=4,column=2)
|
||||
############ limit for the baseline the baseline starts and ends at a higher intensisity depending on
|
||||
# the spectrum of the light source
|
||||
self.lab10 = tk.Label(win,text="threshold for the baseline").grid(row=5,column=0,columnspan=2, sticky="w")
|
||||
self.en3 = tk.Entry(win,textvariable=self.baseline_limit, width= 10).grid(row=5,column=2)
|
||||
############ Save Load config
|
||||
self.bt4 = tk.Button(win,text="Load Config",command=self.conf_read).grid(row=6,column=0)
|
||||
self.bt5 = tk.Button(win,text="Save Config",command=self.conf_write).grid(row=6,column=1)
|
||||
|
||||
########### dialog modal
|
||||
win.focus_set()
|
||||
win.grab_set()
|
||||
@ -211,7 +218,7 @@ class Jfsphoto (object):
|
||||
return 0
|
||||
else:
|
||||
for i in range(0,3694):
|
||||
if (base[i] < 200) :
|
||||
if (base[i] < int(self.baseline_limit.get())) :
|
||||
if doIt:
|
||||
if left:
|
||||
self.baseline_start = i
|
||||
@ -366,6 +373,7 @@ class Jfsphoto (object):
|
||||
config.set('main','nm_left',str(self.nm_left))
|
||||
config.set('main','nm_right',str(self.nm_right))
|
||||
config.set('main','nm_step',str(self.nm_step))
|
||||
config.set('main','baseline_limit',str(self.baseline_limit.get()))
|
||||
if ('methods') in lis:
|
||||
config.remove_section('methods')
|
||||
with open('config.ini','w') as f:
|
||||
@ -393,6 +401,7 @@ class Jfsphoto (object):
|
||||
self.nm_step = float(config.get('main','nm_step',fallback='0'))
|
||||
self.tnm_step.set(config.get('main','nm_step',fallback='0'))
|
||||
self.set_nm_scale()
|
||||
self.baseline_limit.set(int(config.get('main','baseline_limit',fallback='20')))
|
||||
if 'methods' in config.sections():
|
||||
for i in config['methods']:
|
||||
s = config.get('methods',i)
|
||||
|
||||
@ -2,6 +2,7 @@
|
||||
nm_left = 320.0
|
||||
nm_right = 811.0
|
||||
nm_step = 0.13279
|
||||
baseline_limit = 50
|
||||
|
||||
[methods]
|
||||
crystal = 1,576,mymol,0.0,5,15|1,3.0,0.23294505746566566,80,100000|2,6.0,0.5003896696237482,80,100000|3,9.0,0.6314310052189019,80,100000|4,12.0,0.7934140103632163,80,100000|5,15.0,1.1044743475181251,80,100000
|
||||
|
||||
3698
crystalviolet_xenon.dat
Normal file
3698
crystalviolet_xenon.dat
Normal file
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user