Changeset 77e9ae1 in git for classes

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:

classes

Files:

• DelphesClasses.h (modified) (1 diff)
• DelphesHepMCReader.cc (modified) (2 diffs)
• DelphesHepMCReader.h (modified) (1 diff)
• DelphesLHEFReader.cc (modified) (1 diff)
• DelphesLHEFReader.h (modified) (1 diff)

classes/DelphesClasses.h

@@ -614 +614 @@
 
   Int_t NTimeHits;
-  std::vector<std::pair<Float_t, Float_t>> ECalEnergyTimePairs;
+  std::vector<std::pair<Float_t, Float_t> > ECalEnergyTimePairs;
 
   // Isolation variables

classes/DelphesHepMCReader.cc

@@ -110 +110 @@
   TObjArray *partonOutputArray)
 {
-  map<int, pair<int, int>>::iterator itMotherMap;
-  map<int, pair<int, int>>::iterator itDaughterMap;
+  map<int, pair<int, int> >::iterator itMotherMap;
+  map<int, pair<int, int> >::iterator itDaughterMap;
   char key, momentumUnit[4], positionUnit[3];
   int i, rc, state;
@@ -433 +433 @@
 {
   Candidate *candidate;
-  map<int, pair<int, int>>::iterator itMotherMap;
-  map<int, pair<int, int>>::iterator itDaughterMap;
+  map<int, pair<int, int> >::iterator itMotherMap;
+  map<int, pair<int, int> >::iterator itDaughterMap;
   int i;
 

classes/DelphesHepMCReader.h

@@ -98 +98 @@
   int fParticleCounter;
 
-  std::map<int, std::pair<int, int>> fMotherMap;
-  std::map<int, std::pair<int, int>> fDaughterMap;
+  std::map<int, std::pair<int, int> > fMotherMap;
+  std::map<int, std::pair<int, int> > fDaughterMap;
 };
 

classes/DelphesLHEFReader.cc

@@ -256 +256 @@
 {
   LHEFWeight *element;
-  vector<pair<int, double>>::const_iterator itWeightList;
+  vector<pair<int, double> >::const_iterator itWeightList;
 
   for(itWeightList = fWeightList.begin(); itWeightList != fWeightList.end(); ++itWeightList)

classes/DelphesLHEFReader.h

@@ -82 +82 @@
   double fPx, fPy, fPz, fE, fMass;
 
-  std::vector<std::pair<int, double>> fWeightList;
+  std::vector<std::pair<int, double> > fWeightList;
 };