Fix Variable shadowing and performance issue

Author: axti98

ALICE3/TableProducer/alice3-dq-table-maker.cxx

@@ -381,19 +381,22 @@ struct Alice3DQTableMaker {
       }
 
       // If this MC track was not already added to the map, add it now
-      if (fLabelsMap.find(mctrack.globalIndex()) == fLabelsMap.end()) {
-        fLabelsMap[mctrack.globalIndex()] = trackCounter;
-        fLabelsMapReversed[trackCounter] = mctrack.globalIndex();
-        fMCFlags[mctrack.globalIndex()] = mcflags;
-        trackCounter++;
+      const auto mcTrackIndex = mctrack.globalIndex();
+      const bool inserted = fLabelsMap.try_emplace(mcTrackIndex, trackCounter).second;
+
+      if (inserted) {
+        fLabelsMapReversed.try_emplace(trackCounter, mcTrackIndex);
+        fMCFlags.try_emplace(mcTrackIndex, mcflags);
+        ++trackCounter;
 
         // fill histograms for each of the signals, if found
         if (fConfigHistOutput.fConfigQA) {
           VarManager::FillTrackMC(mcTracks, mctrack);
           auto mcCollision = mctrack.template mcCollision_as<MyEventsMC>();
           VarManager::FillEvent<gkEventMcFillMap>(mcCollision);
+
           int j = 0;
-          for (auto signal = fMCSignals.begin(); signal != fMCSignals.end(); signal++, j++) {
+          for (auto signal = fMCSignals.begin(); signal != fMCSignals.end(); ++signal, ++j) {
             if (mcflags & (static_cast<uint16_t>(1) << j)) {
               fHistMan->FillHistClass(Form("MCTruth_%s", (*signal)->GetName()), VarManager::fgValues);
             }

ALICE3/Tasks/alice3-dq-efficiency.cxx

@@ -909,9 +909,9 @@ struct AnalysisSameEventPairing {
             // if there are pair cuts specified, assign hist directories for each barrel cut - pair cut combination
             // NOTE: This could possibly lead to large histogram outputs. It is strongly advised to use pair cuts only
             //   if you know what you are doing.
-            TString pairCutNamesStr = fConfigCuts.pair.value;
-            if (!pairCutNamesStr.IsNull()) { // if pair cuts
-              std::unique_ptr<TObjArray> objArrayPair(pairCutNamesStr.Tokenize(","));
+            TString pairCutHistNamesStr = fConfigCuts.pair.value;
+            if (!pairCutHistNamesStr.IsNull()) { // if pair cuts
+              std::unique_ptr<TObjArray> objArrayPair(pairCutHistNamesStr.Tokenize(","));
               fNPairCuts = objArrayPair->GetEntries();
               for (int iPairCut = 0; iPairCut < fNPairCuts; ++iPairCut) { // loop over pair cuts
                 names = {
@@ -1757,9 +1757,9 @@ struct AnalysisAsymmetricPairing {
           DefineHistograms(fHistMan, Form("TripletsBarrelSE_%s_%s", legsStr.Data(), objArrayCommon->At(iCommonCut)->GetName()), fConfigHistogramSubgroups.value.data());
         }
 
-        TString pairCutNamesStr = fConfigPairCuts.value;
-        if (!pairCutNamesStr.IsNull()) { // if pair cuts
-          std::unique_ptr<TObjArray> objArrayPair(pairCutNamesStr.Tokenize(","));
+        TString pairCutHistNamesStr = fConfigPairCuts.value;
+        if (!pairCutHistNamesStr.IsNull()) { // if pair cuts
+          std::unique_ptr<TObjArray> objArrayPair(pairCutHistNamesStr.Tokenize(","));
           fNPairCuts = objArrayPair->GetEntries();
           for (int iPairCut = 0; iPairCut < fNPairCuts; ++iPairCut) { // loop over pair cuts
             DefineHistograms(fHistMan, Form("TripletsBarrelSE_%s_%s", legsStr.Data(), objArrayPair->At(iPairCut)->GetName()), fConfigHistogramSubgroups.value.data());