Fork me on GitHub

Changeset d77b51d in git for modules/UniqueObjectFinder.cc


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • modules/UniqueObjectFinder.cc

    rd870fc5 rd77b51d  
    7474  TIterator *iterator;
    7575
     76  fInputMap.clear();
     77
    7678  size = param.GetSize();
    7779  for(i = 0; i < size/2; ++i)
     
    8082    iterator = array->MakeIterator();
    8183
    82     fInputMap[iterator] = ExportArray(param[i*2 + 1].GetString());
     84    fInputMap.push_back(make_pair(iterator, ExportArray(param[i*2 + 1].GetString())));
    8385  }
    8486}
     
    8890void UniqueObjectFinder::Finish()
    8991{
    90   map< TIterator *, TObjArray * >::iterator itInputMap;
     92  vector< pair< TIterator *, TObjArray * > >::iterator itInputMap;
    9193  TIterator *iterator;
    9294
     
    104106{
    105107  Candidate *candidate;
    106   map< TIterator *, TObjArray * >::iterator itInputMap;
     108  vector< pair< TIterator *, TObjArray * > >::iterator itInputMap;
    107109  TIterator *iterator;
    108110  TObjArray *array;
     
    128130//------------------------------------------------------------------------------
    129131
    130 Bool_t UniqueObjectFinder::Unique(Candidate *candidate, map< TIterator *, TObjArray * >::iterator itInputMap)
     132Bool_t UniqueObjectFinder::Unique(Candidate *candidate, vector< pair< TIterator *, TObjArray * > >::iterator itInputMap)
    131133{
    132134  Candidate *previousCandidate;
    133   map< TIterator *, TObjArray * >::iterator previousItInputMap;
     135  vector< pair< TIterator *, TObjArray * > >::iterator previousItInputMap;
    134136  TObjArray *array;
    135137
Note: See TracChangeset for help on using the changeset viewer.