diff --git a/JFSphoto.py b/JFSphoto.py index e6a4b17..b37d4e1 100644 --- a/JFSphoto.py +++ b/JFSphoto.py @@ -294,7 +294,7 @@ class Jfsphoto (object): 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() 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.do_get_range() for xx in self.col_list: - self.do_absorption(xx) + self.do_absorbanz(xx) for xx in self.col_list: self.do_transmission(xx) return True @@ -401,7 +401,7 @@ class Jfsphoto (object): if (self.left==0 and count > 5): self.left=i - def do_absorption(self,xx): + def do_absorbanz(self,xx): y = self.df['darkline'] - self.df[xx] b = self.df['baseline'] c = np.zeros(3694, np.float32) @@ -409,7 +409,8 @@ class Jfsphoto (object): if b[i]==0: c[i] = 1 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 def do_transmission(self,xx): @@ -420,7 +421,8 @@ class Jfsphoto (object): if b[i]==0: c[i] = 1 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 def look(self): diff --git a/__pycache__/CCDfiles.cpython-37.pyc b/__pycache__/CCDfiles.cpython-37.pyc index d2fc82a..4182e8c 100644 Binary files a/__pycache__/CCDfiles.cpython-37.pyc and b/__pycache__/CCDfiles.cpython-37.pyc differ diff --git a/__pycache__/CCDhelp.cpython-37.pyc b/__pycache__/CCDhelp.cpython-37.pyc index a04766f..7ebb0e4 100644 Binary files a/__pycache__/CCDhelp.cpython-37.pyc and b/__pycache__/CCDhelp.cpython-37.pyc differ diff --git a/__pycache__/CCDmenusetup.cpython-37.pyc b/__pycache__/CCDmenusetup.cpython-37.pyc index 47206ab..076f217 100644 Binary files a/__pycache__/CCDmenusetup.cpython-37.pyc and b/__pycache__/CCDmenusetup.cpython-37.pyc differ diff --git a/__pycache__/CCDpanelsetup.cpython-37.pyc b/__pycache__/CCDpanelsetup.cpython-37.pyc index fb1d8b8..a3bfb5a 100644 Binary files a/__pycache__/CCDpanelsetup.cpython-37.pyc and b/__pycache__/CCDpanelsetup.cpython-37.pyc differ diff --git a/__pycache__/CCDplots.cpython-37.pyc b/__pycache__/CCDplots.cpython-37.pyc index a5a3b00..9bf2dc0 100644 Binary files a/__pycache__/CCDplots.cpython-37.pyc and b/__pycache__/CCDplots.cpython-37.pyc differ diff --git a/__pycache__/CCDserial.cpython-37.pyc b/__pycache__/CCDserial.cpython-37.pyc index 9ccc80c..a0c1183 100644 Binary files a/__pycache__/CCDserial.cpython-37.pyc and b/__pycache__/CCDserial.cpython-37.pyc differ diff --git a/__pycache__/JFSphoto.cpython-37.pyc b/__pycache__/JFSphoto.cpython-37.pyc index e3d6671..c62904f 100644 Binary files a/__pycache__/JFSphoto.cpython-37.pyc and b/__pycache__/JFSphoto.cpython-37.pyc differ diff --git a/__pycache__/config.cpython-37.pyc b/__pycache__/config.cpython-37.pyc index 7b96250..a6fb63c 100644 Binary files a/__pycache__/config.cpython-37.pyc and b/__pycache__/config.cpython-37.pyc differ