#73 Add Kicktime to kick_$.tfs

[JoschD]

• Refactored kick.py to use only constants as Column names
• harpy/handler.py: added TIME to headers.
• accelerator.py: refactored strings of element types to AccElementTypes class

[mihofer]

omc3/omc3/harpy/handler.py

Lines 145 to 158 in 4ad993a

	def _compute_headers(panda, date):
	headers = OrderedDict()
	for plane in ALL_PLANES:
	for prefix in ("", "NAT"):
	try:
	bpm_tunes = panda.loc[:, f"{prefix}TUNE{plane}"]
	except KeyError:
	pass
	else:
	headers[f"{prefix}Q{PLANE_TO_NUM[plane]}"] = np.mean(bpm_tunes)
	headers[f"{prefix}Q{PLANE_TO_NUM[plane]}RMS"] = np.std(bpm_tunes)
	if date is not None:
	headers["TIME"] = date.strftime(formats.TIME)
	return headers

why not use instead of just date as argument a dict containing additional headers, would allow to easily implement more headers at a later point if needed

[mihofer]

omc3/omc3/optics_measurements/kick.py

Lines 47 to 50 in 4ad993a

	def _get_header(header_dict, beta_d):
	header = header_dict.copy()
	header[RESCALE_FACTOR] = beta_d
	return header

maybe change to RESCALE_FACTOR{plane}, kick files could then be merged without name clash

[mihofer]

should optic_measurements/constants.py be put in definitions as other scripts (kmod, amp. det script, ..) should also rely on the conventions established there?

[JoschD]

omc3/omc3/harpy/handler.py

Lines 145 to 158 in 4ad993a

	def _compute_headers(panda, date):
	headers = OrderedDict()
	for plane in ALL_PLANES:
	for prefix in ("", "NAT"):
	try:
	bpm_tunes = panda.loc[:, f"{prefix}TUNE{plane}"]
	except KeyError:
	pass
	else:
	headers[f"{prefix}Q{PLANE_TO_NUM[plane]}"] = np.mean(bpm_tunes)
	headers[f"{prefix}Q{PLANE_TO_NUM[plane]}RMS"] = np.std(bpm_tunes)
	if date is not None:
	headers["TIME"] = date.strftime(formats.TIME)
	return headers

why not use instead of just date as argument a dict containing additional headers, would allow to easily implement more headers at a later point if needed

A dict would make sense if the headers are added automatically. But as there is some formatting going on, one has to handle each entry individually anyway (most likely). Changing date to addition_headers later if needed should be no problem though.

[JoschD]

should optic_measurements/constants.py be put in definitions as other scripts (kmod, amp. det script, ..) should also rely on the conventions established there?

Yes... but we need come to some convetion later. New issue, I guess

[JoschD]

omc3/omc3/optics_measurements/kick.py

Lines 47 to 50 in 4ad993a

	def _get_header(header_dict, beta_d):
	header = header_dict.copy()
	header[RESCALE_FACTOR] = beta_d
	return header

maybe change to RESCALE_FACTOR{plane}, kick files could then be merged without name clash

Maybe. Also new issue to talk about.