Changeset 77e9ae1 in git for display/Delphes3DGeometry.cc

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

File:

• display/Delphes3DGeometry.cc (modified) (6 diffs)

display/Delphes3DGeometry.cc

@@ -173 +173 @@
   for(std::vector<std::string>::const_iterator calo = calorimeters_.begin(); calo != calorimeters_.end(); ++calo)
   {
-    set<pair<Double_t, Int_t>> caloBinning;
+    set<pair<Double_t, Int_t> > caloBinning;
     ExRootConfParam paramEtaBins, paramPhiBins;
     ExRootConfParam param = confReader->GetParam(Form("%s::EtaPhiBins", calo->c_str()));
@@ -187 +187 @@
   }
 
-  set<pair<Double_t, Int_t>> caloBinning = caloBinning_[*calorimeters_.begin()];
+  set<pair<Double_t, Int_t> > caloBinning = caloBinning_[*calorimeters_.begin()];
   Double_t *etaBins = new Double_t[caloBinning.size()]; // note that this is the eta binning of the first calo
   unsigned int ii = 0;
-  for(set<pair<Double_t, Int_t>>::const_iterator itEtaSet = caloBinning.begin(); itEtaSet != caloBinning.end(); ++itEtaSet)
+  for(set<pair<Double_t, Int_t> >::const_iterator itEtaSet = caloBinning.begin(); itEtaSet != caloBinning.end(); ++itEtaSet)
   {
     etaBins[ii++] = itEtaSet->first;
@@ -252 +252 @@
 
 std::pair<Double_t, Double_t> Delphes3DGeometry::addCalorimeter(TGeoVolume *top, const char *name,
-  Double_t innerBarrelRadius, Double_t innerBarrelLength, set<pair<Double_t, Int_t>> &caloBinning)
+  Double_t innerBarrelRadius, Double_t innerBarrelLength, set<pair<Double_t, Int_t> > &caloBinning)
 {
   // parameters derived from the inputs
@@ -316 +316 @@
 
 void Delphes3DGeometry::addCaloTowers(TGeoVolume *top, const char *name,
-  Double_t innerBarrelRadius, Double_t innerBarrelLength, set<pair<Double_t, Int_t>> &caloBinning)
+  Double_t innerBarrelRadius, Double_t innerBarrelLength, set<pair<Double_t, Int_t> > &caloBinning)
 {
 
@@ -339 +339 @@
   Int_t etaslice = 0;
   std::map<std::pair<int, int>, TGeoRotation *> phirotations;
-  for(set<pair<Double_t, Int_t>>::const_iterator bin = caloBinning.begin(); bin != caloBinning.end(); ++bin)
+  for(set<pair<Double_t, Int_t> >::const_iterator bin = caloBinning.begin(); bin != caloBinning.end(); ++bin)
   {
     if(abs(bin->first) > calo_endcap_etamin) continue; // only in the barrel
@@ -388 +388 @@
   etaslice = 0;
   phirotations.clear();
-  for(set<pair<Double_t, Int_t>>::const_iterator bin = caloBinning.begin(); bin != caloBinning.end(); ++bin)
+  for(set<pair<Double_t, Int_t> >::const_iterator bin = caloBinning.begin(); bin != caloBinning.end(); ++bin)
   {
     if(bin->first < calo_endcap_etamin) continue; // only in the + endcap