Changeset 93da593 in git for modules

Timestamp:

Sep 11, 2015, 11:52:41 PM (9 years ago)

Author:

Pavel Demin <pavel.demin@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

410f3a2

Parents:

b631c06

Message:

replace map with vector in UniqueObjectFinder

Location:

modules

Files:

• UniqueObjectFinder.cc (modified) (5 diffs)
• UniqueObjectFinder.h (modified) (2 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;
 

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)