Skip to content

M
MasterFIP - Testing
Commit 1b25c761 authored by Marek Gumiński's avatar Marek Gumiński
Browse files
Options

Added read_samples.py to log zip files. 

Script is copied to log dir by install script.
Script description added to UserGuide.
Removed some unused comments
parent 6a678854
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 12 deletions
install.sh
View file @ 1b25c761
......@@ -7,12 +7,6 @@ fi
# make sure that top directory is called properly
# TOPDIRNAME="fmcmasterfip"
# if [ `dirname $PWD | grep "$TOPDIRNAME"` -ne 0 ]
# then
# echo "Work directory path contain forbidden directory called $TOPDIRNAME"
# echo "Please change "
topdir=`basename $PWD`
if [ "$topdir" != "fmcmasterfip" ]
then
......@@ -105,7 +99,10 @@ Path=
StartupNotify=false
" > ~/Desktop/test_fmcmasterfip.desktop
# copy read_samples.py to logdir
LOGDIR="${HOME}/Desktop/pts_log/fmcmasterfip"
mkdir -p "$LOGDIR/adcdata"
cp "python/read_samples.py" "$LOGDIR/adcdata"
# create desktop shortcut
# echo "cd ${PWD}/pts/" > ~/Desktop/test_fmcmasterfip.sh
# echo "./fmcmasterfip.sh" >> ~/Desktop/test_fmcmasterfip.sh
chmod +x ~/Desktop/test_fmcmasterfip.desktop
\ No newline at end of file
pts/ptsFip.py
View file @ 1b25c761
......@@ -321,7 +321,9 @@ class Suite(object):
log.close()
adc_data_files=get_files("/tmp","mfdata*")
ziplist = ziplist + adc_data_files
adc_read_script=os.path.abspath("../python/read_samples.py")
print adc_read_script
ziplist = ziplist + adc_data_files + [ adc_read_script ]
make_zip(zipfilename, ziplist)
......
python/read_samples.py
View file @ 1b25c761
......@@ -14,6 +14,7 @@ def u2int16arr(arr):
arr[i]=u2int16(arr[i])
return arr
def read_adc_samples( filepath ):
try:
......@@ -63,8 +64,6 @@ def show2(data, data2):
t = range( len( data ) )
plt.plot(t, data , label = 'data1')
plt.plot(t, data2, label ='data2' )
plt.plot(t, data2, label = 'data2')
plt.legend()
# plt.legend(bbox_to_anchor=(0., 1.02, 1., .102))
# , loc=3,ncol=2, mode="expand", borderaxespad=0.
plt.show()
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment