Merge f422114 into sapling-pr-archive-ktf

Author: ktf

Detectors/GlobalTrackingWorkflow/study/src/trackMCStudy-workflow.cxx

@@ -71,7 +71,10 @@ WorkflowSpec defineDataProcessing(ConfigContext const& configcontext)
   GID::mask_t srcTrc = allowedSourcesTrc & GID::getSourcesMask(configcontext.options().get<std::string>("track-sources"));
   GID::mask_t srcCls = allowedSourcesClus & GID::getSourcesMask(configcontext.options().get<std::string>("cluster-sources"));
   srcCls |= GID::getSourcesMask("ITS,TPC");
-
+  if (sclOpt.requestCTPLumi) {
+    srcTrc = srcTrc | GID::getSourcesMask("CTP");
+    srcCls = srcCls | GID::getSourcesMask("CTP");
+  }
   o2::globaltracking::InputHelper::addInputSpecs(configcontext, specs, srcCls, srcTrc, srcTrc, true);
   o2::globaltracking::InputHelper::addInputSpecsPVertex(configcontext, specs, true); // P-vertex is always needed
   if (checkSV) {

Detectors/ITSMFT/common/workflow/src/DigitReaderSpec.cxx

@@ -70,7 +70,7 @@ void DigitReader::init(InitContext& ic)
 void DigitReader::run(ProcessingContext& pc)
 {
   const auto& tinfo = pc.services().get<o2::framework::TimingInfo>();
-  if (tinfo.globalRunNumberChanged) { // new run is starting: 1st call
+  if (tinfo.globalRunNumberChanged && mUseIRFrames) { // new run is starting: 1st call
     // TODO: we have to find a way define CCDBInput for IRFrames mode only using DPL fetcher
     auto& ccdb = o2::ccdb::BasicCCDBManager::instance();
     auto rlim = ccdb.getRunDuration(tinfo.runNumber);

Framework/AnalysisSupport/src/Plugin.cxx

@@ -142,6 +142,7 @@ struct DiscoverMetadataInAOD : o2::framework::ConfigDiscoveryPlugin {
         if (tables.empty() == false) {
           results.push_back(ConfigParamSpec{"aod-metadata-tables", VariantType::ArrayString, tables, {"Tables in first AOD"}});
         }
+        currentFile->Close();
         return results;
       }};
   }

Framework/Core/src/ExternalFairMQDeviceProxy.cxx

@@ -108,8 +108,8 @@ void sendOnChannel(fair::mq::Device& device, fair::mq::Parts& messages, std::str
   }
 
   // FIXME: we need a better logic for avoiding message spam
-  if (timeout > 1 && timeout <= maxTimeout) {
-    LOG(warning) << "dispatching on channel " << channel << " was delayed by " << timeout << " ms";
+  if (timeout > 100 && timeout <= maxTimeout) {
+    LOG(warning) << "dispatching on channel " << channel << " was delayed by " << timeout / 1000.f << " s";
   }
   // TODO: feeling this is a bit awkward, but the interface of fair::mq::Parts does not provide a
   // method to clear the content.

GPU/TPCFastTransformation/CorrectionMapsHelper.h

@@ -90,10 +90,11 @@ class CorrectionMapsHelper
     }
   }
 
-  void setMeanLumiRef(float v)
+  void setMeanLumiRef(float v, bool report = false)
   {
-    if (v != mMeanLumi) {
+    if (v != mMeanLumiRef) {
       mMeanLumiRef = v;
+      updateLumiScale(report);
     }
   }