Skip to content

Wire Scanner Sigmas #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
catheybl merged 1 commit into from
Mar 31, 2026
Merged

Wire Scanner Sigmas #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions virtaccl/PyORBIT_Model/pyorbit_va_nodes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,11 +146,11 @@ def getYAvg(self):
# Class for wire scanners. This class simply returns histograms of the vertical and horizontal positions.
class WSclass(BaseLinacNode):
node_type = "WireScanner"
parameter_list = ['x_histogram', 'y_histogram', 'x_avg', 'y_avg']
parameter_list = ['x_histogram', 'y_histogram', 'x_avg', 'y_avg', 'x_sigma', 'y_sigma']

def __init__(self, node_name: str, bin_number: int = 50):
parameters = {'x_histogram': np.array([[-10, 0], [10, 0]]), 'y_histogram': np.array([[-10, 0], [10, 0]]),
'x_avg': 0.0, 'y_avg': 0.0}
'x_avg': 0.0, 'y_avg': 0.0, 'x_sigma': 0.0, 'y_sigma': 0.0}
BaseLinacNode.__init__(self, node_name)
for key, value in parameters.items():
self.addParam(key, value)
Expand Down Expand Up @@ -193,16 +193,23 @@ def track(self, paramsDict):
x_avg /= part_num
y_avg /= part_num

x_sigma = np.std(x_array, ddof=0)
y_sigma = np.std(y_array, ddof=0)

self.setParam('x_histogram', x_out)
self.setParam('y_histogram', y_out)
self.setParam('x_avg', x_avg)
self.setParam('y_avg', y_avg)
self.setParam('x_sigma', x_sigma)
self.setParam('y_sigma', y_sigma)

else:
self.setParam('x_histogram', np.array([[-10, 0], [10, 0]]))
self.setParam('y_histogram', np.array([[-10, 0], [10, 0]]))
self.setParam('x_avg', 0)
self.setParam('y_avg', 0)
self.setParam('x_sigma', 0)
self.setParam('y_sigma', 0)

def getXHistogram(self):
return self.getParam('x_histogram')
Expand Down
8 changes: 8 additions & 0 deletions virtaccl/site/SNS_Linac/virtual_devices.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,12 +297,16 @@ class WireScanner(Device):
speed_pv = 'Speed_Set' # [mm/s]
x_avg_pv = 'Hor_Mean_gs' # [mm]
y_avg_pv = 'Ver_Mean_gs' # [mm]
x_sigma_pv = 'Hor_Sigma_gs'
y_sigma_pv = 'Ver_Sigma_gs'

# PyORBIT parameter keys
x_hist_key = 'x_histogram' # [arb. units]
y_hist_key = 'y_histogram' # [arb. units]
x_avg_key = 'x_avg' # [m]
y_avg_key = 'y_avg' # [m]
x_sigma_key = 'x_sigma'
y_sigma_key = 'y_sigma'

# Device keys
position_key = 'wire_position' # [m]
Expand Down Expand Up @@ -344,6 +348,8 @@ def __init__(self, name: str, model_name: str = None, initial_dict: Dict[str, An
self.register_measurement(WireScanner.y_charge_pv, noise=xy_noise)
self.register_measurement(WireScanner.x_avg_pv, noise=xy_noise, transform=self.milli_units)
self.register_measurement(WireScanner.y_avg_pv, noise=xy_noise, transform=self.milli_units)
self.register_measurement(WireScanner.x_sigma_pv, transform=self.milli_units)
self.register_measurement(WireScanner.y_sigma_pv, transform=self.milli_units)

self.register_setting(WireScanner.speed_pv, default=initial_speed, transform=self.milli_units)
self.register_setting(WireScanner.position_pv, default=initial_position, transform=self.milli_units)
Expand Down Expand Up @@ -401,6 +407,8 @@ def update_measurements(self, new_params: Dict[str, Dict[str, Any]] = None):

self.update_measurement(WireScanner.x_avg_pv, ws_params[WireScanner.x_avg_key])
self.update_measurement(WireScanner.y_avg_pv, ws_params[WireScanner.y_avg_key])
self.update_measurement(WireScanner.x_sigma_pv, ws_params[WireScanner.x_sigma_key])
self.update_measurement(WireScanner.y_sigma_pv, ws_params[WireScanner.y_sigma_key])


class Screen(Device):
Expand Down
Loading