Changeset 4154bbd in git for modules/VertexSorter.cc

Timestamp:

Sep 1, 2016, 12:56:40 PM (8 years ago)

Author:

Pavel Demin <pavel.demin@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

61569e0

Parents:

95b4e9f

Message:

adapt vertexing modules to ROOT 5.34 and GCC 4.4

File:

• modules/VertexSorter.cc (modified) (4 diffs)

modules/VertexSorter.cc

@@ -115 +115 @@
   Candidate *candidate, *jetCandidate, *beamSpotCandidate;
   map<Int_t, UInt_t> clusterIDToIndex;
+  map<Int_t, UInt_t>::const_iterator itClusterIDToIndex;
   map<Int_t, Double_t> clusterIDToSumPT2;
+  map<Int_t, Double_t>::const_iterator itClusterIDToSumPT2;
   vector<pair<Int_t, Double_t> > sortedClusterIDs;
+  vector<pair<Int_t, Double_t> >::const_iterator itSortedClusterIDs;
 
   for (Int_t iCluster = 0; iCluster < fInputArray->GetEntries (); iCluster++)
@@ -161 +164 @@
         }
 
-      for (const auto &clusterID : clusterIDToSumPT2)
-        sortedClusterIDs.push_back (make_pair (clusterID.first, clusterID.second));
+      for (itClusterIDToSumPT2 = clusterIDToSumPT2.begin(); itClusterIDToSumPT2 != clusterIDToSumPT2.end(); ++itClusterIDToSumPT2)
+        sortedClusterIDs.push_back (make_pair (itClusterIDToSumPT2->first, itClusterIDToSumPT2->second));
       sort (sortedClusterIDs.begin (), sortedClusterIDs.end (), secondDescending);
     }
@@ -193 +196 @@
           if (candidate->IsPU)
             continue;
-          for (const auto &clusterID : clusterIDToIndex)
+          for (itClusterIDToIndex = clusterIDToIndex.begin(); itClusterIDToIndex != clusterIDToIndex.end(); ++itClusterIDToIndex)
             {
-              if (candidate->ClusterIndex != clusterID.first)
+              if (candidate->ClusterIndex != itClusterIDToIndex->first)
                 continue;
-              clusterIDToSumPT2.at (clusterID.first) += candidate->Momentum.Pt () * candidate->Momentum.Pt ();
+              clusterIDToSumPT2.at (itClusterIDToIndex->first) += candidate->Momentum.Pt () * candidate->Momentum.Pt ();
             }
         }
 
-      for (const auto &clusterID : clusterIDToSumPT2)
-        sortedClusterIDs.push_back (make_pair (clusterID.first, clusterID.second));
+      for (itClusterIDToSumPT2 = clusterIDToSumPT2.begin(); itClusterIDToSumPT2 != clusterIDToSumPT2.end(); ++itClusterIDToSumPT2)
+        sortedClusterIDs.push_back (make_pair (itClusterIDToSumPT2->first, itClusterIDToSumPT2->second));
       sort (sortedClusterIDs.begin (), sortedClusterIDs.end (), secondDescending);
     }
@@ -214 +217 @@
       throw 0;
     }
-
-  for (const auto &clusterID : sortedClusterIDs)
-    {
-      Candidate *cluster = (Candidate *) fInputArray->At (clusterIDToIndex.at (clusterID.first));
+  for (itSortedClusterIDs = sortedClusterIDs.begin(); itSortedClusterIDs != sortedClusterIDs.end(); ++itSortedClusterIDs)
+    {
+      Candidate *cluster = (Candidate *) fInputArray->At (clusterIDToIndex.at (itSortedClusterIDs->first));
       if (fMethod == "BTV")
-        cluster->BTVSumPT2 = clusterID.second;
+        cluster->BTVSumPT2 = itSortedClusterIDs->second;
       else if (fMethod == "GenClosest")
-        cluster->GenDeltaZ = clusterID.second;
+        cluster->GenDeltaZ = itSortedClusterIDs->second;
       else if (fMethod == "GenBest")
-        cluster->GenSumPT2 = clusterID.second;
+        cluster->GenSumPT2 = itSortedClusterIDs->second;
       fOutputArray->Add (cluster);
     }