Merge cbaa216 into sapling-pr-archive-ktf

Author: ktf

Detectors/Upgrades/ALICE3/FT3/README.md

@@ -12,18 +12,22 @@ This is top page for the FT3 detector documentation.
 Configuration of the endcap disks can be done by setting values for the `FT3Base.layoutFT3` configurable,
 the available options are presented in the following Table:
 
-| Option                 | Comments                                                                                                          |
-| ---------------------- | ----------------------------------------------------------------------------------------------------------------- |
-| `kSegmented` (default) | Currently, only OT disks have realistic implementation, for ML - simple trapezoids                                |
-| `kTrapezoidal`         | Simple trapezoisal disks (in both ML and OT), with `FT3Base.nTrapezoidalSegments=32`                              |
-| `kCylindrical`         | Simplest possible disks as TGeoTubes (ML and OT), bad for ACTS (wrong digi due to polar coorinates on disk sides) |
+| Option                            | Comments                                                                                                          |
+| --------------------------------- | ----------------------------------------------------------------------------------------------------------------- |
+| `kSegmentedStave`                 | Segmentation of ML and OT disks: Modules are placed on staggered staves with user defined constants               |
+| `kSegmentedStaveOTOnly` (default) | Only OT disks are contain staves with modules, ML layers are segmented with strips of modules on front/back       |
+| `kSegmented`                      | Segmentation of ML and OT disk with strips of modules of chips on the front and back of a layer                   |
+| `kTrapezoidal`                    | Simple trapezoidal disks (in both ML and OT), with `FT3Base.nTrapezoidalSegments=32`                              |
+| `kCylindrical`                    | Simplest possible disks as TGeoTubes (ML and OT), bad for ACTS (wrong digi due to polar coorinates on disk sides) |
+
+Furthermore, there are more options in the case of stave segmentation -- for only OT or both. The user can set to cut the staves exactly on the nominal inner radii (true by default), and outer radii (false by default) of the disks. This exists since (planned) placements of sensors & staves often protrude out of the nominal radii to be more able to cover the nominal disk area. In addition, it is possible to draw reference circles in root for the stave segmented layouts for both the inner (red) and outer (blue) radii. This is off by default, yet can be toggled if the user wants to see how tight the tiling is to the nominal radii -- for visualisation purposes only.
 
 [ [Link to definitions](./base/include/FT3Base/FT3BaseParam.h) ]
 
-For example, a geometry with the endcaps-only can be obtained by
+For example, see the command below to generate a geometry with the endcaps only, all layers with the stave geometry, and including reference circles of nominal radii for visualisation.
 ```bash
 o2-sim-serial-run5 -n 1 -g pythia8hi -m FT3 \
-  --configKeyValues "FT3Base.layoutFT3=kTrapezoidal"
+  --configKeyValues "FT3Base.layoutFT3=kSegmented; FT3Base.drawReferenceCircles=true"
 ```
 
 <!-- doxy

Detectors/Upgrades/ALICE3/FT3/simulation/include/FT3Simulation/FT3ModuleConstants.h

@@ -43,7 +43,7 @@ namespace o2::ft3::ModuleConstants
  */
 // First set all layout constants for the rest of the function
 const double single_sensor_width = 2.5;
-const double single_sensor_height = 3.2;
+const double single_sensor_height = 2.9;
 const double inactive_width = 0.2;
 const double sensor2x1_gap = 0.02;
 const double stackGap = sensor2x1_gap; // gap between 2xN module stacks
@@ -103,7 +103,7 @@ const int SiInactiveColor = kRed;
 const int glueColor = kBlue;
 const int CuColor = kOrange;
 const int kaptonColor = kYellow;
-const int carbonColor = kBlack;
+const int carbonFiberColor = kGray + 1;
 
 // Struct for stave position configuration (varies between IT/OT)
 struct StaveConfig {
@@ -177,7 +177,7 @@ const double x_midpoint_spacing = 4.5;
 const std::vector<bool> staveOnFront =
   {
     1, 0, 1, 0, 1, 0, 1, 0, // L
-    0, 1, 0, 1, 0, 1, 0, 1  // R
+    1, 0, 1, 0, 1, 0, 1, 0  // R
 };
 } // namespace ML_StavePositions
 

Detectors/Upgrades/ALICE3/FT3/simulation/src/FT3Module.cxx

@@ -326,6 +326,9 @@ void FT3Module::addStaveVolume(
     (volumeName).c_str(),
     staveShape,
     carbonFiberMed);
