Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Misc ICC errors fixes. #7406

Merged
merged 2 commits into from Jan 29, 2015
Merged

Misc ICC errors fixes. #7406

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
18fbfc1
Workaround ICC error.
ktf Jan 27, 2015
f762ec0
Use clang fix also in the case of ICC.
ktf Jan 27, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion HLTrigger/Egamma/src/HLTEgammaDoubleLegCombFilter.cc
View file
Open in desktop
Expand Up @@ -111,7 +111,7 @@ void HLTEgammaDoubleLegCombFilter::matchCands(const std::vector<math::XYZPoint>

for(size_t secondLegNr=0;secondLegNr<secondLegP3s.size();secondLegNr++){
if(!std::binary_search(matched2ndLegs.begin(),matched2ndLegs.end(),secondLegNr)){ //wasnt matched already
matchedCands.push_back(std::make_pair<int,int>(-1,secondLegNr));
matchedCands.push_back(std::make_pair<int,int>(-1, static_cast<int>(secondLegNr)));
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion RecoLocalCalo/EcalRecAlgos/src/ESRecHitSimAlgo.cc
View file
Open in desktop
Expand Up @@ -51,7 +51,7 @@ EcalRecHit::ESFlags ESRecHitSimAlgo::evalAmplitude(float * results, const ESData

// A from analytical formula:
constexpr float t1 = 20.;
#ifdef __clang__
#if defined(__clang__) || defined(__INTEL_COMPILER)
const float A_1 = 1./( std::pow(w/n*(t1),n) * std::exp(n-w*(t1)) );
#else
constexpr float A_1 = 1./( std::pow(w/n*(t1),n) * std::exp(n-w*(t1)) );
Expand Down