jens/otterpy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

baseline transmision absorption implementet

Browse Source
This commit is contained in:
jens 2020-11-29 17:09:30 +01:00
parent d9a8a0e286
commit dafa79fbb4
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
CCDpanelsetup.py
View File

@ -236,6 +236,8 @@ class buildpanel(tk.Frame):
base = self.jf.darkData16-config.rxData16 base = self.jf.darkData16-config.rxData16
if (self.jf.do_save_baseline(base)==1): if (self.jf.do_save_baseline(base)==1):
self.jfsbase_check.config(state=tk.NORMAL) self.jfsbase_check.config(state=tk.NORMAL)
self.jfsbase_transmission.config(state=tk.NORMAL)
self.jfsbase_absorption.config(state=tk.NORMAL)
self.jfstitel = tk.Label(self, text=' Photometer ') self.jfstitel = tk.Label(self, text=' Photometer ')
#self.jfstitel.config(font=("Courier",0)) #self.jfstitel.config(font=("Courier",0))
@ -252,6 +254,11 @@ class buildpanel(tk.Frame):
self.jfsbase.grid(row=15,column=4) self.jfsbase.grid(row=15,column=4)
self.jfsbase_check = tk.Checkbutton(self,text="Baseline on/off",variable=self.jf.baseline_checked,state=tk.DISABLED,command=lambda CCDplot=CCDplot: self.updateplot(CCDplot)) self.jfsbase_check = tk.Checkbutton(self,text="Baseline on/off",variable=self.jf.baseline_checked,state=tk.DISABLED,command=lambda CCDplot=CCDplot: self.updateplot(CCDplot))
self.jfsbase_check.grid(row=16,column=4) self.jfsbase_check.grid(row=16,column=4)
self.jfsbase_absorption = tk.Radiobutton(self,text="Absorption",variable=self.jf.abs_trans,value=0,state=tk.DISABLED,command=lambda CCDplot=CCDplot: self.updateplot(CCDplot))
self.jfsbase_absorption.grid(row=17,column=4)
self.jfsbase_transmission = tk.Radiobutton(self,text="Transmision",variable=self.jf.abs_trans,value=1,state=tk.DISABLED,command=lambda CCDplot=CCDplot: self.updateplot(CCDplot))
self.jfsbase_transmission.grid(row=18,column=4)
### Callbacks for traces, buttons, etc ### ### Callbacks for traces, buttons, etc ###
def callback(self): def callback(self):
self.bopen.config(state=tk.DISABLED) self.bopen.config(state=tk.DISABLED)
@ -337,12 +344,13 @@ class buildpanel(tk.Frame):
config.pltData16[i] = 1 config.pltData16[i] = 1
else: else:
config.pltData16[i] = (config.pltData16[i] / config.pltBaseData16[i]) config.pltData16[i] = (config.pltData16[i] / config.pltBaseData16[i])
config.pltData16 = 100*config.pltData16 if (self.jf.abs_trans.get()==1):
config.pltData16 = np.log10(config.pltData16)*-1
up = np.max(config.pltData16) + 50 up = np.max(config.pltData16)
if (self.jf.get_nm_checked()==1): if (self.jf.get_nm_checked()==1):
CCDplot.a.plot(self.jf.get_nm_scale(),config.pltData16) CCDplot.a.plot(self.jf.get_nm_scale(),config.pltData16)
CCDplot.a.axis([self.jf.nm_left,self.jf.nm_right,-10,up]) CCDplot.a.axis([self.jf.nm_left,self.jf.nm_right,0,up])
CCDplot.a.set_xlim([self.jf.nm_left+self.jf.baseline_start*self.jf.nm_step, self.jf.nm_left+self.jf.baseline_end*self.jf.nm_step]) CCDplot.a.set_xlim([self.jf.nm_left+self.jf.baseline_start*self.jf.nm_step, self.jf.nm_left+self.jf.baseline_end*self.jf.nm_step])
CCDplot.a.set_xlabel(" [nm] ") CCDplot.a.set_xlabel(" [nm] ")
else: else:
@ -369,10 +377,10 @@ class buildpanel(tk.Frame):
#plot intensities #plot intensities
if (config.datainvert == 1): if (config.datainvert == 1):
## make max visible ## make max visible
up = np.max(config.pltData16) + 50 up = np.max(config.pltData16)
if (self.jf.get_nm_checked()==1): if (self.jf.get_nm_checked()==1):
CCDplot.a.plot(self.jf.get_nm_scale(),config.pltData16) CCDplot.a.plot(self.jf.get_nm_scale(),config.pltData16)
CCDplot.a.axis([self.jf.nm_left,self.jf.nm_right,-10,up]) CCDplot.a.axis([self.jf.nm_left,self.jf.nm_right,0,up])
CCDplot.a.set_xlabel(" [nm] ") CCDplot.a.set_xlabel(" [nm] ")
else: else:
CCDplot.a.plot(config.pltData16) CCDplot.a.plot(config.pltData16)

3
JFSphoto.py
View File

@ -35,6 +35,9 @@ class Jfsphoto (object):
self.baseline_checked.set(0) self.baseline_checked.set(0)
self.baseline_start=0 self.baseline_start=0
self.baseline_end=0 self.baseline_end=0
self.abs_trans= tk.IntVar()
########## set to transition
self.abs_trans.set(1)
def do_calibrate(self): def do_calibrate(self):
win = tk.Toplevel() win = tk.Toplevel()