Commit d107e1f8 authored by Oldřich Pecák's avatar Oldřich Pecák
Browse files

fix some more errors

parent 1179ab31

measure_tool.py

+11 −4
Original line number Diff line number Diff line
@@ -68,6 +68,9 @@ def calibrate(config, cube, verbose): 
                         postfix=status, position=0)

        pbar = tqdm.tqdm(bar_format='{percentage:3.1f}%|{bar}| {n_fmt}/{total_fmt} [{remaining}, ' '{rate_fmt}]',

                         total=config['steps'][0] * config['steps'][1], position=1)

    else:

        sbar = None

        pbar = None

    

    for y in range(config['steps'][1]):

        line = []
@@ -75,6 +78,8 @@ def calibrate(config, cube, verbose): 
            data = single_measurement(verbose, status, (pbar, sbar), cube, current)

            if  len(data) != 0:

                line.append(data[1])

            else:

                line.append([0, 0, 0])

            current[0] += config['step_size'][0]

        calibration.append(line)

        current[0] = config['start'][0]
@@ -100,7 +105,9 @@ def measure(config, cube, verbose, calibration): 
                         postfix=status, position=0)

        pbar = tqdm.tqdm(bar_format='{percentage:3.1f}%|{bar}| {n_fmt}/{total_fmt} [{remaining}, ' '{rate_fmt}]',

                         total=config['steps'][0] * config['steps'][1] * config['steps'][2], position=1)

    

    else:

        sbar = None

        pbar = None

    

    for z in range(config['steps'][2]):

        for y in range(config['steps'][1]):
@@ -110,9 +117,9 @@ def measure(config, cube, verbose, calibration): 
                    output_file.write(str(data[0][0]) + ', ')

                    output_file.write(str(data[0][1]) + ', ')

                    output_file.write(str(data[0][2]) + ', ')

                    output_file.write(str(data[1][0] - calibration[x][y][0]) + ', ')

                    output_file.write(str(data[1][1] - calibration[x][y][1]) + ', ')

                    output_file.write(str(data[1][2] - calibration[x][y][2]) + '\n')

                    output_file.write(str(data[1][0] - calibration[y][x][0]) + ', ')

                    output_file.write(str(data[1][1] - calibration[y][x][1]) + ', ')

                    output_file.write(str(data[1][2] - calibration[y][x][2]) + '\n')



                current[0] += config['step_size'][0]

            current[0] = config['start'][0]