Enable TRD TRAP sim by default, avoid global OpenMP setting

Author: martenole

Detectors/TRD/simulation/src/Digitizer.cxx

@@ -157,9 +157,8 @@ void Digitizer::process(std::vector<Hit> const& hits)
   getHitContainerPerDetector(hits, hitsPerDetector);
 
 #ifdef WITH_OPENMP
-  omp_set_num_threads(mNumThreads);
 // Loop over all TRD detectors (in a parallel fashion)
-#pragma omp parallel for schedule(dynamic)
+#pragma omp parallel for schedule(dynamic) num_threads(mNumThreads)
 #endif
   for (int det = 0; det < MAXCHAMBER; ++det) {
 #ifdef WITH_OPENMP

Detectors/TRD/workflow/src/TRDTrapSimulatorSpec.cxx

@@ -248,8 +248,7 @@ void TRDDPLTrapSimulatorTask::run(o2::framework::ProcessingContext& pc)
   auto timeParallelStart = std::chrono::high_resolution_clock::now();
 
 #ifdef WITH_OPENMP
-  omp_set_num_threads(mNumThreads);
-#pragma omp parallel for schedule(dynamic)
+#pragma omp parallel for schedule(dynamic) num_threads(mNumThreads)
 #endif
   for (int iTrig = 0; iTrig < triggerRecords.size(); ++iTrig) {
     int currHCId = -1;

Steer/DigitizerWorkflow/src/SimpleDigitizerWorkflow.cxx

@@ -174,7 +174,7 @@ void customize(std::vector<o2::framework::ConfigParamSpec>& workflowOptions)
   workflowOptions.push_back(ConfigParamSpec{"use-ccdb-tof", o2::framework::VariantType::Bool, false, {"enable access to ccdb tof calibration objects"}});
 
   // option to use or not use the Trap Simulator after digitisation (debate of digitization or reconstruction is for others)
-  workflowOptions.push_back(ConfigParamSpec{"enable-trd-trapsim", VariantType::Bool, false, {"enable the trap simulation of the TRD"}});
+  workflowOptions.push_back(ConfigParamSpec{"disable-trd-trapsim", VariantType::Bool, false, {"disable the trap simulation of the TRD"}});
 }
 
 void customize(std::vector<o2::framework::DispatchPolicy>& policies)
@@ -544,8 +544,8 @@ WorkflowSpec defineDataProcessing(ConfigContext const& configcontext)
     specs.emplace_back(o2::trd::getTRDDigitizerSpec(fanoutsize++, mctruth));
     // connect the TRD digit writer
     specs.emplace_back(o2::trd::getTRDDigitWriterSpec(mctruth));
-    auto enableTrapSim = configcontext.options().get<bool>("enable-trd-trapsim");
-    if (enableTrapSim) {
+    auto disableTrapSim = configcontext.options().get<bool>("disable-trd-trapsim");
+    if (!disableTrapSim) {
       // connect the TRD Trap SimulatorA
       specs.emplace_back(o2::trd::getTRDTrapSimulatorSpec(mctruth));
       // connect to the device to write out the tracklets.

prodtests/full_system_test.sh

@@ -61,7 +61,7 @@ QED2HAD=$(awk "BEGIN {printf \"%.2f\",`grep xSectionQED qedgenparam.ini | cut -d
 echo "Obtained ratio of QED to hadronic x-sections = $QED2HAD" >> qedsim.log
 cd ..
 
-DIGITRDOPTREAL="--configKeyValues \"TRDSimParams.digithreads=${NJOBS}\" --enable-trd-trapsim"
+DIGITRDOPTREAL="--configKeyValues \"TRDSimParams.digithreads=${NJOBS}\" "
 if [ $SPLITTRDDIGI == "1" ]; then
   DIGITRDOPT="--skipDet TRD"
 else