--- versions/run.py.20200903-114410 2020-09-03 11:44:10.989475815 +0200 +++ run.py 2020-09-08 10:25:35.942425812 +0200 @@ -269,6 +269,10 @@ anaExe = [ "../ana/noise.sh", "../ana/calib.exe", "../ana/calib.exe", "../ana/measure_delay.exe" ] ana2Exe = [ "../ana/noise.exe", "../ana/measure_xtalk.exe", "../ana/measure_xtalk.exe", "../ana/bitcheck.exe" ] + suffix = '' + if (kwargs.get('fn-postfix', '') != ''): + suffix = "_" + kwargs.get('fn-postfix') + # for i in range(0,4): # communicate with pulse generator @@ -287,7 +291,7 @@ result = self.execute_command(cmd) # take data - fileString = cg0String[j] + "_" + pulserString[i] + fileString = cg0String[j] + "_" + pulserString[i] + suffix cmd = [ 'treadout', '-m', kwargs.get('mask', '0xf'), '--nr', kwargs.get('nr', '0'), @@ -542,6 +546,7 @@ parser.add_argument('--test-dft', action='store_true', help='Run DFT test') parser.add_argument('--test-readout', action='store_true', help='Run readout test') parser.add_argument('--test-readall', action='store_true', help='Run readout all') + parser.add_argument('--test-readall2', action='store_true', help='Run readout all again') parser.add_argument('--test-readnoise', action='store_true', help='Run readout noise') # parser.add_argument('--nr', type=str, help='Serial number of the SAMPA under test', required=True) @@ -636,12 +641,27 @@ 'nr': args.nr, 'nr-prefix': args.nr_prefix, 'output-dir': args.output_dir, - 'fn-postfix': 'test' + 'fn-postfix': '' } Readall().run(**readall_params) logger.info('Readall test done') + if (args.test_readall2): + s.initialize_readout() + logger.info('Starting readall test2') + + readall2_params = {\ + 'mask': args.mask, + 'nr': args.nr, + 'nr-prefix': args.nr_prefix, + 'output-dir': args.output_dir, + 'fn-postfix': 'test2' + } + + Readall().run(**readall2_params) + logger.info('Readall test2 done') + if (args.test_readnoise): s.initialize_readout() logger.info('Starting readnoise test')