Skip to content

Commit

Permalink
Fix typo "Centriod" for "Centroid"
Browse files Browse the repository at this point in the history
  • Loading branch information
mattachu committed Dec 18, 2019
1 parent 8f564e8 commit 1923cab
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions GUI/src/ImpactMainWindow.py
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,9 @@ class ImpactMainWindow(tk.Tk):
"This is a beta version of the IMPACT user interface..."
]

PLOTTYPE = {'Centriod location' :2,
PLOTTYPE = {'Centroid location' :2,
'Rms size' :3,
'Centriod momentum' :4,
'Centroid momentum' :4,
'Rms momentum' :5,
'Twiss' :6,
'Emittance' :7}
Expand Down
6 changes: 3 additions & 3 deletions GUI/src/ImpactTPlot.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
_height=300
_width =200

IMPACT_T_ADVANCED_PLOT_TYPE= {'Centriod location (mm)' :2,
IMPACT_T_ADVANCED_PLOT_TYPE= {'Centroid location (mm)' :2,
'Rms size (mm)' :3,
'Centriod momentum (MC)' :4,
'Centroid momentum (MC)' :4,
'Rms momentum (MC)' :5,
'Twiss' :6,
'Emittance (mm-mrad)' :7}
Expand Down Expand Up @@ -371,7 +371,7 @@ def __init__(self, parent,PlotFileName,xl,yl,labelY):
x = np.array([float(xrt[xl]) for xrt in linesList])
y = np.array([float(xrt[yl]) for xrt in linesList])

if labelY in ['Centriod location (mm)','Rms size (mm)','Rmax (mm)']:
if labelY in ['Centroid location (mm)','Rms size (mm)','Rmax (mm)']:
y = y*1.0e3 # unit convert from m to mm
elif labelY in ['Emittance (mm-mrad)']:
y = y*1.0e6 # unit convert from (m-rad) to (mm-mrad)
Expand Down
6 changes: 3 additions & 3 deletions GUI/src/ImpactZPlot.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
_height=300
_width =200

IMPACT_Z_ADVANCED_PLOT_TYPE= {'Centriod location (mm)' :1,
IMPACT_Z_ADVANCED_PLOT_TYPE= {'Centroid location (mm)' :1,
'Rms size (mm)' :2,
'Centriod momentum (MC)' :3,
'Centroid momentum (MC)' :3,
'Rms momentum (MC)' :4,
'Twiss' :5,
'Emittance (mm-mrad)' :6}
Expand Down Expand Up @@ -346,7 +346,7 @@ def __init__(self, parent,PlotFileName,xl,yl,labelY):
x = np.array([float(xrt[xl]) for xrt in linesList])
y = np.array([float(xrt[yl]) for xrt in linesList])

if labelY in ['Centriod location (mm)','Rms size (mm)','Rmax (mm)']:
if labelY in ['Centroid location (mm)','Rms size (mm)','Rmax (mm)']:
y = y*1.0e3 # unit convert from m to mm
elif labelY in ['Emittance (mm-mrad)']:
y = y*1.0e6 # unit convert from (m-rad) to (mm-mrad)
Expand Down
6 changes: 3 additions & 3 deletions GUI/src/ImpactZPlotold.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
_height=300
_width =200

IMPACT_Z_ADVANCED_PLOT_TYPE= {'Centriod location (mm)' :1,
IMPACT_Z_ADVANCED_PLOT_TYPE= {'Centroid location (mm)' :1,
'Rms size (mm)' :2,
'Centriod momentum (MC)' :3,
'Centroid momentum (MC)' :3,
'Rms momentum (MC)' :4,
'Twiss' :5,
'Emittance (mm-mrad)' :6}
Expand Down Expand Up @@ -347,7 +347,7 @@ def __init__(self, parent,PlotFileName,xl,yl,labelY):
x = np.array([float(xrt[xl]) for xrt in linesList])
y = np.array([float(xrt[yl]) for xrt in linesList])

if labelY in ['Centriod location (mm)','Rms size (mm)','Rmax (mm)']:
if labelY in ['Centroid location (mm)','Rms size (mm)','Rmax (mm)']:
y = y*1.0e3 # unit convert from m to mm
elif labelY in ['Emittance (mm-mrad)']:
y = y*1.0e6 # unit convert from (m-rad) to (mm-mrad)
Expand Down

0 comments on commit 1923cab

Please sign in to comment.