Skip to content

Commit

Permalink
removed debugging print and echo statements
Browse files Browse the repository at this point in the history
  • Loading branch information
alex_dunn committed Sep 19, 2012
1 parent 96199b9 commit addcf16
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
8 changes: 4 additions & 4 deletions atlas_opi/scripts/psd.py
Expand Up @@ -37,8 +37,8 @@
# Get the welch values
welch1 = str(PVUtil.getLong(display.getWidget("welch1").getPV()))
welch2 = str(PVUtil.getLong(display.getWidget("welch2").getPV()))
print "welch1 =", welch1
print "welch2 =", welch2
# print "welch1 =", welch1
# print "welch2 =", welch2

# Get the absolute path of the plotPSD script
# This is run from the css/CSS_EPICS directory
Expand All @@ -54,7 +54,7 @@
# If the user defined a relative path, it will be made absolute relative to
# spxrfshare
# filepath = os.path.abspath(filepath)
print "Data filepath is:", filepath
# print "Data filepath is:", filepath

workspace = System.getProperty("user.workspace")
script_path = workspace + "atlas_opi/scripts/psd.sh"
Expand All @@ -65,6 +65,6 @@ def rem(str0):

# run plotPSD from the directory of the user's data file
runpath = os.path.split(filepath)[0] # Get just the directory of the data file
print "The full command: ", script_path + " " + plotpath + " " + filepath + " " + welch1 + " " + welch2
# print "The full command: ", script_path + " " + plotpath + " " + filepath + " " + welch1 + " " + welch2
subprocess.Popen([rem(script_path) + " " + rem(plotpath) + " " + rem(filepath) + " " + rem(welch1) + " " + rem(welch2)], cwd=runpath, shell=True)
# subprocess.Popen([plotpath, filepath, str(welch1), str(welch2)], cwd=runpath) # Run plotPSD on the data file
16 changes: 8 additions & 8 deletions atlas_opi/scripts/psd.sh
Expand Up @@ -9,19 +9,19 @@
# $3 == welch1 parameter
# $4 == welch2 parameter

echo "I have been called."
#echo "I have been called."

# Fix for llrf2
export PATH=/usr/local/oag/apps/bin/linux-x86:$PATH
# export | grep PATH

echo "Current working directory:"
pwd
#echo "Current working directory:"
#pwd

echo "Parameters:"
echo $1
echo $2
echo $3
echo $4
#echo "Parameters:"
#echo $1
#echo $2
#echo $3
#echo $4

$1 $2 $3 $4

0 comments on commit addcf16

Please sign in to comment.