Merge in dev

Author: cholmcc

Detectors/AOD/src/AODProducerWorkflowSpec.cxx

@@ -2354,7 +2354,7 @@ bool AODProducerWorkflowDPL::propagateTrackToPV(o2::track::TrackParametrizationW
   dcaInfo.set(999.f, 999.f, 999.f, 999.f, 999.f);
   o2::dataformats::VertexBase v = mVtx.getMeanVertex(colID < 0 ? 0.f : data.getPrimaryVertex(colID).getZ());
   return o2::base::Propagator::Instance()->propagateToDCABxByBz(v, trackPar, 2.f, mMatCorr, &dcaInfo);
-};
+}
 
 void AODProducerWorkflowDPL::extrapolateToCalorimeters(TrackExtraInfo& extraInfoHolder, const o2::track::TrackPar& track)
 {
@@ -2373,7 +2373,8 @@ void AODProducerWorkflowDPL::extrapolateToCalorimeters(TrackExtraInfo& extraInfo
     SPHOS,                                          // 12 PHOS only
     SPHOS | SEMCAL, SPHOS | SEMCAL, SPHOS | SEMCAL, // 13:15 PHOS & DCAL
     SEMCAL,                                         // 16 DCAL only
-    SNONE};                                         // 17
+    SNONE                                           // 17
+  };
 
   o2::track::TrackPar outTr{track};
   auto prop = o2::base::Propagator::Instance();
@@ -2767,13 +2768,9 @@ DataProcessorSpec getAODProducerWorkflowSpec(GID::mask_t src, bool enableSV, boo
       ConfigParamSpec{"ctpreadout-create", VariantType::Int, 0, {"Create CTP digits from detector readout and CTP inputs. !=1 -- off, 1 -- on"}},
       ConfigParamSpec{"emc-select-leading", VariantType::Bool, false, {"Flag to select if only the leading contributing particle for an EMCal cell should be stored"}},
       ConfigParamSpec{"propagate-tracks", VariantType::Bool, false, {"Propagate tracks (not used for secondary vertices) to IP"}},
-      ConfigParamSpec{"hepmc-update", VariantType::String, "any", {"When to update HepMC Aux tables: always - force update, never - never update, all - if all keys are present, any - when any key is present"}}}};
-  ConfigParamSpec
-  {
-    "propagate-muons", VariantType::Bool, false, { "Propagate muons to IP" }
-  }
-}
-};
+      ConfigParamSpec{"hepmc-update", VariantType::String, "any", {"When to update HepMC Aux tables: always - force update, never - never update, all - if all keys are present, any - when any key is present"}},
+      ConfigParamSpec{
+        "propagate-muons", VariantType::Bool, false, {"Propagate muons to IP"}}}};
 }
 
 } // namespace o2::aodproducer