projects
/
calibcant.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6894d65
)
Use relative imports (PEP 328) for calibcant sibling imports.
author
W. Trevor King
<wking@drexel.edu>
Tue, 1 Jun 2010 12:30:56 +0000
(08:30 -0400)
committer
W. Trevor King
<wking@drexel.edu>
Tue, 1 Jun 2010 12:30:56 +0000
(08:30 -0400)
calibcant/T_analyze.py
patch
|
blob
|
history
calibcant/__init__.py
patch
|
blob
|
history
calibcant/analyze.py
patch
|
blob
|
history
calibcant/bump.py
patch
|
blob
|
history
calibcant/bump_analyze.py
patch
|
blob
|
history
calibcant/calibrate.py
patch
|
blob
|
history
calibcant/common.py
patch
|
blob
|
history
calibcant/config.py
patch
|
blob
|
history
calibcant/vib_analyze.py
patch
|
blob
|
history
diff --git
a/calibcant/T_analyze.py
b/calibcant/T_analyze.py
index d4ddf726f07b7aa07a0082eeba20f37d25860509..faf88563d475ad40b8f9aaacef5a7cea8597a60b 100755
(executable)
--- a/
calibcant/T_analyze.py
+++ b/
calibcant/T_analyze.py
@@
-33,13
+33,15
@@
The relevant physical quantities are :
"""
import numpy
"""
import numpy
-import common # common module for the calibcant package
-import config # config module for the calibcant package
+
import data_logger
import data_logger
-import linfit
from splittable_kwargs import splittableKwargsFunction, \
make_splittable_kwargs_function
from splittable_kwargs import splittableKwargsFunction, \
make_splittable_kwargs_function
+import .common
+import .config
+
+
def C_to_K(celsius) :
"Convert Celsius -> Kelvin."
return celsius + 273.15
def C_to_K(celsius) :
"Convert Celsius -> Kelvin."
return celsius + 273.15
diff --git
a/calibcant/__init__.py
b/calibcant/__init__.py
index 05f8fad10ba81ac0e71b8819e39432eea4c64d89..34670a523b8f7b8cae3cbffb73ac16077fdc9d9a 100644
(file)
--- a/
calibcant/__init__.py
+++ b/
calibcant/__init__.py
@@
-21,4
+21,4
@@
# write to Trevor King, Drexel University, Physics Dept., 3141 Chestnut St.,
# Philadelphia PA 19104, USA.
# write to Trevor King, Drexel University, Physics Dept., 3141 Chestnut St.,
# Philadelphia PA 19104, USA.
-from common import VERSION
+from
.
common import VERSION
diff --git
a/calibcant/analyze.py
b/calibcant/analyze.py
index c4850095366319d370845b157cc1c35fe8e47e0a..626e3eacd733b866b21874c88c14040bb1721d63 100755
(executable)
--- a/
calibcant/analyze.py
+++ b/
calibcant/analyze.py
@@
-47,13
+47,15
@@
Which are related by the parameters :
"""
import numpy
"""
import numpy
+
+import data_logger
from splittable_kwargs import splittableKwargsFunction, \
make_splittable_kwargs_function
from splittable_kwargs import splittableKwargsFunction, \
make_splittable_kwargs_function
-import data_logger
-import common # common module for the calibcant package
-import config # config module for the calibcant package
-import T_analyze # T_analyze module for the calibcant package
+import .common
+import .config
+import .T_analyze
+
kb = 1.3806504e-23 # Boltzmann's constant in J/K
kb = 1.3806504e-23 # Boltzmann's constant in J/K
diff --git
a/calibcant/bump.py
b/calibcant/bump.py
index 04e8b195366ae1b4c14c5186cad9b8e41be8b60a..d2f83bac15c4fefa33c178dfa923f1b6431fbb7b 100644
(file)
--- a/
calibcant/bump.py
+++ b/
calibcant/bump.py
@@
-73,11
+73,13
@@
A family name without any _* extension (e.g. bump()),
import numpy
import time
import numpy
import time
+
import data_logger
import data_logger
-import piezo.z_piezo_utils as z_piezo_utils
import FFT_tools
import FFT_tools
-import linfit
-from calibcant_bump_analyze import bump_analyze
+import piezo.z_piezo_utils as z_piezo_utils
+
+from .bump_analyze import bump_analyze
+
LOG_DATA = True # quietly grab all real-world data and log to LOG_DIR
LOG_DIR = '$DEFAULT$/calibrate_cantilever'
LOG_DATA = True # quietly grab all real-world data and log to LOG_DIR
LOG_DIR = '$DEFAULT$/calibrate_cantilever'
diff --git
a/calibcant/bump_analyze.py
b/calibcant/bump_analyze.py
index 37839367d5b70420aba06595f9dc5518ace812cd..8291b0eed667cdb9f9aa61e1f229279715f6a974 100755
(executable)
--- a/
calibcant/bump_analyze.py
+++ b/
calibcant/bump_analyze.py
@@
-47,12
+47,14
@@
slope Vphoto/Vout is converted to photoSensitivity with bump_analyze().
import numpy
import scipy.optimize
import numpy
import scipy.optimize
-import common # common module for the calibcant package
-import config # config module for the calibcant package
+
import data_logger
from splittable_kwargs import splittableKwargsFunction, \
make_splittable_kwargs_function
import data_logger
from splittable_kwargs import splittableKwargsFunction, \
make_splittable_kwargs_function
+import .common
+import .config
+
@splittableKwargsFunction()
def Vzp_bits2nm(data_bits, zpGain=config.zpGain,
@splittableKwargsFunction()
def Vzp_bits2nm(data_bits, zpGain=config.zpGain,
diff --git
a/calibcant/calibrate.py
b/calibcant/calibrate.py
index a485bf4dc524edab8a5b9c537c63d34341ddf4c7..5789f7f69ed88e2e23e4131194f8f84040ad8a1b 100755
(executable)
--- a/
calibcant/calibrate.py
+++ b/
calibcant/calibrate.py
@@
-104,17
+104,19
@@
which make automating the calibration procedure more straightforward.
import numpy
import time
import numpy
import time
+
+import FFT_tools
import piezo.z_piezo_utils as z_piezo_utils
from splittable_kwargs import splittableKwargsFunction, \
make_splittable_kwargs_function
import piezo.z_piezo_utils as z_piezo_utils
from splittable_kwargs import splittableKwargsFunction, \
make_splittable_kwargs_function
-import FFT_tools
-import common
-import config
-import bump_analyze
-import T_analyze
-import vib_analyze
-import analyze
+import .common
+import .config
+import .bump_analyze
+import .T_analyze
+import .vib_analyze
+import .analyze
+
# bump family
# bump family
diff --git
a/calibcant/common.py
b/calibcant/common.py
index 590d2b7bf5272b6d3b597795fec862406279ade2..ece7832af40f2853bbd294c30f61bd245f26c4e9 100644
(file)
--- a/
calibcant/common.py
+++ b/
calibcant/common.py
@@
-21,7
+21,8
@@
# write to Trevor King, Drexel University, Physics Dept., 3141 Chestnut St.,
# Philadelphia PA 19104, USA.
# write to Trevor King, Drexel University, Physics Dept., 3141 Chestnut St.,
# Philadelphia PA 19104, USA.
-import config
+import .config
+
VERSION="0.4"
VERSION="0.4"
diff --git
a/calibcant/config.py
b/calibcant/config.py
index 131651db760b0ac9641794533bd7d3797d90b4fd..0594488d8bf75f504eb4ccbc894e8cb1cedd9718 100644
(file)
--- a/
calibcant/config.py
+++ b/
calibcant/config.py
@@
-26,6
+26,7
@@
and workflow."""
import piezo.z_piezo as z_piezo
import piezo.z_piezo as z_piezo
+
DEFAULT_TEMP = 22 # assume 22 deg C
LOG_DATA = True # quietly grab all real-world data and log to LOG_DIR
LOG_DIR = '$DEFAULT$/calibrate_cantilever'
DEFAULT_TEMP = 22 # assume 22 deg C
LOG_DATA = True # quietly grab all real-world data and log to LOG_DIR
LOG_DIR = '$DEFAULT$/calibrate_cantilever'
diff --git
a/calibcant/vib_analyze.py
b/calibcant/vib_analyze.py
index 0a9e1e55734740c56dd25c004490f66c12eb19bb..67d75193f2ee7ddd9f09ee689cefc7159a48ec68 100755
(executable)
--- a/
calibcant/vib_analyze.py
+++ b/
calibcant/vib_analyze.py
@@
-33,15
+33,18
@@
The relevent physical quantities are :
"""
import os, time, numpy
"""
import os, time, numpy
-import GnuplotBiDir # used for fitting lorentzian
-import scipy.optimize # alternative for fitting lorentzian
-import common # common module for the calibcant package
-import config # config module for the calibcant package
+import GnuplotBiDir # can be used for fitting lorentzian
+import scipy.optimize # can be used for fitting lorentzian
+
import data_logger
import FFT_tools
from splittable_kwargs import splittableKwargsFunction, \
make_splittable_kwargs_function
import data_logger
import FFT_tools
from splittable_kwargs import splittableKwargsFunction, \
make_splittable_kwargs_function
+import .common
+import .config
+
+
PLOT_GUESSED_LORENTZIAN=False
@splittableKwargsFunction()
PLOT_GUESSED_LORENTZIAN=False
@splittableKwargsFunction()
@@
-550,3
+553,5
@@
if __name__ == '__main__' :
if options.ofilename != None :
ofile.close()
if options.ofilename != None :
ofile.close()
+
+# LocalWords: calibcant AFM