Changeset d77b51d in git for modules/UniqueObjectFinder.h

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.h (modified) (2 diffs)

modules/UniqueObjectFinder.h

@@ -30 +30 @@
 #include "classes/DelphesModule.h"
 
-#include <map>
+#include <vector>
+#include <utility>
 
 class TIterator;
@@ -49 +50 @@
 private:
 
-  Bool_t Unique(Candidate *candidate, std::map< TIterator *, TObjArray * >::iterator itInputMap);
+  Bool_t Unique(Candidate *candidate, std::vector< std::pair< TIterator *, TObjArray * > >::iterator itInputMap);
 
-  std::map< TIterator *, TObjArray * > fInputMap; //!
+  std::vector< std::pair< TIterator *, TObjArray * > > fInputMap; //!
 
   ClassDef(UniqueObjectFinder, 1)