Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
CLHEP
CLHEP
Commits
091b172e
Commit
091b172e
authored
Nov 14, 2005
by
Lynn Garren
Browse files
merging changes from 1.9
parent
c3495a44
Changes
3
Hide whitespace changes
Inline
Side-by-side
Vector/ChangeLog
View file @
091b172e
2005-11-03 Lynn Garren <garren@fnal.gov>
* configure.in, LorentzVector.icc
Provide a flag to enable code differences when compiling with
Visual C++.
==============================
22.06.05 Release CLHEP-2.0.2.1
==============================
...
...
Vector/Vector/LorentzVector.icc
View file @
091b172e
// -*- C++ -*-
// $Id: LorentzVector.icc,v 1.2 200
3
/1
0
/1
0 21:42:35
garren Exp $
// $Id: LorentzVector.icc,v 1.2
.4.1
200
5
/1
1
/1
4 15:49:16
garren Exp $
// ---------------------------------------------------------------------------
//
// This file is a part of the CLHEP - a Class Library for High Energy Physics.
...
...
@@ -144,7 +144,13 @@ inline double HepLorentzVector::angle(const Hep3Vector &v) const {
}
inline double HepLorentzVector::mag2() const {
#if defined USING_VISUAL
// kludge for problem building Windows DLL
double r = metric*(t()*t() - pp.mag2());
return r;
#else
return metric*(t()*t() - pp.mag2());
#endif
}
inline double HepLorentzVector::mag() const {
...
...
@@ -200,7 +206,13 @@ HepLorentzVector::setVectM(const Hep3Vector & spatial, double mass) {
}
inline double HepLorentzVector::dot(const HepLorentzVector & q) const {
#if defined USING_VISUAL
// kludge for problem building Windows DLL
double r = metric*(t()*q.t() - z()*q.z() - y()*q.y() - x()*q.x());
return r;
#else
return metric*(t()*q.t() - z()*q.z() - y()*q.y() - x()*q.x());
#endif
}
inline double
...
...
@@ -357,7 +369,13 @@ inline bool HepLorentzVector::isLightlike(double epsilon) const {
}
inline double HepLorentzVector::diff2( const HepLorentzVector & w ) const {
#if defined USING_VISUAL
// kludge for problem building Windows DLL
double r= metric*( (ee-w.ee)*(ee-w.ee) - (pp-w.pp).mag2() );
return r;
#else
return metric*( (ee-w.ee)*(ee-w.ee) - (pp-w.pp).mag2() );
#endif
}
inline double HepLorentzVector::delta2Euclidean
...
...
Vector/configure.in
View file @
091b172e
...
...
@@ -131,6 +131,12 @@ AH_VERBATIM([VERSION],[/* Version number of package */
#undef VERSION
#endif])
## Visual C++ compile flag
AH_VERBATIM([USING_VISUAL],[/* special compile requirements for Visual C++ */
#ifndef USING_VISUAL
#undef USING_VISUAL
#endif])
AH_BOTTOM([#endif // VECTOR_DEFS_H])
...
...
@@ -228,6 +234,7 @@ cl)
build_static="no"
build_shared="yes"
build_visual="yes"
AC_DEFINE([USING_VISUAL], [TRUE], [building with Visual C++])
;;
CC)
case "$target" in
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment