Skip to content

P
Production Test Suite
Commit f186c99d authored by Tomasz Wlostowski's avatar Tomasz Wlostowski
Browse files
Options

tests02: fixed DDMTD calibration. Use latest SPEC/WRCore firmware for… 

tests02: fixed DDMTD calibration. Use latest SPEC/WRCore firmware for calibration purposes. Cross-check CNT91 calibration against DDMTD
parent fbf493f9
Show whitespace changes
Inline Side-by-side
Showing with 321 additions and 264 deletions
test/fmcdelay1ns4cha/include/fdelay_lib.h
View file @ f186c99d
......@@ -129,7 +129,7 @@ void fdelay_set_user_offset(fdelay_device_t *dev,int input, int64_t offset);
int fdelay_get_time(fdelay_device_t *dev, fdelay_time_t *t);
int fdelay_set_time(fdelay_device_t *dev, const fdelay_time_t t);
int fdelay_dmtd_calibration(fdelay_device_t *dev, const char *filename, uint32_t *userTimeout);
int fdelay_dmtd_calibration(fdelay_device_t *dev, const char *filename, int setpoint, int *measured_delays);
int fdelay_write_eeprom_from_file(fdelay_device_t *dev, const char *filename, uint32_t offset);
......
test/fmcdelay1ns4cha/lib/Makefile
View file @ f186c99d
......@@ -3,6 +3,8 @@ OBJS = fdelay_lib.o i2c_master.o onewire.o spec_common.o spec/tools/speclib.o sp
CFLAGS = -I../include -g -Imini_bone -Ispec/tools
SPEC_SW?=spec
ifeq ($(SPEC_SW),)
throw_error:
@echo "SPEC software package location environment variable is not set. Can't compile :("
......
test/fmcdelay1ns4cha/lib/fdelay_dmtd_calibration.c
View file @ f186c99d
......@@ -121,7 +121,6 @@ static int wrc_shell_exec(fdelay_device_t *dev, const char *cmd, char *retval)
return 0;
}
#define DMTD_N_AVGS 100 /* number of average samples */
#define DELAY_SETPOINT 750000 /* test delay value */
#define DMTD_PULSE_PERIOD 144
#define DMTD_OUTPUT_PERIOD (16384 * DMTD_PULSE_PERIOD / 2) /* period of the DDMTD output signal in 62.5 MHz clock cycles */
......@@ -146,7 +145,7 @@ static int read_dmtd(fdelay_device_t *dev, struct dmtd_channel *ch, int is_out)
{
fd_decl_private(dev)
uint32_t addr = (is_out ? FD_REG_DMTR_IN : FD_REG_DMTR_OUT);
uint32_t addr = (is_out ? FD_REG_DMTR_OUT : FD_REG_DMTR_IN);
uint32_t value = fd_readl(addr);
if(value & FD_DMTR_IN_RDY)
......@@ -161,14 +160,50 @@ static int read_dmtd(fdelay_device_t *dev, struct dmtd_channel *ch, int is_out)
int64_t epoch = (tag / DMTD_OUTPUT_PERIOD) * DMTD_OUTPUT_PERIOD; /* calculate the offset between the beginning of DDMTD cycle and the current tag */
ch->phase = tag - epoch;
// if(!is_out)
// printf("i%d %lld %lld %lld tp %d\n", is_out, tag, tag-ch->prev_tag, ch->phase, tag % (16384 * 144));
//
ch->prev_tag = tag;
return 1;
}
return 0;
}
int calibrate_channel(fdelay_device_t *dev, int channel, double *mean, double *std)
fdelay_time_t ts_sub(fdelay_time_t a, fdelay_time_t b);
void test_timestamper(fdelay_device_t *dev)
{
fdelay_time_t prev, t;
int i;
fdelay_configure_readout(dev, 0);
fdelay_configure_readout(dev, 1);
for(i=0;i<100;i++)
{
if (fdelay_read(dev, &t, 1) == 1)
{
if(i>0)
{
fdelay_time_t delta;
delta = ts_sub(t, prev);
// printf("t %lld:%d:%d prev %lld:%d:%d\n", t.utc, t.coarse, t.frac, prev.utc, prev.coarse, prev.frac);
printf("delta:%lld seq:%d\n", fdelay_to_picos(delta)/1000, t.seq_id);
}
prev = t;
i++;
}
}
}
int calibrate_channel(fdelay_device_t *dev, int channel, int setpoint_ps, double *mean, double *std)
{
int64_t samples_in[DMTD_N_AVGS], samples_out[DMTD_N_AVGS], delta[DMTD_N_AVGS];
struct dmtd_channel ch_in, ch_out;
......@@ -184,7 +219,9 @@ int calibrate_channel(fdelay_device_t *dev, int channel, double *mean, double *s
hw->calib.out_zero_offset[channel-1] = 0;
hw->calib.tdc_zero_offset = 0;
fdelay_configure_output(dev, channel, 1, (int64_t)DELAY_SETPOINT, 300000LL, 0LL, 1);
dbg("calibrating channel : %d\n", channel);
fdelay_configure_output(dev, channel, 1, (int64_t)setpoint_ps, 300000LL, 0LL, 1);
/* Disable ALL outputs to prevent the calibration pulses from driving whatever
is connected to the board */
......@@ -215,6 +252,8 @@ int calibrate_channel(fdelay_device_t *dev, int channel, double *mean, double *s
init_dmtd(&ch_in, DMTD_OUTPUT_PERIOD);
init_dmtd(&ch_out, DMTD_OUTPUT_PERIOD);
// test_timestamper(dev);
/* Get DMTD_N_AVGS samples to reduce error */
n_in = n_out = 0;
int64_t ts = get_tics();
......@@ -240,10 +279,10 @@ int calibrate_channel(fdelay_device_t *dev, int channel, double *mean, double *s
for(i=0;i<DMTD_N_AVGS;i++)
{
delta[i] = samples_out[i] - samples_in[i];
delta[i] = samples_in[i] - samples_out[i];
if(delta[i] < 0)
delta[i] += DMTD_OUTPUT_PERIOD;
// printf("in %lld out %lld delta %lld\n", samples_in[i], samples_out[i], delta[i]);
// printf("in %lld out %lld delta %lld\n", samples_in[i], samples_out[i], delta[i]);
}
double avg = 0, s= 0;
......@@ -270,15 +309,13 @@ int calibrate_channel(fdelay_device_t *dev, int channel, double *mean, double *s
return 0;
}
int fdelay_dmtd_calibration(fdelay_device_t *dev, const char *filename, uint32_t *userTimeout)
int fdelay_dmtd_calibration(fdelay_device_t *dev, const char *filename, int setpoint, int *measured_delays)
{
char resp[1024];
char c;
int i, error = 0;
fd_decl_private(dev);
int64_t base = 0, prev_tag = -1;
dbg("DDMTD Calibration start\n");
if(spec_load_lm32(dev->priv_io, filename, 0xc0000))
{
......@@ -326,16 +363,16 @@ int fdelay_dmtd_calibration(fdelay_device_t *dev, const char *filename, uint32_t
for(i=1;i<=4;i++)
{
dbg("\n\nPerforming DDMTD-based calibration of channel %d\n", i);
if(calibrate_channel(dev, i, &mean_out[i-1], &std_out[i-1]) < 0)
if(calibrate_channel(dev, i, setpoint, &mean_out[i-1], &std_out[i-1]) < 0)
{
dbg("Failed, DDMTD calibration failure for channel %d, DMTD Tag Ready flag is not coming high\n", i);
hw->calib.out_zero_offset[i-1] = 0;
measured_delays[i-1] = 0;
error = 1;
}
else
{
dbg("Channel %d: delay %.0f ps, std %.0f ps.\n", i, mean_out[i-1], std_out[i-1]);
hw->calib.out_zero_offset[i-1] = mean_out[i-1] - DELAY_SETPOINT - hw->calib.tdc_zero_offset;
measured_delays[i-1] = mean_out[i-1];
}
}
return error ? -1 : 0;
......
test/fmcdelay1ns4cha/lib/fdelay_lib.c
View file @ f186c99d
......@@ -1316,7 +1316,7 @@ fdelay_time_t fdelay_from_picos(const uint64_t ps)
}
/* Substract two timestamps */
static fdelay_time_t ts_sub(fdelay_time_t a, fdelay_time_t b)
fdelay_time_t ts_sub(fdelay_time_t a, fdelay_time_t b)
{
a.frac -= b.frac;
if(a.frac < 0)
......@@ -1330,6 +1330,7 @@ static fdelay_time_t ts_sub(fdelay_time_t a, fdelay_time_t b)
a.coarse += 125000000;
a.utc --;
}
a.utc-=b.utc;
return a;
}
......
test/fmcdelay1ns4cha/python/fdelay_lib.py
View file @ f186c99d
......@@ -78,10 +78,12 @@ class FineDelay:
def write_calibration_eeprom(self):
self.return_value = self.fdelay.write_calibration_eeprom(self.handle)
def fdelay_dmtd_calibration(self):
def fdelay_dmtd_calibration(self, setpoint):
# last value is user timeout for spec_vuart
self.return_value = self.fdelay.fdelay_dmtd_calibration(self.handle, c_char_p(self.cwd + '/../firmware/wrc.bin'), pointer(c_uint32(3000000)))
self.dmtd = 1
delays = (c_int * 4)()
self.return_value = self.fdelay.fdelay_dmtd_calibration(self.handle, c_char_p(self.cwd + '/../firmware/wrc.bin'), c_int(setpoint), pointer(delays))
return delays
def write_eeprom_from_file(self, filename, offset):
self.return_value = self.fdelay.fdelay_write_eeprom_from_file(self.handle, c_char_p(filename), c_uint32(offset))
......
test/fmcdelay1ns4cha/python/test00.py
View file @ f186c99d
......@@ -21,8 +21,6 @@ def main (card=None, default_directory='.',suite=None):
# initialize card with long tests
card = init_card(new_stderr, default_directory, 2)
print("Dir %s" %default_directory)
# restore stderr and display debug information from file
restore_stderr(new_stderr, default_directory)
......
test/fmcdelay1ns4cha/python/test02.py
View file @ f186c99d
......@@ -198,6 +198,14 @@ def main (card=None, default_directory='.',suite=None):
if(error[3] != 0):
print("Output enable line for channel 4 is not working OK, check for soldering or connection problem.")
dmtd_setpoint = 750000
dmtd_ff_offset = 1000
dmtd_delays = card.fdelay_dmtd_calibration(dmtd_setpoint)
dmtd_err_threshold = 1000
calib = FDCalibBlock()
# calib.load(os.path.join(default_directory,"sdbfs/calibration"))
......@@ -210,6 +218,15 @@ def main (card=None, default_directory='.',suite=None):
calib.save(os.path.join(default_directory,"sdbfs/calibration"))
print("DDMTD vs CNT-91 cross-check: \n")
for i in range(0, 4):
err = dmtd_delays[i] + calib.tdc_zero_offset + calib.out_zero_offset[i] - dmtd_setpoint - dmtd_ff_offset
print("Channel %d : difference = %d ps, max = %d ps, status: %s " % (i+1, err, dmtd_err_threshold, "OK" if abs(err) < dmtd_err_threshold else "FAIL" ) )
if(err > dmtd_err_threshold):
raise PtsError("DDMTD vs CNT-91 Cross-check failed. Probably a soldering issue with DDMTD calibration flip-flops or multiplexer")
# redirect.InOut(red)
# restore stderr and display debug information from file
......
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