Linewith auf 0.6 absorbanz statt absorption
This commit is contained in:
parent
3f38ecf348
commit
2f30b91c99
12
JFSphoto.py
12
JFSphoto.py
@ -294,7 +294,7 @@ class Jfsphoto (object):
|
|||||||
|
|
||||||
|
|
||||||
def do_math(self):
|
def do_math(self):
|
||||||
stati = [("Raw",1),("Raw + Baseline",2),("Transmission",4),("Absorption",3)]
|
stati = [("Raw",1),("Raw + Baseline",2),("Transmission",4),("Absorbanz",3)]
|
||||||
|
|
||||||
win = tk.Toplevel()
|
win = tk.Toplevel()
|
||||||
self.center = tk.Frame(win, bg='gray2', width=50, height=40, padx=3, pady=3)
|
self.center = tk.Frame(win, bg='gray2', width=50, height=40, padx=3, pady=3)
|
||||||
@ -355,7 +355,7 @@ class Jfsphoto (object):
|
|||||||
self.get_kin_list()
|
self.get_kin_list()
|
||||||
self.do_get_range()
|
self.do_get_range()
|
||||||
for xx in self.col_list:
|
for xx in self.col_list:
|
||||||
self.do_absorption(xx)
|
self.do_absorbanz(xx)
|
||||||
for xx in self.col_list:
|
for xx in self.col_list:
|
||||||
self.do_transmission(xx)
|
self.do_transmission(xx)
|
||||||
return True
|
return True
|
||||||
@ -401,7 +401,7 @@ class Jfsphoto (object):
|
|||||||
if (self.left==0 and count > 5):
|
if (self.left==0 and count > 5):
|
||||||
self.left=i
|
self.left=i
|
||||||
|
|
||||||
def do_absorption(self,xx):
|
def do_absorbanz(self,xx):
|
||||||
y = self.df['darkline'] - self.df[xx]
|
y = self.df['darkline'] - self.df[xx]
|
||||||
b = self.df['baseline']
|
b = self.df['baseline']
|
||||||
c = np.zeros(3694, np.float32)
|
c = np.zeros(3694, np.float32)
|
||||||
@ -409,7 +409,8 @@ class Jfsphoto (object):
|
|||||||
if b[i]==0:
|
if b[i]==0:
|
||||||
c[i] = 1
|
c[i] = 1
|
||||||
else:
|
else:
|
||||||
c[i] = y[i]/b[i]
|
#c[i] = y[i]/b[i]
|
||||||
|
c[i] = np.log10(b[i]/y[i])
|
||||||
self.df[xx+'_abs'] = c
|
self.df[xx+'_abs'] = c
|
||||||
|
|
||||||
def do_transmission(self,xx):
|
def do_transmission(self,xx):
|
||||||
@ -420,7 +421,8 @@ class Jfsphoto (object):
|
|||||||
if b[i]==0:
|
if b[i]==0:
|
||||||
c[i] = 1
|
c[i] = 1
|
||||||
else:
|
else:
|
||||||
c[i] = np.log10(b[i]/y[i])
|
c[i] = y[i]/b[i]
|
||||||
|
#c[i] = np.log10(b[i]/y[i])
|
||||||
self.df[xx+'_trans'] = c
|
self.df[xx+'_trans'] = c
|
||||||
|
|
||||||
def look(self):
|
def look(self):
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue
Block a user