apply delay self-calibration solutions

[Fil8]

If delay self-calibration is performed then apply_cubical_gains does not find the correct solutions. This because the keyword matrix_type is overwritten and the correct if clause is not accepted:

here we define the matrix type based on the caracal keyword:

caracal/caracal/workers/selfcal_worker.py

Lines 1643 to 1661 in 1986014

	matrix_type = config[key]['gain_matrix_type'][
	num - 1 if len(config[key]['gain_matrix_type']) >= num else -1]
	# Decide if take diagonal terms into account
	if matrix_type == 'Gain2x2':
	take_diag_terms = False
	else:
	take_diag_terms = True
	# set the update type correctly
	if matrix_type == 'GainDiagPhase':
	gupdate = 'phase-diag'
	elif matrix_type == 'GainDiagAmp':
	gupdate = 'amp-diag'
	elif matrix_type == 'GainDiag':
	gupdate = 'diag'
	elif matrix_type == 'Gain2x2':
	gupdate = 'full'
	elif matrix_type == 'Fslope':
	gupdate = 'phase-diag'

here we overwrite the matrix_type:

caracal/caracal/workers/selfcal_worker.py

Lines 1705 to 1713 in 1986014

	# if we have more than one matrix set the matrixtype correctly
	if len(jones_chain.split(",")) > 1:
	matrix_type = 'Gain2x2'
	# Cubical does not at the moment apply the gains when the matrix is not complex2x2 (https://github.com/ratt-ru/CubiCal/issues/324).
	# Hence the following fix. This should be removed once the fix makes it into stimela.
	matrix_type = 'Gain2x2'
	# Does solterm_niter matter for applying?????
	solterm_niter = config['cal_cubical']['solterm_niter']
	sol_terms_add = []

here we don't make it into the loop:

caracal/caracal/workers/selfcal_worker.py

Lines 1823 to 1837 in 1986014

	# Set the table name
	if gupdate == 'phase-diag' and matrix_type == 'Fslope':
	g_table_name = "{0:s}/{3:s}-g-delay-gains-{1:d}-{2:s}.parmdb:output".format(get_dir_path(prod_path,
	pipeline), num, os.path.splitext(fromname)[0], prefix)
	elif gupdate == 'phase-diag':
	g_table_name = "{0:s}/{3:s}-g-phase-gains-{1:d}-{2:s}.parmdb:output".format(get_dir_path(prod_path,
	pipeline), num, os.path.splitext(fromname)[0], prefix)
	elif gupdate == 'amp-diag':
	g_table_name = "{0:s}/{3:s}-g-amp-gains-{1:d}-{2:s}.parmdb:output".format(get_dir_path(prod_path,
	pipeline), num, os.path.splitext(fromname)[0], prefix)
	elif gupdate == 'diag':
	g_table_name = "{0:s}/{3:s}-g-amp-phase-diag-gains-{1:d}-{2:s}.parmdb:output".format(get_dir_path(prod_path,
	pipeline), num, os.path.splitext(fromname)[0], prefix)
	elif gupdate == 'full':
	g_table_name = "{0:s}/{3:s}-g-amp-phase-full-gains-{1:d}-{2:s}.parmdb:output".format(get_dir_path(prod_path,