Changeset d77b51d in git for modules/UniqueObjectFinder.cc

Timestamp:

Sep 29, 2015, 2:08:10 PM (9 years ago)

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

a98c7ef

Parents:

d870fc5 (diff), 06ec139 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge remote-tracking branch 'upstream/master'

File:

• modules/UniqueObjectFinder.cc (modified) (5 diffs)

modules/UniqueObjectFinder.cc

@@ -74 +74 @@
   TIterator *iterator;
 
+  fInputMap.clear();
+
   size = param.GetSize();
   for(i = 0; i < size/2; ++i)
@@ -80 +82 @@
     iterator = array->MakeIterator();
 
-    fInputMap[iterator] = ExportArray(param[i*2 + 1].GetString());
+    fInputMap.push_back(make_pair(iterator, ExportArray(param[i*2 + 1].GetString())));
   }
 }
@@ -88 +90 @@
 void UniqueObjectFinder::Finish()
 {
-  map< TIterator *, TObjArray * >::iterator itInputMap;
+  vector< pair< TIterator *, TObjArray * > >::iterator itInputMap;
   TIterator *iterator;
 
@@ -104 +106 @@
 {
   Candidate *candidate;
-  map< TIterator *, TObjArray * >::iterator itInputMap;
+  vector< pair< TIterator *, TObjArray * > >::iterator itInputMap;
   TIterator *iterator;
   TObjArray *array;
@@ -128 +130 @@
 //------------------------------------------------------------------------------
 
-Bool_t UniqueObjectFinder::Unique(Candidate *candidate, map< TIterator *, TObjArray * >::iterator itInputMap)
+Bool_t UniqueObjectFinder::Unique(Candidate *candidate, vector< pair< TIterator *, TObjArray * > >::iterator itInputMap)
 {
   Candidate *previousCandidate;
-  map< TIterator *, TObjArray * >::iterator previousItInputMap;
+  vector< pair< TIterator *, TObjArray * > >::iterator previousItInputMap;
   TObjArray *array;