Changeset d77b51d in git for modules/UniqueObjectFinder.cc
- Timestamp:
- Sep 29, 2015, 2:08:10 PM (9 years ago)
- 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. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
modules/UniqueObjectFinder.cc
rd870fc5 rd77b51d 74 74 TIterator *iterator; 75 75 76 fInputMap.clear(); 77 76 78 size = param.GetSize(); 77 79 for(i = 0; i < size/2; ++i) … … 80 82 iterator = array->MakeIterator(); 81 83 82 fInputMap [iterator] = ExportArray(param[i*2 + 1].GetString());84 fInputMap.push_back(make_pair(iterator, ExportArray(param[i*2 + 1].GetString()))); 83 85 } 84 86 } … … 88 90 void UniqueObjectFinder::Finish() 89 91 { 90 map< TIterator *, TObjArray *>::iterator itInputMap;92 vector< pair< TIterator *, TObjArray * > >::iterator itInputMap; 91 93 TIterator *iterator; 92 94 … … 104 106 { 105 107 Candidate *candidate; 106 map< TIterator *, TObjArray *>::iterator itInputMap;108 vector< pair< TIterator *, TObjArray * > >::iterator itInputMap; 107 109 TIterator *iterator; 108 110 TObjArray *array; … … 128 130 //------------------------------------------------------------------------------ 129 131 130 Bool_t UniqueObjectFinder::Unique(Candidate *candidate, map< TIterator *, TObjArray *>::iterator itInputMap)132 Bool_t UniqueObjectFinder::Unique(Candidate *candidate, vector< pair< TIterator *, TObjArray * > >::iterator itInputMap) 131 133 { 132 134 Candidate *previousCandidate; 133 map< TIterator *, TObjArray *>::iterator previousItInputMap;135 vector< pair< TIterator *, TObjArray * > >::iterator previousItInputMap; 134 136 TObjArray *array; 135 137
Note:
See TracChangeset
for help on using the changeset viewer.