Commit 10a3d14c authored by Damien Naudet's avatar Damien Naudet

Simplified some names.

parent 419dc1e4
......@@ -377,7 +377,7 @@ def _plotCentroid(plots, index, fitH5,
# TODO : put all this in a toolbox, so it can be shared between
# the plot and the fit functions
positions = fitH5.get_result(entry, process, 'C. of Mass')
positions = fitH5.get_result(entry, process, 'COM')
plots[0].addCurve(xAcqQX, yAcqQX, legend='measured')
plots[0].addXMarker(positions.qx[index], legend='center of mass')
......@@ -436,15 +436,15 @@ def _initCentroid(plots, fitH5Name, entry, process):
qApp.processEvents()
plots[0].plotFitResult(fitH5Name, entry,
process, 'C. of Mass', FitH5QAxis.qx_axis)
process, 'COM', FitH5QAxis.qx_axis)
qApp.processEvents()
plots[1].plotFitResult(fitH5Name, entry,
process, 'C. of Mass', FitH5QAxis.qy_axis)
process, 'COM', FitH5QAxis.qy_axis)
qApp.processEvents()
plots[2].plotFitResult(fitH5Name, entry,
process, 'C. of Mass', FitH5QAxis.qz_axis)
process, 'COM', FitH5QAxis.qz_axis)
if __name__ == '__main__':
......
......@@ -208,26 +208,26 @@ class CentroidResults(FitSharedResults):
fit_name = 'Centroid'
results = FitResult(fit_name, *args, **kwargs)
results.add_qx_result('centroid', 'I(COM)', qx_results[:, 0].ravel())
results.add_qx_result('centroid', 'C. of Mass',
results.add_qx_result('centroid', 'I', qx_results[:, 0].ravel())
results.add_qx_result('centroid', 'COM',
qx_results[:, 1].ravel())
results.add_qx_result('centroid', 'maximum',
results.add_qx_result('centroid', 'Max',
qx_results[:, 2].ravel())
results.set_qx_status('centroid', qx_status)
results.add_qy_result('centroid', 'I(COM)', qy_results[:, 0].ravel())
results.add_qy_result('centroid', 'I', qy_results[:, 0].ravel())
results.add_qy_result('centroid',
'C. of Mass',
'COM',
qy_results[:, 1].ravel())
results.add_qy_result('centroid', 'maximum',
results.add_qy_result('centroid', 'Max',
qy_results[:, 2].ravel())
results.set_qy_status('centroid', qy_status)
results.add_qz_result('centroid', 'I(COM)', qz_results[:, 0].ravel())
results.add_qz_result('centroid', 'I', qz_results[:, 0].ravel())
results.add_qz_result('centroid',
'C. of Mass',
'COM',
qz_results[:, 1].ravel())
results.add_qz_result('centroid', 'maximum',
results.add_qz_result('centroid', 'Max',
qz_results[:, 2].ravel())
results.set_qz_status('centroid', qz_status)
......
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