Skip to content

Commit 2c6cdff

Browse files
author
Laurent Claustre
committed
missing calibration scaling on x/y fwhm_x/fwhm_y in getResults() command
1 parent 384c1c2 commit 2c6cdff

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

plugins/Bpm.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -207,10 +207,10 @@ def getResults(self, from_index=0) :
207207
for i,r in enumerate(results):
208208
result_array[i][0] = r.timestamp
209209
result_array[i][1] = self.validate_number(r.beam_intensity)
210-
result_array[i][2] = self.validate_number(r.beam_center_x, max_value=max_width)
211-
result_array[i][3] = self.validate_number(r.beam_center_y, max_value=max_height)
212-
result_array[i][4] = self.validate_number(r.beam_fwhm_x, fallback_value=0)
213-
result_array[i][5] = self.validate_number(r.beam_fwhm_y, fallback_value=0)
210+
result_array[i][2] = self.validate_number(r.beam_center_x, max_value=max_width) * self.calibration[0]
211+
result_array[i][3] = self.validate_number(r.beam_center_y, max_value=max_height) * self.calibration[1]
212+
result_array[i][4] = self.validate_number(r.beam_fwhm_x, fallback_value=0) * self.calibration[0]
213+
result_array[i][5] = self.validate_number(r.beam_fwhm_y, fallback_value=0) * self.calibration[1]
214214
result_array[i][6] = r.frameNumber
215215
return result_array.ravel()
216216

0 commit comments

Comments
 (0)