|
163 | 163 | parser.add_argument('--tpc-distortion-type', default=0, type=int, help='Simulate distortions in the TPC (0=no distortions, 1=distortions without scaling, 2=distortions with CTP scaling)') |
164 | 164 | parser.add_argument('--tpc-corrmap-lumi-mode', default=2, type=int, help='TPC corrections mode (0=linear, 1=derivative, 2=derivative for special MC maps') |
165 | 165 | parser.add_argument('--ctp-scaler', default=0, type=float, help='CTP raw scaler value used for distortion simulation') |
166 | | -parser.add_argument('--tpc-mt-digitizer', action='store_true', help='Digitize TPC in one multithreaded device instead of one process per lane (needs TPC digit chunking)') |
| 166 | +parser.add_argument('--no-tpc-mt-digitizer', action='store_true', help='Digitize TPC with one process per lane instead of one multithreaded device') |
| 167 | +parser.add_argument('--tpc-mt-digitizer', action='store_true', help=argparse.SUPPRESS) # the default now; kept for compatibility |
167 | 168 | parser.add_argument('--tpc-sector-seeding', action='store_true', help='Seed the TPC digitizer per sector so that the digits do not depend on the number of lanes') |
168 | 169 | # Global Forward reconstruction configuration |
169 | 170 | parser.add_argument('--fwdmatching-assessment-full', action='store_true', help='enables complete assessment of global forward reco') |
@@ -482,10 +483,12 @@ def extractVertexArgs(configKeyValuesStr, finalDiamondDict): |
482 | 483 | print('o2dpg_sim_workflow: Error! generator name not provided') |
483 | 484 | exit(1) |
484 | 485 |
|
485 | | -if args.tpc_mt_digitizer and args.no_tpc_digitchunking: |
486 | | - print('o2dpg_sim_workflow: Error! --tpc-mt-digitizer needs TPC digit chunking') |
| 486 | +# the multithreaded TPC digitizer is the default; it needs TPC digit chunking |
| 487 | +tpc_mt_digitizer = not args.no_tpc_mt_digitizer and not args.no_tpc_digitchunking |
| 488 | +if args.tpc_mt_digitizer and not tpc_mt_digitizer: |
| 489 | + print('o2dpg_sim_workflow: Error! --tpc-mt-digitizer conflicts with --no-tpc-mt-digitizer or --no-tpc-digitchunking') |
487 | 490 | exit(1) |
488 | | -if args.tpc_mt_digitizer and args.tpc_sector_seeding: |
| 491 | +if tpc_mt_digitizer and args.tpc_sector_seeding: |
489 | 492 | print('o2dpg_sim_workflow: --tpc-sector-seeding is implied by --tpc-mt-digitizer') |
490 | 493 |
|
491 | 494 | INIFILE='' |
@@ -1185,7 +1188,7 @@ def putConfigValues(listOfMainKeys=[], localCF = {}, globalTFConfig = True): |
1185 | 1188 | + ' --tpc-distortion-type ' + str(tpcDistortionType) \ |
1186 | 1189 | + putConfigValues(["TPCGasParam","TPCGEMParam","TPCEleParam","TPCITCorr","TPCDetParam"], |
1187 | 1190 | localCF=tpcLocalCF) |
1188 | | - if args.tpc_mt_digitizer: |
| 1191 | + if tpc_mt_digitizer: |
1189 | 1192 | # one device with NWORKERS_TF threads; it always seeds per sector |
1190 | 1193 | TPCDigitask['cmd'] += ' --tpc-digi-threads ' + str(NWORKERS_TF) + ' --n-threads-distortions ' + str(NWORKERS_TF) |
1191 | 1194 | else: |
|
0 commit comments