@@ -280,24 +280,24 @@ struct DalitzSelection {
280280
281281 // Define histograms
282282
283- std::unique_ptr<TObjArray> objArray (histClasses.Tokenize (" ;" ));
284- for (Int_t iclass = 0 ; iclass < objArray ->GetEntries (); ++iclass) {
285- TString classStr = objArray ->At (iclass)->GetName ();
283+ std::unique_ptr<TObjArray> histArray (histClasses.Tokenize (" ;" ));
284+ for (Int_t iclass = 0 ; iclass < histArray ->GetEntries (); ++iclass) {
285+ TString classStr = histArray ->At (iclass)->GetName ();
286286 fHistMan ->AddHistClass (classStr.Data ());
287287
288288 if (classStr.Contains (" Event" )) {
289- dqhistograms::DefineHistograms (fHistMan , objArray ->At (iclass)->GetName (), " event" , " " );
289+ dqhistograms::DefineHistograms (fHistMan , histArray ->At (iclass)->GetName (), " event" , " " );
290290 }
291291
292292 TString histTrackName = fConfigHistograms .fConfigAddTrackHistogram .value ;
293293 if (classStr.Contains (" Track" )) {
294- dqhistograms::DefineHistograms (fHistMan , objArray ->At (iclass)->GetName (), " track" , histTrackName);
295- dqhistograms::DefineHistograms (fHistMan , objArray ->At (iclass)->GetName (), " software-trigger" , histTrackName);
294+ dqhistograms::DefineHistograms (fHistMan , histArray ->At (iclass)->GetName (), " track" , histTrackName);
295+ dqhistograms::DefineHistograms (fHistMan , histArray ->At (iclass)->GetName (), " software-trigger" , histTrackName);
296296 }
297297
298298 TString histPairName = fConfigHistograms .fConfigAddPairHistogram .value ;
299299 if (classStr.Contains (" Pair" )) {
300- dqhistograms::DefineHistograms (fHistMan , objArray ->At (iclass)->GetName (), " pair" , histPairName);
300+ dqhistograms::DefineHistograms (fHistMan , histArray ->At (iclass)->GetName (), " pair" , histPairName);
301301 }
302302 }
303303
@@ -311,7 +311,7 @@ struct DalitzSelection {
311311 fStatsList ->SetOwner (kTRUE );
312312
313313 // Dalitz selection statistics: one bin for each (track,pair) selection
314- TH1I * histTracks = new TH1I (" TrackStats" , " Dalitz selection statistics" , fPairCuts .size () * (1 + ( int ) fIsTagAndProbe ) + 1 , -0.5 , fPairCuts .size () * (1 + ( int ) fIsTagAndProbe ) + 0.5 );
314+ TH1I * histTracks = new TH1I (" TrackStats" , " Dalitz selection statistics" , fPairCuts .size () * (1 + static_cast < int >( fIsTagAndProbe )) + 1 , -0.5 , fPairCuts .size () * (1 + static_cast < int >( fIsTagAndProbe ) ) + 0.5 );
315315 histTracks->GetXaxis ()->SetBinLabel (1 , " Events selected" );
316316 auto trackCut = fTrackCuts .begin ();
317317 int icut = 1 ;
@@ -332,7 +332,7 @@ struct DalitzSelection {
332332
333333 // autodetect whether the dalitz bits are requested
334334 fIsOutputRequested = false ;
335- auto & workflows = context.services ().template get <o2::framework::RunningWorkflowInfo const >();
335+ const auto & workflows = context.services ().template get <o2::framework::RunningWorkflowInfo const >();
336336 // autodetect this table in other devices
337337 for (o2::framework::DeviceSpec const & device : workflows.devices ) {
338338 // Check if this device subscribed to the dalitz table
@@ -437,23 +437,23 @@ struct DalitzSelection {
437437 auto const & fullTrack = track1.template track_as <TFullTracks>();
438438 if (filterMap) {
439439 // we use the 8th bit to keep track of the track sign
440- MixingHandler::MixingTrack mixingTrack (fullTrack.pt (), fullTrack.eta (), fullTrack.phi (), fullTrack.sign () > 0 ? (static_cast <uint32_t >(filterMap) | (uint32_t (1 ) << 8 )) : static_cast <uint32_t >(filterMap));
440+ MixingHandler::MixingTrack mixingTrack (fullTrack.pt (), fullTrack.eta (), fullTrack.phi (), fullTrack.sign () > 0 ? (static_cast <uint32_t >(filterMap) | (static_cast < uint32_t > (1 ) << 8 )) : static_cast <uint32_t >(filterMap));
441441 fMixingEvent ->AddTrack1 (mixingTrack);
442442 }
443443 if (filterMapProbe) {
444444 // we use the 8th bit to keep track of the track sign
445- MixingHandler::MixingTrack mixingTrack (fullTrack.pt (), fullTrack.eta (), fullTrack.phi (), fullTrack.sign () > 0 ? (static_cast <uint32_t >(filterMapProbe) | (uint32_t (1 ) << 8 )) : static_cast <uint32_t >(filterMapProbe));
445+ MixingHandler::MixingTrack mixingTrack (fullTrack.pt (), fullTrack.eta (), fullTrack.phi (), fullTrack.sign () > 0 ? (static_cast <uint32_t >(filterMapProbe) | (static_cast < uint32_t > (1 ) << 8 )) : static_cast <uint32_t >(filterMapProbe));
446446 fMixingEvent ->AddTrack2 (mixingTrack);
447447 }
448448 } else {
449449 if (filterMap) {
450450 // we use the 8th bit to keep track of the track sign
451- MixingHandler::MixingTrack mixingTrack (track1.pt (), track1.eta (), track1.phi (), track1.sign () > 0 ? (static_cast <uint32_t >(filterMap) | (uint32_t (1 ) << 8 )) : static_cast <uint32_t >(filterMap));
451+ MixingHandler::MixingTrack mixingTrack (track1.pt (), track1.eta (), track1.phi (), track1.sign () > 0 ? (static_cast <uint32_t >(filterMap) | (static_cast < uint32_t > (1 ) << 8 )) : static_cast <uint32_t >(filterMap));
452452 fMixingEvent ->AddTrack1 (mixingTrack);
453453 }
454454 if (filterMapProbe) {
455455 // we use the 8th bit to keep track of the track sign
456- MixingHandler::MixingTrack mixingTrack (track1.pt (), track1.eta (), track1.phi (), track1.sign () > 0 ? (static_cast <uint32_t >(filterMapProbe) | (uint32_t (1 ) << 8 )) : static_cast <uint32_t >(filterMapProbe));
456+ MixingHandler::MixingTrack mixingTrack (track1.pt (), track1.eta (), track1.phi (), track1.sign () > 0 ? (static_cast <uint32_t >(filterMapProbe) | (static_cast < uint32_t > (1 ) << 8 )) : static_cast <uint32_t >(filterMapProbe));
457457 fMixingEvent ->AddTrack2 (mixingTrack);
458458 }
459459 }
@@ -585,8 +585,8 @@ struct DalitzSelection {
585585 // Fill Hists
586586 if (fConfigOptions .fQA && !fSkipEvent ) {
587587 for (const auto & track : tracks1) {
588- auto filterMap = uint8_t ( 0 ) ;
589- auto filterMapProbe = uint8_t ( 0 ) ;
588+ uint8_t filterMap;
589+ uint8_t filterMapProbe;
590590 if constexpr (isReassoc) {
591591 auto const & fullTrack = track.template track_as <TFullTracks>();
592592 filterMap = fDalitzmap [fullTrack.globalIndex ()];
0 commit comments