Fork me on GitHub

Changeset 77e9ae1 in git


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

Files:
27 edited

Legend:

Unmodified
Added
Removed

  • .clang-format

    r6455202 r77e9ae1  
    11BasedOnStyle: LLVM
    22Language: Cpp
     3Standard: Cpp03
    34IndentWidth: 2
    45ConstructorInitializerIndentWidth: 2

  • classes/DelphesClasses.h

    r6455202 r77e9ae1  
    614614
    615615  Int_t NTimeHits;
    616   std::vector<std::pair<Float_t, Float_t>> ECalEnergyTimePairs;
     616  std::vector<std::pair<Float_t, Float_t> > ECalEnergyTimePairs;
    617617
    618618  // Isolation variables

  • classes/DelphesHepMCReader.cc

    r6455202 r77e9ae1  
    110110  TObjArray *partonOutputArray)
    111111{
    112   map<int, pair<int, int>>::iterator itMotherMap;
    113   map<int, pair<int, int>>::iterator itDaughterMap;
     112  map<int, pair<int, int> >::iterator itMotherMap;
     113  map<int, pair<int, int> >::iterator itDaughterMap;
    114114  char key, momentumUnit[4], positionUnit[3];
    115115  int i, rc, state;
    … …  
    433433{
    434434  Candidate *candidate;
    435   map<int, pair<int, int>>::iterator itMotherMap;
    436   map<int, pair<int, int>>::iterator itDaughterMap;
     435  map<int, pair<int, int> >::iterator itMotherMap;
     436  map<int, pair<int, int> >::iterator itDaughterMap;
    437437  int i;
    438438

  • classes/DelphesHepMCReader.h

    r6455202 r77e9ae1  
    9898  int fParticleCounter;
    9999
    100   std::map<int, std::pair<int, int>> fMotherMap;
    101   std::map<int, std::pair<int, int>> fDaughterMap;
     100  std::map<int, std::pair<int, int> > fMotherMap;
     101  std::map<int, std::pair<int, int> > fDaughterMap;
    102102};
    103103

  • classes/DelphesLHEFReader.cc

    r6455202 r77e9ae1  
    256256{
    257257  LHEFWeight *element;
    258   vector<pair<int, double>>::const_iterator itWeightList;
     258  vector<pair<int, double> >::const_iterator itWeightList;
    259259
    260260  for(itWeightList = fWeightList.begin(); itWeightList != fWeightList.end(); ++itWeightList)

  • classes/DelphesLHEFReader.h

    r6455202 r77e9ae1  
    8282  double fPx, fPy, fPz, fE, fMass;
    8383
    84   std::vector<std::pair<int, double>> fWeightList;
     84  std::vector<std::pair<int, double> > fWeightList;
    8585};
    8686

  • display/Delphes3DGeometry.cc

    r6455202 r77e9ae1  
    173173  for(std::vector<std::string>::const_iterator calo = calorimeters_.begin(); calo != calorimeters_.end(); ++calo)
    174174  {
    175     set<pair<Double_t, Int_t>> caloBinning;
     175    set<pair<Double_t, Int_t> > caloBinning;
    176176    ExRootConfParam paramEtaBins, paramPhiBins;
    177177    ExRootConfParam param = confReader->GetParam(Form("%s::EtaPhiBins", calo->c_str()));
    … …  
    187187  }
    188188
    189   set<pair<Double_t, Int_t>> caloBinning = caloBinning_[*calorimeters_.begin()];
     189  set<pair<Double_t, Int_t> > caloBinning = caloBinning_[*calorimeters_.begin()];
    190190  Double_t *etaBins = new Double_t[caloBinning.size()]; // note that this is the eta binning of the first calo
    191191  unsigned int ii = 0;
    192   for(set<pair<Double_t, Int_t>>::const_iterator itEtaSet = caloBinning.begin(); itEtaSet != caloBinning.end(); ++itEtaSet)
     192  for(set<pair<Double_t, Int_t> >::const_iterator itEtaSet = caloBinning.begin(); itEtaSet != caloBinning.end(); ++itEtaSet)
    193193  {
    194194    etaBins[ii++] = itEtaSet->first;
    … …  
    252252
    253253std::pair<Double_t, Double_t> Delphes3DGeometry::addCalorimeter(TGeoVolume *top, const char *name,
    254   Double_t innerBarrelRadius, Double_t innerBarrelLength, set<pair<Double_t, Int_t>> &caloBinning)
     254  Double_t innerBarrelRadius, Double_t innerBarrelLength, set<pair<Double_t, Int_t> > &caloBinning)
    255255{
    256256  // parameters derived from the inputs
    … …  
    316316
    317317void Delphes3DGeometry::addCaloTowers(TGeoVolume *top, const char *name,
    318   Double_t innerBarrelRadius, Double_t innerBarrelLength, set<pair<Double_t, Int_t>> &caloBinning)
     318  Double_t innerBarrelRadius, Double_t innerBarrelLength, set<pair<Double_t, Int_t> > &caloBinning)
    319319{
    320320
    … …  
    339339  Int_t etaslice = 0;
    340340  std::map<std::pair<int, int>, TGeoRotation *> phirotations;
    341   for(set<pair<Double_t, Int_t>>::const_iterator bin = caloBinning.begin(); bin != caloBinning.end(); ++bin)
     341  for(set<pair<Double_t, Int_t> >::const_iterator bin = caloBinning.begin(); bin != caloBinning.end(); ++bin)
    342342  {
    343343    if(abs(bin->first) > calo_endcap_etamin) continue; // only in the barrel
    … …  
    388388  etaslice = 0;
    389389  phirotations.clear();
    390   for(set<pair<Double_t, Int_t>>::const_iterator bin = caloBinning.begin(); bin != caloBinning.end(); ++bin)
     390  for(set<pair<Double_t, Int_t> >::const_iterator bin = caloBinning.begin(); bin != caloBinning.end(); ++bin)
    391391  {
    392392    if(bin->first < calo_endcap_etamin) continue; // only in the + endcap

  • display/Delphes3DGeometry.h

    r6455202 r77e9ae1  
    6060private:
    6161  std::pair<Double_t, Double_t> addTracker(TGeoVolume *top);
    62   std::pair<Double_t, Double_t> addCalorimeter(TGeoVolume *top, const char *name, Double_t innerBarrelRadius, Double_t innerBarrelLength, std::set<std::pair<Double_t, Int_t>> &caloBinning);
     62  std::pair<Double_t, Double_t> addCalorimeter(TGeoVolume *top, const char *name, Double_t innerBarrelRadius, Double_t innerBarrelLength, std::set<std::pair<Double_t, Int_t> > &caloBinning);
    6363  std::pair<Double_t, Double_t> addMuonDets(TGeoVolume *top, const char *name, Double_t innerBarrelRadius, Double_t innerBarrelLength);
    64   void addCaloTowers(TGeoVolume *top, const char *name, Double_t innerBarrelRadius, Double_t innerBarrelLength, std::set<std::pair<Double_t, Int_t>> &caloBinning);
     64  void addCaloTowers(TGeoVolume *top, const char *name, Double_t innerBarrelRadius, Double_t innerBarrelLength, std::set<std::pair<Double_t, Int_t> > &caloBinning);
    6565
    6666private:
    … …  
    9090
    9191  std::map<std::string, Double_t> muonSystem_etamax_;
    92   std::map<std::string, std::set<std::pair<Double_t, Int_t>>> caloBinning_;
     92  std::map<std::string, std::set<std::pair<Double_t, Int_t> > > caloBinning_;
    9393};
    9494

  • display/DelphesPlotSummary.cc

    r6455202 r77e9ae1  
    181181{
    182182  // clear event histograms and markers
    183   for(std::map<TString, std::vector<TH1F *>>::iterator hv = eventProfiles_.begin(); hv != eventProfiles_.end(); ++hv)
     183  for(std::map<TString, std::vector<TH1F *> >::iterator hv = eventProfiles_.begin(); hv != eventProfiles_.end(); ++hv)
    184184  {
    185185    for(std::vector<TH1F *>::iterator h = hv->second.begin(); h < hv->second.end(); ++h)
    … …  
    188188    }
    189189  }
    190   for(std::map<TString, std::vector<TMarker *>>::iterator mv = eventMarkers_.begin(); mv != eventMarkers_.end(); ++mv)
     190  for(std::map<TString, std::vector<TMarker *> >::iterator mv = eventMarkers_.begin(); mv != eventMarkers_.end(); ++mv)
    191191  {
    192192    for(std::vector<TMarker *>::iterator m = mv->second.begin(); m < mv->second.end(); ++m)

  • display/DelphesPlotSummary.h

    r6455202 r77e9ae1  
    4545  TEveWindowTab *tab_;
    4646  std::map<TString, TCanvas *> canvases_;
    47   std::map<TString, std::vector<TH1F *>> histograms_;
     47  std::map<TString, std::vector<TH1F *> > histograms_;
    4848  std::vector<DelphesBranchBase *> *elements_;
    49   std::map<TString, std::vector<TMarker *>> eventMarkers_;
    50   std::map<TString, std::vector<TH1F *>> eventProfiles_;
     49  std::map<TString, std::vector<TMarker *> > eventMarkers_;
     50  std::map<TString, std::vector<TH1F *> > eventProfiles_;
    5151};
    5252

  • examples/CaloGrid.cpp

    r6455202 r77e9ae1  
    4141
    4242  std::vector<std::string> calorimeters_;
    43   std::map<std::string, std::set<std::pair<Double_t, Int_t>>> caloBinning_;
     43  std::map<std::string, std::set<std::pair<Double_t, Int_t> > > caloBinning_;
    4444
    4545  std::string s(argv[2]);
    … …  
    9090
    9191    //first entry is eta bin, second is number of phi bins
    92     set<pair<Double_t, Int_t>> caloBinning;
     92    set<pair<Double_t, Int_t> > caloBinning;
    9393    ExRootConfParam paramEtaBins, paramPhiBins;
    9494    ExRootConfParam param = confReader->GetParam(Form("%s::EtaPhiBins", calo->c_str()));
    … …  
    109109
    110110    //loop over calo binning
    111     std::set<std::pair<Double_t, Int_t>>::iterator it;
     111    std::set<std::pair<Double_t, Int_t> >::iterator it;
    112112
    113113    Int_t n = -1;
    … …  
    122122      liney->Draw();
    123123
    124       set<std::pair<Double_t, Int_t>>::iterator it2 = it;
     124      set<std::pair<Double_t, Int_t> >::iterator it2 = it;
    125125      it2--;
    126126

  • external/ExRootAnalysis/ExRootFilter.cc

    r6455202 r77e9ae1  
    2121
    2222typedef map<Int_t, TObjArray *> TCategoryMap;
    23 typedef map<ExRootClassifier *, pair<Bool_t, TCategoryMap>> TClassifierMap;
     23typedef map<ExRootClassifier *, pair<Bool_t, TCategoryMap> > TClassifierMap;
    2424
    2525ExRootFilter::ExRootFilter(const TSeqCollection *collection) :

  • external/ExRootAnalysis/ExRootFilter.h

    r6455202 r77e9ae1  
    2525  TIterator *fIter; //!
    2626
    27   std::map<ExRootClassifier *, std::pair<Bool_t, std::map<Int_t, TObjArray *>>> fMap; //!
     27  std::map<ExRootClassifier *, std::pair<Bool_t, std::map<Int_t, TObjArray *> > > fMap; //!
    2828};
    2929

  • external/ExRootAnalysis/ExRootTreeReader.h

    r6455202 r77e9ae1  
    3636  Int_t fCurrentTree; //! current Tree number in a TChain
    3737
    38   typedef std::map<TString, std::pair<TBranch *, TClonesArray *>> TBranchMap;
     38  typedef std::map<TString, std::pair<TBranch *, TClonesArray *> > TBranchMap;
    3939
    4040  TBranchMap fBranchMap; //!

  • 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++)

  • readers/DelphesCMSFWLite.cpp

    r6455202 r77e9ae1  
    7171  fwlite::Handle<GenEventInfoProduct> handleGenEventInfo;
    7272  fwlite::Handle<LHEEventProduct> handleLHEEvent;
    73   fwlite::Handle<vector<reco::GenParticle>> handleParticle;
    74   fwlite::Handle<vector<pat::PackedGenParticle>> handlePackedParticle;
     73  fwlite::Handle<vector<reco::GenParticle> > handleParticle;
     74  fwlite::Handle<vector<pat::PackedGenParticle> > handlePackedParticle;
    7575
    7676  vector<reco::GenParticle>::const_iterator itParticle;
Note: See TracChangeset for help on using the changeset viewer.