Fork me on GitHub

Changeset 77e9ae1 in git for modules


Ignore:
Timestamp:
Feb 12, 2019, 9:48:36 PM (6 years ago)
Author:
Pavel Demin <pavel-demin@…>
Branches:
ImprovedOutputFile, Timing, llp, master
Children:
899b162
Parents:
6455202
Message:

set Standard to Cpp03 in .clang-format

Location:
modules
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • modules/Calorimeter.h

    r6455202 r77e9ae1  
    5050
    5151private:
    52   typedef std::map<Long64_t, std::pair<Double_t, Double_t>> TFractionMap; //!
    53   typedef std::map<Double_t, std::set<Double_t>> TBinMap; //!
     52  typedef std::map<Long64_t, std::pair<Double_t, Double_t> > TFractionMap; //!
     53  typedef std::map<Double_t, std::set<Double_t> > TBinMap; //!
    5454
    5555  Candidate *fTower;

  • modules/DenseTrackFilter.h

    r6455202 r77e9ae1  
    4949
    5050private:
    51   typedef std::map<Double_t, std::set<Double_t>> TBinMap; //!
     51  typedef std::map<Double_t, std::set<Double_t> > TBinMap; //!
    5252
    5353  Candidate *fBestTrack;

  • modules/IdentificationMap.h

    r6455202 r77e9ae1  
    4646
    4747private:
    48   typedef std::multimap<Int_t, std::pair<Int_t, DelphesFormula *>> TMisIDMap; //!
     48  typedef std::multimap<Int_t, std::pair<Int_t, DelphesFormula *> > TMisIDMap; //!
    4949
    5050  TMisIDMap fEfficiencyMap; //!

  • modules/OldCalorimeter.h

    r6455202 r77e9ae1  
    3636
    3737private:
    38   typedef std::map<Long64_t, std::pair<Double_t, Double_t>> TFractionMap; //!
    39   typedef std::map<Double_t, std::set<Double_t>> TBinMap; //!
     38  typedef std::map<Long64_t, std::pair<Double_t, Double_t> > TFractionMap; //!
     39  typedef std::map<Double_t, std::set<Double_t> > TBinMap; //!
    4040
    4141  Candidate *fTower;

  • modules/SimpleCalorimeter.h

    r6455202 r77e9ae1  
    5252private:
    5353  typedef std::map<Long64_t, Double_t> TFractionMap; //!
    54   typedef std::map<Double_t, std::set<Double_t>> TBinMap; //!
     54  typedef std::map<Double_t, std::set<Double_t> > TBinMap; //!
    5555
    5656  Candidate *fTower;

  • modules/TreeWriter.h

    r6455202 r77e9ae1  
    7070  typedef void (TreeWriter::*TProcessMethod)(ExRootTreeBranch *, TObjArray *); //!
    7171
    72   typedef std::map<ExRootTreeBranch *, std::pair<TProcessMethod, TObjArray *>> TBranchMap; //!
     72  typedef std::map<ExRootTreeBranch *, std::pair<TProcessMethod, TObjArray *> > TBranchMap; //!
    7373
    7474  TBranchMap fBranchMap; //!

  • modules/UniqueObjectFinder.cc

    r6455202 r77e9ae1  
    9292void UniqueObjectFinder::Finish()
    9393{
    94   vector<pair<TIterator *, TObjArray *>>::iterator itInputMap;
     94  vector<pair<TIterator *, TObjArray *> >::iterator itInputMap;
    9595  TIterator *iterator;
    9696
    … …  
    108108{
    109109  Candidate *candidate;
    110   vector<pair<TIterator *, TObjArray *>>::iterator itInputMap;
     110  vector<pair<TIterator *, TObjArray *> >::iterator itInputMap;
    111111  TIterator *iterator;
    112112  TObjArray *array;
    … …  
    132132//------------------------------------------------------------------------------
    133133
    134 Bool_t UniqueObjectFinder::Unique(Candidate *candidate, vector<pair<TIterator *, TObjArray *>>::iterator itInputMap)
     134Bool_t UniqueObjectFinder::Unique(Candidate *candidate, vector<pair<TIterator *, TObjArray *> >::iterator itInputMap)
    135135{
    136136  Candidate *previousCandidate;
    137   vector<pair<TIterator *, TObjArray *>>::iterator previousItInputMap;
     137  vector<pair<TIterator *, TObjArray *> >::iterator previousItInputMap;
    138138  TObjArray *array;
    139139

  • modules/UniqueObjectFinder.h

    r6455202 r77e9ae1  
    5050  Bool_t fUseUniqueID;
    5151
    52   Bool_t Unique(Candidate *candidate, std::vector<std::pair<TIterator *, TObjArray *>>::iterator itInputMap);
     52  Bool_t Unique(Candidate *candidate, std::vector<std::pair<TIterator *, TObjArray *> >::iterator itInputMap);
    5353
    54   std::vector<std::pair<TIterator *, TObjArray *>> fInputMap; //!
     54  std::vector<std::pair<TIterator *, TObjArray *> > fInputMap; //!
    5555
    5656  ClassDef(UniqueObjectFinder, 1)

  • modules/VertexFinder.cc

    r6455202 r77e9ae1  
    115115  // fewer than MinNDF tracks, release the tracks for other clusters to claim.
    116116  sort(clusterSumPT2.begin(), clusterSumPT2.end(), secondDescending);
    117   for(vector<pair<UInt_t, Double_t>>::const_iterator cluster = clusterSumPT2.begin(); cluster != clusterSumPT2.end(); cluster++)
     117  for(vector<pair<UInt_t, Double_t> >::const_iterator cluster = clusterSumPT2.begin(); cluster != clusterSumPT2.end(); cluster++)
    118118  {
    119119    // Skip the cluster if it no longer has any tracks
    … …  
    130130    if((Int_t)clusterIDToInt.at(cluster->first).at("ndf") < fMinNDF)
    131131    {
    132       for(map<UInt_t, map<string, Int_t>>::iterator track = trackIDToInt.begin(); track != trackIDToInt.end(); track++)
     132      for(map<UInt_t, map<string, Int_t> >::iterator track = trackIDToInt.begin(); track != trackIDToInt.end(); track++)
    133133      {
    134134        if(track->second.at("clusterIndex") != (Int_t)cluster->first)
    … …  
    155155  // descending sum(pt**2).
    156156  clusterSumPT2.clear();
    157   for(map<UInt_t, map<string, Int_t>>::const_iterator cluster = clusterIDToInt.begin(); cluster != clusterIDToInt.end(); cluster++)
     157  for(map<UInt_t, map<string, Int_t> >::const_iterator cluster = clusterIDToInt.begin(); cluster != clusterIDToInt.end(); cluster++)
    158158  {
    159159
    … …  
    164164  sort(clusterSumPT2.begin(), clusterSumPT2.end(), secondDescending);
    165165
    166   for(vector<pair<UInt_t, Double_t>>::const_iterator cluster = clusterSumPT2.begin(); cluster != clusterSumPT2.end(); cluster++)
     166  for(vector<pair<UInt_t, Double_t> >::const_iterator cluster = clusterSumPT2.begin(); cluster != clusterSumPT2.end(); cluster++)
    167167  {
    168168    DelphesFactory *factory = GetFactory();
    … …  
    213213  // trackPT vector.
    214214  sort(trackPT.begin(), trackPT.end(), secondDescending);
    215   for(vector<pair<UInt_t, Double_t>>::const_iterator track = trackPT.begin(); track != trackPT.end(); track++, maxSeeds++)
     215  for(vector<pair<UInt_t, Double_t> >::const_iterator track = trackPT.begin(); track != trackPT.end(); track++, maxSeeds++)
    216216  {
    217217    if(track->second < fSeedMinPT)
    … …  
    228228
    229229  // Create the seeds from the SeedMinPT highest pt tracks.
    230   for(vector<pair<UInt_t, Double_t>>::const_iterator track = trackPT.begin(); track != trackPT.end(); track++, clusterIndex++)
     230  for(vector<pair<UInt_t, Double_t> >::const_iterator track = trackPT.begin(); track != trackPT.end(); track++, clusterIndex++)
    231231  {
    232232    addTrackToCluster(track->first, clusterIndex);
    … …  
    261261    {
    262262
    263       for(map<UInt_t, map<string, Double_t>>::const_iterator track = trackIDToDouble.begin(); track != trackIDToDouble.end(); track++)
     263      for(map<UInt_t, map<string, Double_t> >::const_iterator track = trackIDToDouble.begin(); track != trackIDToDouble.end(); track++)
    264264      {
    265265        if(trackIDToBool.at(track->first).at("claimed") || trackIDToInt.at(track->first).at("clusterIndex") == (Int_t)clusterIndex)

  • modules/VertexFinder.h

    r6455202 r77e9ae1  
    4949  TObjArray *fVertexOutputArray;
    5050
    51   std::map<UInt_t, std::map<std::string, Double_t>> trackIDToDouble;
    52   std::map<UInt_t, std::map<std::string, Int_t>> trackIDToInt;
    53   std::map<UInt_t, std::map<std::string, Bool_t>> trackIDToBool;
     51  std::map<UInt_t, std::map<std::string, Double_t> > trackIDToDouble;
     52  std::map<UInt_t, std::map<std::string, Int_t> > trackIDToInt;
     53  std::map<UInt_t, std::map<std::string, Bool_t> > trackIDToBool;
    5454
    55   std::map<UInt_t, std::map<std::string, Double_t>> clusterIDToDouble;
    56   std::map<UInt_t, std::map<std::string, Int_t>> clusterIDToInt;
    57   std::map<UInt_t, std::map<std::string, Bool_t>> clusterIDToBool;
    58   std::vector<std::pair<UInt_t, Double_t>> trackPT;
    59   std::vector<std::pair<UInt_t, Double_t>> clusterSumPT2;
     55  std::map<UInt_t, std::map<std::string, Double_t> > clusterIDToDouble;
     56  std::map<UInt_t, std::map<std::string, Int_t> > clusterIDToInt;
     57  std::map<UInt_t, std::map<std::string, Bool_t> > clusterIDToBool;
     58  std::vector<std::pair<UInt_t, Double_t> > trackPT;
     59  std::vector<std::pair<UInt_t, Double_t> > clusterSumPT2;
    6060
    6161  ClassDef(VertexFinder, 1)

  • modules/VertexFinderDA4D.cc

    r6455202 r77e9ae1  
    10771077  // avoid left-right biases by splitting highest Tc first
    10781078
    1079   std::vector<std::pair<double, unsigned int>> critical;
     1079  std::vector<std::pair<double, unsigned int> > critical;
    10801080  for(unsigned int ik = 0; ik < y.size(); ik++)
    10811081  {
    … …  
    10851085    }
    10861086  }
    1087   std::stable_sort(critical.begin(), critical.end(), std::greater<std::pair<double, unsigned int>>());
     1087  std::stable_sort(critical.begin(), critical.end(), std::greater<std::pair<double, unsigned int> >());
    10881088
    10891089  for(unsigned int ic = 0; ic < critical.size(); ic++)

  • modules/VertexSorter.cc

    r6455202 r77e9ae1  
    118118  map<Int_t, Double_t> clusterIDToSumPT2;
    119119  map<Int_t, Double_t>::const_iterator itClusterIDToSumPT2;
    120   vector<pair<Int_t, Double_t>> sortedClusterIDs;
    121   vector<pair<Int_t, Double_t>>::const_iterator itSortedClusterIDs;
     120  vector<pair<Int_t, Double_t> > sortedClusterIDs;
     121  vector<pair<Int_t, Double_t> >::const_iterator itSortedClusterIDs;
    122122
    123123  for(Int_t iCluster = 0; iCluster < fInputArray->GetEntries(); iCluster++)
Note: See TracChangeset for help on using the changeset viewer.