Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
W
wr-calibration
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
image/svg+xml
Discourse
Discourse
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
white-rabbit
wr-calibration
Commits
cfac7721
Commit
cfac7721
authored
Feb 23, 2017
by
Tjeerd Pinkert
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' into proposed_master
parents
e27f23f3
d34f38c8
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
710 additions
and
12 deletions
+710
-12
GPLv3.txt
sw/GPLv3.txt
+675
-0
README
sw/README
+18
-0
delay_determination.py
sw/lib/delay_determination.py
+17
-12
software
sw/software
+0
-0
No files found.
sw/GPLv3.txt
0 → 100644
View file @
cfac7721
This diff is collapsed.
Click to expand it.
sw/README
0 → 100644
View file @
cfac7721
This software is part of the absolute calibration efforts for WR equipment
undertaken at Nikhef.
Initial work is copyright by: Peter Jansweijer, Tjeerd Pinkert and Henk Peek
(C) 2016-2017
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>
sw/lib/delay_determination.py
View file @
cfac7721
"""
Delay Determination Library with functions for delay estimation.
License GPL version 2:
Copyright (C) 2016 Tjeerd Pinkert
based on:
[5] N. Sotiropoulos et al., Opt. Express 21, 32643-32654 (2013)
This program is free software
; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or
(at your option) any later version.
This program is free software
: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
...
...
@@ -18,13 +14,16 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
along with this program. If not, see <http://www.gnu.org/licenses/>
-------------------------------------------------------------------------------
This library mainly holds closely inspected correlation functions which are
rigorously checked for one off errors etc.
Part of the ideas for cross-correlation and interpolation can be found back in
N. Sotiropoulos et al., Opt. Express 21, 32643-32654 (2013)
"""
import
sys
...
...
@@ -37,7 +36,9 @@ import scipy.signal
import
bz2
##
## Add some "missing" functions to older scipy modules
## Add some "missing" functions to older scipy modules, these are not checked
## for compliance with the licence of the rest of the program and can be
## exempted or removed if needed for compliance with GPLv3.
##
#if scipy.__version__ < "0.11.0":
if
1
:
...
...
@@ -245,7 +246,7 @@ analysis_methods= [
#TODO: finish this function....
def
delay_from_waveform
(
waveform_data
,
analysis
,
channels
=
[
2
,
4
],
length
=
0.0
,
refractive_index
=
1.5
):
"""
Anal
i
se the delay resulting from an oscilloscope trace using the cross
Anal
y
se the delay resulting from an oscilloscope trace using the cross
correlation methods. The function returns a dictionary with delay values
for each analysis method.
...
...
@@ -337,6 +338,10 @@ def correlate_linear(signal1, signal2, center=0, shift=100, length=None, correla
correlation on a subset of the signal samples, such that no zero padding is
applied.
reference: Giovanni Jacovitti and Gaetano Scarano, Discrete Time Techniques
for Time Delay Estimation, IEEE Transactions on Signal Processing 41(2),
525-533 (1993)
The problem with zero-padding is that cross correlation
automatically favours the centre position of the signals because zero
padding makes the correlation signal zero if the signals are maximally
...
...
sw/software
deleted
100644 → 0
View file @
e27f23f3
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment