Merge branch 'dev' into zdc-beamline-standalone

Author: sawenzel

.github/workflows/clean-test.yml

@@ -24,7 +24,7 @@ name: Clean PR checks
         type: boolean
         default: true
       'check_build/O2/fullCI_slc9':
-        description: build/O2/fullCI
+        description: build/O2/fullCI_slc9
         type: boolean
         default: true
       'check_build/O2/o2-dataflow-slc9':

DataFormats/Detectors/FOCAL/include/DataFormatsFOCAL/ErrorHandling.h

@@ -16,7 +16,7 @@
 
 namespace o2::focal
 {
-class IndexExceptionEvent : public std::exception
+class IndexExceptionEvent final : public std::exception
 {
  public:
   enum class IndexType_t {

Detectors/Align/Workflow/src/barrel-alignment-workflow.cxx

@@ -151,7 +151,7 @@ WorkflowSpec defineDataProcessing(ConfigContext const& configcontext)
   }
 
   if (!configcontext.options().get<bool>("disable-root-input")) {
-    specs.emplace_back(o2::tpc::getTPCScalerSpec(sclOpt.lumiType == o2::tpc::LumiScaleType::TPCScaler, sclOpt.enableMShapeCorrection, sclOpt));
+    specs.emplace_back(o2::tpc::getTPCScalerSpec(sclOpt));
   }
 
   specs.emplace_back(o2::align::getBarrelAlignmentSpec(srcMP, src, dets, skipDetClusters, enableCosmic, postprocess, useMC));

Detectors/EMCAL/calib/include/EMCALCalib/CalibContainerErrors.h

@@ -26,7 +26,7 @@ namespace emcal
 /// \ingroup EMCALCalib
 /// \author Markus Fasel <markus.fasel@cern.ch>, Oak Ridge National Laboratory
 /// \since Sept 15, 2022
-class CalibContainerIndexException : public std::exception
+class CalibContainerIndexException final : public std::exception
 {
  public:
   /// \brief Constructor

Detectors/FOCAL/base/src/Composition.cxx

@@ -28,7 +28,7 @@ Composition::Composition(std::string material, int layer, int stack, int id,
   // Default constructor
 }
 
-Composition::Composition(Composition* comp) : mMaterial(nullptr),
+Composition::Composition(Composition* comp) : mMaterial(),
                                               mLayer(0),
                                               mStack(0),
                                               mId(0),

Detectors/FOCAL/calibration/include/FOCALCalibration/PadPedestalCalibDevice.h

@@ -26,7 +26,7 @@
 namespace o2::focal
 {
 
-class PadPedestalCalibDevice : public framework::Task
+class PadPedestalCalibDevice final : public framework::Task
 {
  public:
   enum Method_t {

Detectors/GlobalTrackingWorkflow/src/cosmics-match-workflow.cxx

@@ -107,7 +107,7 @@ WorkflowSpec defineDataProcessing(ConfigContext const& configcontext)
   GID::mask_t srcCl = src;
   GID::mask_t dummy;
   if (!configcontext.options().get<bool>("disable-root-input")) {
-    specs.emplace_back(o2::tpc::getTPCScalerSpec(sclOpt.lumiType == o2::tpc::LumiScaleType::TPCScaler, sclOpt.enableMShapeCorrection, sclOpt));
+    specs.emplace_back(o2::tpc::getTPCScalerSpec(sclOpt));
   }
   bool usePV = configcontext.options().get<bool>("use-pv-info");
   specs.emplace_back(o2::globaltracking::getCosmicsMatchingSpec(src, usePV, useMC));

Detectors/GlobalTrackingWorkflow/src/secondary-vertexing-workflow.cxx

@@ -102,7 +102,7 @@ WorkflowSpec defineDataProcessing(ConfigContext const& configcontext)
   }
   WorkflowSpec specs;
   if (!configcontext.options().get<bool>("disable-root-input")) {
-    specs.emplace_back(o2::tpc::getTPCScalerSpec(sclOpt.lumiType == o2::tpc::LumiScaleType::TPCScaler, sclOpt.enableMShapeCorrection, sclOpt));
+    specs.emplace_back(o2::tpc::getTPCScalerSpec(sclOpt));
   }
   specs.emplace_back(o2::vertexing::getSecondaryVertexingSpec(src, enableCasc, enable3body, enableStrTr, enableCCDBParams, useMC, useGeom));
 

Detectors/GlobalTrackingWorkflow/src/tof-matcher-workflow.cxx

@@ -169,7 +169,7 @@ WorkflowSpec defineDataProcessing(ConfigContext const& configcontext)
     }
   }
   if (!configcontext.options().get<bool>("disable-root-input")) {
-    specs.emplace_back(o2::tpc::getTPCScalerSpec(sclOpt.lumiType == o2::tpc::LumiScaleType::TPCScaler, sclOpt.enableMShapeCorrection, sclOpt));
+    specs.emplace_back(o2::tpc::getTPCScalerSpec(sclOpt));
   }
   specs.emplace_back(o2::globaltracking::getTOFMatcherSpec(src, useMC, useFIT, refitTPCTOF, strict, extratolerancetrd, writeMatchable, sclOpt.requestCTPLumi, nLanes)); // doTPCrefit not yet supported (need to load TPC clusters?)
 

Detectors/GlobalTrackingWorkflow/src/tpcits-match-workflow.cxx

@@ -94,7 +94,7 @@ WorkflowSpec defineDataProcessing(o2::framework::ConfigContext const& configcont
 
   o2::framework::WorkflowSpec specs;
   if (!configcontext.options().get<bool>("disable-root-input")) {
-    specs.emplace_back(o2::tpc::getTPCScalerSpec(sclOpt.lumiType == o2::tpc::LumiScaleType::TPCScaler, sclOpt.enableMShapeCorrection, sclOpt));
+    specs.emplace_back(o2::tpc::getTPCScalerSpec(sclOpt));
   }
   specs.emplace_back(o2::globaltracking::getTPCITSMatchingSpec(srcL, useFT0, calib, !GID::includesSource(GID::TPC, src), useGeom, useMC, sclOpt.requestCTPLumi));