From 353724aa353a86f39b70269432b54df10d6a2081 Mon Sep 17 00:00:00 2001 From: Sunanda Date: Mon, 30 Apr 2018 16:11:25 +0200 Subject: [PATCH] Take comments from Yana --- .../src/HGCalGeomParameters.cc | 33 +++++++------------ .../test/HGCalParameterTester.cc | 5 +++ 2 files changed, 16 insertions(+), 22 deletions(-) diff --git a/Geometry/HGCalCommonData/src/HGCalGeomParameters.cc b/Geometry/HGCalCommonData/src/HGCalGeomParameters.cc index dc84906bd3d0d..fdaa7d8d3080c 100644 --- a/Geometry/HGCalCommonData/src/HGCalGeomParameters.cc +++ b/Geometry/HGCalCommonData/src/HGCalGeomParameters.cc @@ -613,8 +613,7 @@ void HGCalGeomParameters::loadSpecParsHexagon(const DDFilteredView& fv, DDsvalues_type sv(fv.mergedSpecifics()); int nmin(4); php.boundR_ = getDDDArray("RadiusBound",sv,nmin); - for (double & k : php.boundR_) - k *= k_ScaleFromDDD; + std::for_each(php.boundR_.begin(), php.boundR_.end(), [](double &n){ n*=k_ScaleFromDDD; }); #ifdef EDM_ML_DEBUG edm::LogVerbatim("HGCalGeom") << "HGCalGeomParameters: wafer radius ranges" << " for cell grouping " << php.boundR_[0] @@ -623,8 +622,7 @@ void HGCalGeomParameters::loadSpecParsHexagon(const DDFilteredView& fv, #endif nmin = 2; php.rLimit_ = getDDDArray("RadiusLimits",sv,nmin); - for (double & k : php.rLimit_) - k *= k_ScaleFromDDD; + std::for_each(php.rLimit_.begin(), php.rLimit_.end(), [](double &n){ n*=k_ScaleFromDDD; }); #ifdef EDM_ML_DEBUG edm::LogVerbatim("HGCalGeom") << "HGCalGeomParameters: Minimum/maximum R " << php.rLimit_[0] << ":" << php.rLimit_[1]; @@ -926,8 +924,7 @@ void HGCalGeomParameters::loadSpecParsHexagon8(const DDFilteredView& fv, DDsvalues_type sv(fv.mergedSpecifics()); php.cellThickness_ = DDVectorGetter::get("CellThickness"); - for (double & k : php.cellThickness_) - k *= k_ScaleFromDDD; + std::for_each(php.cellThickness_.begin(), php.cellThickness_.end(), [](double &n){ n*=k_ScaleFromDDD; }); #ifdef EDM_ML_DEBUG edm::LogVerbatim("HGCalGeom") << "HGCalGeomParameters: cell Thickness " << php.cellThickness_[0] << ":" @@ -963,8 +960,7 @@ void HGCalGeomParameters::loadSpecParsHexagon8(const DDFilteredView& fv, << php.zMinForRad_ << std::endl; #endif php.radiusMixBoundary_ = DDVectorGetter::get("RadiusMixBoundary"); - for (double & k : php.radiusMixBoundary_) - k *= k_ScaleFromDDD; + std::for_each(php.radiusMixBoundary_.begin(), php.radiusMixBoundary_.end(), [](double &n){ n*=k_ScaleFromDDD; }); #ifdef EDM_ML_DEBUG for (unsigned int k = 0; k < php.radiusMixBoundary_.size(); ++k) edm::LogVerbatim("HGCalGeom") << "HGCalParameters: Mix[" << k << "] R = " @@ -978,11 +974,9 @@ void HGCalGeomParameters::loadSpecParsHexagon8(const DDFilteredView& fv, #endif php.slopeTop_ = DDVectorGetter::get("SlopeTop"); php.zFront_ = DDVectorGetter::get("ZFront"); - for (double & k : php.zFront_) - k *= k_ScaleFromDDD; + std::for_each(php.zFront_.begin(), php.zFront_.end(), [](double &n){ n*=k_ScaleFromDDD; }); php.rMaxFront_ = DDVectorGetter::get("RMaxFront"); - for (double & k : php.rMaxFront_) - k *= k_ScaleFromDDD; + std::for_each(php.rMaxFront_.begin(), php.rMaxFront_.end(), [](double &n){ n*=k_ScaleFromDDD; }); #ifdef EDM_ML_DEBUG for (unsigned int k = 0; k < php.zFront_.size(); ++k) edm::LogVerbatim("HGCalGeom") << "HGCalParameters: Boundary[" << k @@ -991,8 +985,7 @@ void HGCalGeomParameters::loadSpecParsHexagon8(const DDFilteredView& fv, << php.rMaxFront_[k]; #endif php.zRanges_ = DDVectorGetter::get("ZRanges"); - for (double & k : php.zRanges_) - k *= k_ScaleFromDDD; + std::for_each(php.zRanges_.begin(), php.zRanges_.end(), [](double &n){ n*=k_ScaleFromDDD; }); #ifdef EDM_ML_DEBUG edm::LogVerbatim("HGCalGeom") << "HGCalParameters: Z-Boundary " << php.zRanges_[0] << ":" << php.zRanges_[1] @@ -1006,8 +999,7 @@ void HGCalGeomParameters::loadSpecParsTrapezoid(const DDFilteredView& fv, DDsvalues_type sv(fv.mergedSpecifics()); php.radiusMixBoundary_ = DDVectorGetter::get("RadiusMixBoundary"); - for (double & k : php.radiusMixBoundary_) - k *= k_ScaleFromDDD; + std::for_each(php.radiusMixBoundary_.begin(), php.radiusMixBoundary_.end(), [](double &n){ n*=k_ScaleFromDDD; }); php.nPhiBinBH_ = dbl_to_int(DDVectorGetter::get("NPhiBinBH")); php.dPhiEta_.clear(); for (auto const & nbin : php.nPhiBinBH_) @@ -1027,11 +1019,9 @@ void HGCalGeomParameters::loadSpecParsTrapezoid(const DDFilteredView& fv, #endif php.slopeTop_ = DDVectorGetter::get("SlopeTop"); php.zFront_ = DDVectorGetter::get("ZFront"); - for (double & k : php.zFront_) - k *= k_ScaleFromDDD; + std::for_each(php.zFront_.begin(), php.zFront_.end(), [](double &n){ n*=k_ScaleFromDDD; }); php.rMaxFront_ = DDVectorGetter::get("RMaxFront"); - for (double & k : php.rMaxFront_) - k *= k_ScaleFromDDD; + std::for_each(php.rMaxFront_.begin(), php.rMaxFront_.end(), [](double &n){ n*=k_ScaleFromDDD; }); #ifdef EDM_ML_DEBUG for (unsigned int k = 0; k < php.zFront_.size(); ++k) edm::LogVerbatim("HGCalGeom") << "HGCalParameters: Boundary[" << k @@ -1040,8 +1030,7 @@ void HGCalGeomParameters::loadSpecParsTrapezoid(const DDFilteredView& fv, << php.rMaxFront_[k]; #endif php.zRanges_ = DDVectorGetter::get("ZRanges"); - for (double & k : php.zRanges_) - k *= k_ScaleFromDDD; + std::for_each(php.zRanges_.begin(), php.zRanges_.end(), [](double &n){ n*=k_ScaleFromDDD; }); #ifdef EDM_ML_DEBUG edm::LogVerbatim("HGCalGeom") << "HGCalParameters: Z-Boundary " << php.zRanges_[0] << ":" << php.zRanges_[1] diff --git a/Geometry/HGCalCommonData/test/HGCalParameterTester.cc b/Geometry/HGCalCommonData/test/HGCalParameterTester.cc index ae97a7543475f..d24b9c879fe45 100644 --- a/Geometry/HGCalCommonData/test/HGCalParameterTester.cc +++ b/Geometry/HGCalCommonData/test/HGCalParameterTester.cc @@ -31,6 +31,7 @@ void HGCalParameterTester::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) { edm::LogVerbatim("HGCalGeomr") << "HGCalParameter::Here I am"; + auto start = std::chrono::high_resolution_clock::now(); edm::ESHandle phgp; iSetup.get().get(name_, phgp); @@ -869,6 +870,10 @@ void HGCalParameterTester::analyze(const edm::Event& iEvent, } if (k > 0) {std::cout << "\n"; k = 0;} } + + auto finish = std::chrono::high_resolution_clock::now(); + std::chrono::duration elapsed = finish - start; + std::cout << "Elapsed time: " << elapsed.count() << " s\n"; } DEFINE_FWK_MODULE(HGCalParameterTester);