Fork me on GitHub

Changeset 77e9ae1 in git for display/Delphes3DGeometry.cc


Ignore:
Timestamp:
02/12/19 21:48:36 (18 months ago)
Author:
Pavel Demin <pavel-demin@…>
Branches:
ImprovedOutputFile, Timing, llp, master
Children:
899b162
Parents:
6455202
Message:

set Standard to Cpp03 in .clang-format

File:
1 edited

Legend:

Unmodified
Added
Removed
  • 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
Note: See TracChangeset for help on using the changeset viewer.