Merge branch 'AliceO2Group:dev' into new-detector4

Author: pkurash

Common/DCAFitter/include/DCAFitter/HelixHelper.h

@@ -2063,16 +2063,11 @@ void AODProducerWorkflowDPL::run(ProcessingContext& pc)
     const auto& mcRecords = mcReader->getDigitizationContext()->getEventRecords();
     const auto& mcParts = mcReader->getDigitizationContext()->getEventParts();
 
-    // count all parts
-    int totalNParts = 0;
-    for (int iCol = 0; iCol < nMCCollisions; iCol++) {
-      totalNParts += mcParts[iCol].size();
-
-      // if signal filtering enabled, let's check if there are more than one source; otherwise fatalise
-      if (mUseSigFiltMC) {
-        std::vector<int> sourceIDs{};
-        auto& colParts = mcParts[iCol];
-        for (auto colPart : colParts) {
+    // if signal filtering enabled, let's check if there are more than one source; otherwise fatalise
+    if (mUseSigFiltMC) {
+      std::vector<int> sourceIDs{};
+      for (int iCol = 0; iCol < nMCCollisions; iCol++) {
+        for (auto const& colPart : mcParts[iCol]) {
           int sourceID = colPart.sourceID;
           if (std::find(sourceIDs.begin(), sourceIDs.end(), sourceID) == sourceIDs.end()) {
             sourceIDs.push_back(sourceID);
@@ -2081,10 +2076,19 @@ void AODProducerWorkflowDPL::run(ProcessingContext& pc)
             break;
           }
         }
-        if (sourceIDs.size() <= 1) {
-          LOGP(fatal, "Signal filtering cannot be enabled without embedding. Please fix the configuration either enabling the embedding, or turning off the signal filtering.");
+        if (sourceIDs.size() > 1) { // we found more than one, exit
+          break;
         }
       }
+      if (sourceIDs.size() <= 1) {
+        LOGP(fatal, "Signal filtering cannot be enabled without embedding. Please fix the configuration either enabling the embedding, or turning off the signal filtering.");
+      }
+    }
+
+    // count all parts
+    int totalNParts = 0;
+    for (int iCol = 0; iCol < nMCCollisions; iCol++) {
+      totalNParts += mcParts[iCol].size();
     }
     mcCollisionsCursor.reserve(totalNParts);
 

Detectors/AOD/src/AODProducerWorkflowSpec.cxx

@@ -245,8 +245,8 @@ void MatchTPCITS::init()
   }
 #endif
 
-  if (mParams->runAfterBurner) { // only used in AfterBurner
-    mRGHelper.init();            // prepare helper for TPC track / ITS clusters matching
+  if (mParams->runAfterBurner) {            // only used in AfterBurner
+    mRGHelper.init(mParams->lowestLayerAB); // prepare helper for TPC track / ITS clusters matching
   }
 
   clear();

Detectors/GlobalTracking/src/MatchTPCITS.cxx

@@ -103,7 +103,7 @@ struct RecoGeomHelper {
   static constexpr float ladderWidth() { return o2::itsmft::SegmentationAlpide::SensorSizeRows; }
   static constexpr float ladderWidthInv() { return 1. / ladderWidth(); }
 
-  void init();
+  void init(int minLayer = 0, int maxLayer = getNLayers());
   void print() const;
 
   ClassDefNV(RecoGeomHelper, 0);

Detectors/ITSMFT/ITS/reconstruction/include/ITSReconstruction/RecoGeomHelper.h

@@ -229,9 +229,9 @@ void RecoGeomHelper::RecoLayer::print() const
 }
 
 //_____________________________________________________________________
-void RecoGeomHelper::init()
+void RecoGeomHelper::init(int minLayer, int maxLayer)
 {
-  for (int il = int(layers.size()); il--;) {
+  for (int il = maxLayer; --il >= minLayer;) {
     auto& lr = layers[il];
     lr.id = il;
     lr.init();

Detectors/ITSMFT/ITS/reconstruction/src/RecoGeomHelper.cxx

@@ -46,7 +46,7 @@ class PipeRun4 : public PassiveBase
   TGeoPcon* makeMotherFromTemplate(const TGeoPcon* shape, int imin = -1, int imax = -1, float r0 = 0.,
                                    int nz = -1);
   TGeoPcon* makeInsulationFromTemplate(TGeoPcon* shape);
-  TGeoVolume* makeBellow(const char* ext, int nc, float rMin, float rMax, float dU, float rPlie,
+  TGeoVolume* makeBellow(const char* ext, int nc, float rMin, float rMax, float rPlie,
                          float dPlie);
   TGeoVolume* makeBellowCside(const char* ext, int nc, float rMin, float rMax, float rPlie, float dPlie);