- new.info['columns'].append('cantilever adjusted extension (m)')
- z_data = data[:,data.info['columns'].index('surface distance (m)')]
- d_data = data[:,data.info['columns'].index('deflection (N)')]
- new[:,-1] = z_data - d_data / data.info['spring constant (N/m)']
+ new.info['columns'].append(
+ join_data_label(params['output distance column'], 'm'))
+ z_data = data[:,data.info['columns'].index(
+ params['input distance column'])]
+ d_data = data[:,data.info['columns'].index(
+ params['input deflection column'])]
+ k = data.info[params['spring constant info name']]
+
+ z_name,z_unit = split_data_label(params['input distance column'])
+ assert z_unit == 'm', params['input distance column']
+ d_name,d_unit = split_data_label(params['input deflection column'])
+ assert d_unit == 'N', params['input deflection column']
+ k_name,k_unit = split_data_label(params['spring constant info name'])
+ assert k_unit == 'N/m', params['spring constant info name']
+
+ new[:,-1] = z_data - d_data / k