+  staveVolume->SetLineColor(Constants::carbonFiberColor);
+  staveVolume->SetFillColorAlpha(Constants::carbonFiberColor, 0.4);
+
   TGeoRotation* rot = new TGeoRotation();
   rot->RotateX(-90); // lift from xy plane into xz plane
   /*

Framework/Core/include/Framework/DataProcessingContext.h

@@ -13,6 +13,7 @@
 
 #include "Framework/DataRelayer.h"
 #include "Framework/AlgorithmSpec.h"
+#include <atomic>
 #include <functional>
 
 namespace o2::framework
@@ -33,7 +34,7 @@ struct DataProcessorContext {
   DataProcessorContext(DataProcessorContext const&) = delete;
   DataProcessorContext() = default;
 
-  bool allDone = false;
+  std::atomic<bool> allDone = false;
   /// Latest run number we processed globally for this DataProcessor.
   int64_t lastRunNumberProcessed = -1;
 
@@ -43,7 +44,6 @@ struct DataProcessorContext {
 
   // FIXME: move stuff here from the list below... ;-)
   ServiceRegistry* registry = nullptr;
-  std::vector<DataRelayer::RecordAction> completed;
   std::vector<ExpirationHandler> expirationHandlers;
   AlgorithmSpec::InitCallback init;
   AlgorithmSpec::ProcessCallback statefulProcess;

Framework/Core/include/Framework/StreamContext.h

@@ -11,6 +11,7 @@
 #ifndef O2_FRAMEWORK_STREAMCONTEXT_H_
 #define O2_FRAMEWORK_STREAMCONTEXT_H_
 
+#include "Framework/DataRelayer.h"
 #include "Framework/ServiceHandle.h"
 #include "ProcessingContext.h"
 #include "ServiceSpec.h"
@@ -64,6 +65,10 @@ struct StreamContext {
   // the callback will be called for all of them.
   std::vector<ServiceStartStreamHandle> preStartStreamHandles;
 
+  /// Per-stream list of actions ready to be dispatched. Populated by
+  /// getReadyToProcess() and consumed by tryDispatchComputation().
+  std::vector<DataRelayer::RecordAction> completed;
+
   // Information on wether or not all the required routes have been created.
   // This is used to check if the LifetimeTimeframe routes were all created
   // for a given iteration.

Framework/Core/src/DataAllocator.cxx

@@ -264,7 +264,11 @@ void DataAllocator::adopt(const Output& spec, LifetimeHolder<FragmentToBatch>& f
     // get rid of the intermediate tree 2 table object, saving memory.
     auto batch = source.finalize();
     if (!batch) {
-      throw std::runtime_error("FragmentToBatch::finalize() returned null RecordBatch");
+      // Do not throw here: this callback runs from ~LifetimeHolder which may
+      // execute during stack unwinding (e.g. if fill() failed). Throwing during
+      // unwinding calls std::terminate.
+      LOG(error) << "FragmentToBatch::finalize() returned null RecordBatch, skipping serialization";
+      return;
     }
     auto mock = std::make_shared<arrow::io::MockOutputStream>();
     int64_t expectedSize = 0;

Framework/Core/src/DataProcessingDevice.cxx

@@ -187,9 +187,13 @@ DataProcessingDevice::DataProcessingDevice(RunningDeviceRef running, ServiceRegi
   // 99 is to execute DPL callbacks last
   this->SubscribeToStateChange("99-dpl", stateWatcher);
 
-  // One task for now.
-  mStreams.resize(1);
-  mHandles.resize(1);
+  auto* poolSizeEnv = getenv("DPL_THREADPOOL_SIZE");
+  // 0 (or unset): synchronous execution on the main thread.
+  // N > 0: N concurrent async streams; I/O runs on the main thread while
+  //        computation runs on N pool threads.
+  size_t numStreams = poolSizeEnv ? std::max(0, std::atoi(poolSizeEnv)) : 0;
+  mStreams.resize(std::max(numStreams, 1UL));
+  mHandles.resize(std::max(numStreams, 1UL));
 
   ServiceRegistryRef ref{mServiceRegistry};
 
@@ -1210,10 +1214,8 @@ void DataProcessingDevice::Run()
   O2_SIGNPOST_ID_FROM_POINTER(lid, device, state.loop);
   O2_SIGNPOST_START(device, lid, "device_state", "First iteration of the device loop");
 
-  bool dplEnableMultithreding = getenv("DPL_THREADPOOL_SIZE") != nullptr;
-  if (dplEnableMultithreding) {
-    setenv("UV_THREADPOOL_SIZE", "1", 1);
-  }
+  auto* poolSizeEnv = getenv("DPL_THREADPOOL_SIZE");
+  bool dplEnableMultithreding = poolSizeEnv && std::atoi(poolSizeEnv) > 0;
 
   while (state.transitionHandling != TransitionHandlingState::Expired) {
     if (state.nextFairMQState.empty() == false) {
@@ -1634,6 +1636,7 @@ void DataProcessingDevice::doPrepare(ServiceRegistryRef ref)
 void DataProcessingDevice::doRun(ServiceRegistryRef ref)
 {
   auto& context = ref.get<DataProcessorContext>();
+  auto& streamContext = ref.get<StreamContext>();
   O2_SIGNPOST_ID_FROM_POINTER(dpid, device, &context);
   auto& state = ref.get<DeviceState>();
   auto& spec = ref.get<DeviceSpec const>();
@@ -1642,9 +1645,9 @@ void DataProcessingDevice::doRun(ServiceRegistryRef ref)
     return;
   }
 
-  context.completed.clear();
-  context.completed.reserve(16);
-  if (DataProcessingDevice::tryDispatchComputation(ref, context.completed)) {
+  streamContext.completed.clear();
+  streamContext.completed.reserve(16);
+  if (DataProcessingDevice::tryDispatchComputation(ref, streamContext.completed)) {
     state.lastActiveDataProcessor.store(&context);
   }
   DanglingContext danglingContext{*context.registry};
@@ -1658,8 +1661,8 @@ void DataProcessingDevice::doRun(ServiceRegistryRef ref)
     state.lastActiveDataProcessor = &context;
   }
 
-  context.completed.clear();
-  if (DataProcessingDevice::tryDispatchComputation(ref, context.completed)) {
+  streamContext.completed.clear();
+  if (DataProcessingDevice::tryDispatchComputation(ref, streamContext.completed)) {
     state.lastActiveDataProcessor = &context;
   }
 
@@ -1685,7 +1688,7 @@ void DataProcessingDevice::doRun(ServiceRegistryRef ref)
 
     bool shouldProcess = DataProcessingHelpers::hasOnlyGenerated(spec) == false;
 
-    while (DataProcessingDevice::tryDispatchComputation(ref, context.completed) && shouldProcess) {
+    while (DataProcessingDevice::tryDispatchComputation(ref, streamContext.completed) && shouldProcess) {
       relayer.processDanglingInputs(context.expirationHandlers, *context.registry, false);
     }