Commit 584ebfbe authored by Lynn Garren's avatar Lynn Garren
Browse files

set CLHEP version to 2.0.0.0

disable backwards compatibility code
fix references to old Geometry class names
parent bc028b72
......@@ -9,7 +9,7 @@
# ----------------------------------------------------------------------
AC_PREREQ(2.57)
AC_INIT(CLHEP Evaluator, 1.9.0.0, CLHEP@cern.ch, Evaluator)
AC_INIT(CLHEP Evaluator, 2.0.0.0, CLHEP@cern.ch, Evaluator)
AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_TARGET
AC_CONFIG_SRCDIR([src/Evaluator.cc])
......@@ -86,12 +86,6 @@ AH_VERBATIM([VERSION],[/* Version number of package */
#undef VERSION
#endif])
## backwards compatibility
AH_VERBATIM([ENABLE_BACKWARDS_COMPATIBILITY],[/* backwards compatibility will be enabled ONLY in CLHEP 1.9 */
#ifndef ENABLE_BACKWARDS_COMPATIBILITY
#define ENABLE_BACKWARDS_COMPATIBILITY
#endif])
AH_BOTTOM([#endif // EVALUATOR_DEFS_H])
......
......@@ -9,7 +9,7 @@
# ----------------------------------------------------------------------
AC_PREREQ(2.57)
AC_INIT(CLHEP GenericFunctions, 1.9.0.0, CLHEP@cern.ch, GenericFunctions)
AC_INIT(CLHEP GenericFunctions, 2.0.0.0, CLHEP@cern.ch, GenericFunctions)
AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_TARGET
AC_CONFIG_SRCDIR([src/Abs.cc])
......@@ -87,12 +87,6 @@ AH_VERBATIM([VERSION],[/* Version number of package */
#undef VERSION
#endif])
## backwards compatibility
AH_VERBATIM([ENABLE_BACKWARDS_COMPATIBILITY],[/* backwards compatibility will be enabled ONLY in CLHEP 1.9 */
#ifndef ENABLE_BACKWARDS_COMPATIBILITY
#define ENABLE_BACKWARDS_COMPATIBILITY
#endif])
AH_BOTTOM([#endif // GENERICFUNCTIONS_DEFS_H])
......
......@@ -9,7 +9,7 @@
# ----------------------------------------------------------------------
AC_PREREQ(2.57)
AC_INIT(CLHEP Geometry, 1.9.0.0, CLHEP@cern.ch, Geometry)
AC_INIT(CLHEP Geometry, 2.0.0.0, CLHEP@cern.ch, Geometry)
AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_TARGET
AC_CONFIG_SRCDIR([src/Plane3D.cc])
......@@ -87,12 +87,6 @@ AH_VERBATIM([VERSION],[/* Version number of package */
#undef VERSION
#endif])
## backwards compatibility
AH_VERBATIM([ENABLE_BACKWARDS_COMPATIBILITY],[/* backwards compatibility will be enabled ONLY in CLHEP 1.9 */
#ifndef ENABLE_BACKWARDS_COMPATIBILITY
#define ENABLE_BACKWARDS_COMPATIBILITY
#endif])
AH_BOTTOM([#endif // GEOMETRY_DEFS_H])
......
// -*- C++ -*-
// $Id: Transform3D.cc,v 1.5 2003/08/13 20:00:11 garren Exp $
// $Id: Transform3D.cc,v 1.6 2003/10/24 21:39:45 garren Exp $
// ---------------------------------------------------------------------------
//
// This file is a part of the CLHEP - a Class Library for High Energy Physics.
......@@ -175,7 +175,7 @@ namespace HepGeom {
}
// -------------------------------------------------------------------------
void Transform3D::getDecomposition(HepScale3D & scale,
void Transform3D::getDecomposition(Scale3D & scale,
Rotate3D & rotation,
Translate3D & translation) const
/***********************************************************************
......
// -*- C++ -*-
// $Id: testBasicVector3D.cc,v 1.2 2003/08/08 13:47:09 garren Exp $
// $Id: testBasicVector3D.cc,v 1.3 2003/10/24 21:39:45 garren Exp $
// ---------------------------------------------------------------------------
#include <iostream>
......@@ -224,9 +224,9 @@ using namespace HepGeom;
void CheckPointFloat() { CHECK(Point3D<float> , float) }
void CheckVectorFloat() { CHECK(Vector3D<float> , float) }
void CheckNormalFloat() { CHECK(Normal3D<float> , float) }
void CheckPointDouble() { CHECK(HepPoint3D , double) }
void CheckVectorDouble() { CHECK(HepVector3D , double) }
void CheckNormalDouble() { CHECK(HepNormal3D , double) }
void CheckPointDouble() { CHECK(Point3D<double> , double) }
void CheckVectorDouble() { CHECK(Vector3D<double>, double) }
void CheckNormalDouble() { CHECK(Normal3D<double>, double) }
int main()
{
......
// -*- C++ -*-
// $Id: testTransform3D.cc,v 1.2 2003/08/08 13:47:09 garren Exp $
// $Id: testTransform3D.cc,v 1.3 2003/10/24 21:39:45 garren Exp $
// ---------------------------------------------------------------------------
//
// This file is a part of the CLHEP - a Class Library for High Energy Physics.
//
// This is a test for the HepTransform3D class.
// This is a test for the HepGeom::Transform3D class.
//
#include <assert.h>
#include "CLHEP/Geometry/Transform3D.h"
......@@ -12,13 +12,13 @@
#include "CLHEP/Vector/ThreeVector.h"
#include "CLHEP/Units/PhysicalConstants.h"
typedef HepScale3D Scale;
typedef HepRotate3D Rotation;
typedef HepTranslate3D Translation;
typedef HepTransform3D Transformation;
typedef HepPoint3D Point;
typedef HepVector3D Vector;
typedef HepNormal3D Normal;
typedef HepGeom::Scale3D Scale;
typedef HepGeom::Rotate3D Rotation;
typedef HepGeom::Translate3D Translation;
typedef HepGeom::Transform3D Transformation;
typedef HepGeom::Point3D<double> Point;
typedef HepGeom::Vector3D<double> Vector;
typedef HepGeom::Normal3D<double> Normal;
#define DEL 10.e-16
......@@ -142,7 +142,7 @@ int main() {
Translation TT;
M.getDecomposition(SS,RR,TT);
S = HepScale3D(2,3,-4);
S = HepGeom::Scale3D(2,3,-4);
T = TT*RR*SS;
for (i=0; i<4; i++) {
for (k=0; k<4; k++) {
......@@ -154,7 +154,7 @@ int main() {
// test for isNear()
assert ( T.isNear(M, DEL) );
S = HepScale3D(2.01,3,-4);
S = HepGeom::Scale3D(2.01,3,-4);
T = TT*RR*S;
assert ( !T.isNear(M) );
......
......@@ -76,14 +76,14 @@ namespace HepMC {
GenParticle* remove_particle( GenParticle* particle );
operator CLHEP::HepLorentzVector() const; // conversion operator
operator HepPoint3D() const; // conversion operator
operator HepGeom::Point3D<double>() const; // conversion operator
////////////////////
// access methods //
////////////////////
GenEvent* parent_event() const;
HepPoint3D point3d() const;
HepGeom::Point3D<double> point3d() const;
CLHEP::HepLorentzVector position() const;
void set_position( const CLHEP::HepLorentzVector& position
= CLHEP::HepLorentzVector(0,0,0,0) );
......@@ -301,14 +301,14 @@ namespace HepMC {
inline GenVertex::operator CLHEP::HepLorentzVector() const { return position(); }
inline GenVertex::operator HepPoint3D() const { return point3d(); }
inline GenVertex::operator HepGeom::Point3D<double>() const { return point3d(); }
inline CLHEP::HepLorentzVector GenVertex::position() const { return m_position; }
inline GenEvent* GenVertex::parent_event() const { return m_event; }
inline HepPoint3D GenVertex::point3d() const {
return (HepPoint3D)m_position;
inline HepGeom::Point3D<double> GenVertex::point3d() const {
return (HepGeom::Point3D<double>)m_position;
}
inline int GenVertex::id() const { return m_id; }
......
......@@ -29,7 +29,7 @@ namespace HepMC {
public:
Polarization( double theta = 0, double phi = 0 );
Polarization( const Polarization& inpolar );
Polarization( const HepNormal3D& vec3in );
Polarization( const HepGeom::Normal3D<double>& vec3in );
virtual ~Polarization() {}
Polarization& operator=( const Polarization& inpolar );
......@@ -43,13 +43,13 @@ namespace HepMC {
////////////////////
double theta() const; // returns polar angle in radians
double phi() const; // returns azimuthal angle in radians
HepNormal3D normal3d() const; // unit 3 vector for easy manipulation
HepGeom::Normal3D<double> normal3d() const; // unit 3 vector for easy manipulation
double set_theta( double theta );
double set_phi( double phi );
void set_theta_phi( double theta, double phi );
// sets polarization according to direction of 3 vec
HepNormal3D set_normal3d( const HepNormal3D& vec3in );
HepGeom::Normal3D<double> set_normal3d( const HepGeom::Normal3D<double>& vec3in );
private:
double m_theta; //polar angle of polarization in radians 0< theta <pi
......
......@@ -9,7 +9,7 @@
# ----------------------------------------------------------------------
AC_PREREQ(2.57)
AC_INIT(CLHEP HepMC, 1.9.0.0, CLHEP@cern.ch, HepMC)
AC_INIT(CLHEP HepMC, 2.0.0.0, CLHEP@cern.ch, HepMC)
AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_TARGET
AC_CONFIG_SRCDIR([src/DummyDecayModel.cc])
......@@ -89,12 +89,6 @@ AH_VERBATIM([VERSION],[/* Version number of package */
#undef VERSION
#endif])
## backwards compatibility
AH_VERBATIM([ENABLE_BACKWARDS_COMPATIBILITY],[/* backwards compatibility will be enabled ONLY in CLHEP 1.9 */
#ifndef ENABLE_BACKWARDS_COMPATIBILITY
#define ENABLE_BACKWARDS_COMPATIBILITY
#endif])
AH_BOTTOM([/* use correct std::ios_base or std::ios (old) */
#ifdef HAVE_IOS_BASE
#define HepIOS std::ios_base
......
......@@ -21,7 +21,7 @@ namespace HepMC {
*this = inpolar;
}
Polarization::Polarization( const HepNormal3D& vec3in ) {
Polarization::Polarization( const HepGeom::Normal3D<double>& vec3in ) {
set_theta( vec3in.theta() );
set_phi( vec3in.phi() );
}
......@@ -40,9 +40,9 @@ namespace HepMC {
// access methods //
////////////////////
HepNormal3D Polarization::normal3d() const {
HepGeom::Normal3D<double> Polarization::normal3d() const {
// unit Hep3Vector for easy manipulation
HepNormal3D outvec(0,0,1); // makes unit vector along Z
HepGeom::Normal3D<double> outvec(0,0,1); // makes unit vector along Z
outvec.setTheta( theta() ); // sets phi keeping mag and theta constant
outvec.setPhi( phi() ); // sets theta keeping mag and phi constant
return outvec;
......@@ -74,7 +74,7 @@ namespace HepMC {
set_phi( phi ) ;
}
HepNormal3D Polarization::set_normal3d( const HepNormal3D& vec3in ) {
HepGeom::Normal3D<double> Polarization::set_normal3d( const HepGeom::Normal3D<double>& vec3in ) {
set_theta( vec3in.theta() );
set_phi( vec3in.phi() );
return vec3in;
......
......@@ -9,7 +9,7 @@
# ----------------------------------------------------------------------
AC_PREREQ(2.57)
AC_INIT(CLHEP HepPDT, 1.9.0.0, CLHEP@cern.ch, HepPDT)
AC_INIT(CLHEP HepPDT, 2.0.0.0, CLHEP@cern.ch, HepPDT)
AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_TARGET
AC_CONFIG_SRCDIR([src/Constituent.cc])
......@@ -90,12 +90,6 @@ AH_VERBATIM([VERSION],[/* Version number of package */
#undef VERSION
#endif])
## backwards compatibility
AH_VERBATIM([ENABLE_BACKWARDS_COMPATIBILITY],[/* backwards compatibility will be enabled ONLY in CLHEP 1.9 */
#ifndef ENABLE_BACKWARDS_COMPATIBILITY
#define ENABLE_BACKWARDS_COMPATIBILITY
#endif])
AH_BOTTOM([/* use correct std::ios_base or std::ios (old) */
#ifdef HAVE_IOS_BASE
#define HepIOS std::ios_base
......
......@@ -9,7 +9,7 @@
# ----------------------------------------------------------------------
AC_PREREQ(2.57)
AC_INIT(CLHEP Matrix, 1.9.0.0, CLHEP@cern.ch, Matrix)
AC_INIT(CLHEP Matrix, 2.0.0.0, CLHEP@cern.ch, Matrix)
AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_TARGET
AC_CONFIG_SRCDIR([src/DiagMatrix.cc])
......@@ -87,12 +87,6 @@ AH_VERBATIM([VERSION],[/* Version number of package */
#undef VERSION
#endif])
## backwards compatibility
AH_VERBATIM([ENABLE_BACKWARDS_COMPATIBILITY],[/* backwards compatibility will be enabled ONLY in CLHEP 1.9 */
#ifndef ENABLE_BACKWARDS_COMPATIBILITY
#define ENABLE_BACKWARDS_COMPATIBILITY
#endif])
AH_BOTTOM([#endif // MATRIX_DEFS_H])
......
......@@ -9,7 +9,7 @@
# ----------------------------------------------------------------------
AC_PREREQ(2.57)
AC_INIT(CLHEP Random, 1.9.0.0, CLHEP@cern.ch, Random)
AC_INIT(CLHEP Random, 2.0.0.0, CLHEP@cern.ch, Random)
AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_TARGET
AC_CONFIG_SRCDIR([src/DRand48Engine.cc])
......@@ -93,12 +93,6 @@ AH_VERBATIM([VERSION],[/* Version number of package */
#undef VERSION
#endif])
## backwards compatibility
AH_VERBATIM([ENABLE_BACKWARDS_COMPATIBILITY],[/* backwards compatibility will be enabled ONLY in CLHEP 1.9 */
#ifndef ENABLE_BACKWARDS_COMPATIBILITY
#define ENABLE_BACKWARDS_COMPATIBILITY
#endif])
AH_BOTTOM([#endif // RANDOM_DEFS_H])
......
......@@ -9,7 +9,7 @@
# ----------------------------------------------------------------------
AC_PREREQ(2.57)
AC_INIT(CLHEP RandomObjects, 1.9.0.0, CLHEP@cern.ch, RandomObjects)
AC_INIT(CLHEP RandomObjects, 2.0.0.0, CLHEP@cern.ch, RandomObjects)
AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_TARGET
AC_CONFIG_SRCDIR([src/RandMultiGauss.cc])
......@@ -86,12 +86,6 @@ AH_VERBATIM([VERSION],[/* Version number of package */
#undef VERSION
#endif])
## backwards compatibility
AH_VERBATIM([ENABLE_BACKWARDS_COMPATIBILITY],[/* backwards compatibility will be enabled ONLY in CLHEP 1.9 */
#ifndef ENABLE_BACKWARDS_COMPATIBILITY
#define ENABLE_BACKWARDS_COMPATIBILITY
#endif])
AH_BOTTOM([#endif // RANDOMOBJECTS_DEFS_H])
......
......@@ -9,7 +9,7 @@
# ----------------------------------------------------------------------
AC_PREREQ(2.57)
AC_INIT(CLHEP StdHep, 1.9.0.0, CLHEP@cern.ch, StdHep)
AC_INIT(CLHEP StdHep, 2.0.0.0, CLHEP@cern.ch, StdHep)
AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_TARGET
AC_CONFIG_SRCDIR([src/collision.cc])
......@@ -83,12 +83,6 @@ AH_VERBATIM([VERSION],[/* Version number of package */
#undef VERSION
#endif])
## backwards compatibility
AH_VERBATIM([ENABLE_BACKWARDS_COMPATIBILITY],[/* backwards compatibility will be enabled ONLY in CLHEP 1.9 */
#ifndef ENABLE_BACKWARDS_COMPATIBILITY
#define ENABLE_BACKWARDS_COMPATIBILITY
#endif])
AH_BOTTOM([/* use correct std::ios_base or std::ios (old) */
#ifdef HAVE_IOS_BASE
#define HepIOS std::ios_base
......
......@@ -9,7 +9,7 @@
# ----------------------------------------------------------------------
AC_PREREQ(2.57)
AC_INIT(CLHEP Units, 1.9.0.0, CLHEP@cern.ch, Units)
AC_INIT(CLHEP Units, 2.0.0.0, CLHEP@cern.ch, Units)
AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_TARGET
AM_INIT_AUTOMAKE(1.6 foreign)
......@@ -84,12 +84,6 @@ AH_VERBATIM([VERSION],[/* Version number of package */
#undef VERSION
#endif])
## backwards compatibility
AH_VERBATIM([ENABLE_BACKWARDS_COMPATIBILITY],[/* backwards compatibility will be enabled ONLY in CLHEP 1.9 */
#ifndef ENABLE_BACKWARDS_COMPATIBILITY
#define ENABLE_BACKWARDS_COMPATIBILITY
#endif])
AH_BOTTOM([#endif // UNITS_DEFS_H])
......
......@@ -9,7 +9,7 @@
# ----------------------------------------------------------------------
AC_PREREQ(2.57)
AC_INIT(CLHEP Utilities, 1.9.0.0, CLHEP@cern.ch, Utilities)
AC_INIT(CLHEP Utilities, 2.0.0.0, CLHEP@cern.ch, Utilities)
AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_TARGET
AM_INIT_AUTOMAKE(1.6 foreign)
......@@ -79,12 +79,6 @@ AH_VERBATIM([VERSION],[/* Version number of package */
#undef VERSION
#endif])
## backwards compatibility
AH_VERBATIM([ENABLE_BACKWARDS_COMPATIBILITY],[/* backwards compatibility will be enabled ONLY in CLHEP 1.9 */
#ifndef ENABLE_BACKWARDS_COMPATIBILITY
#define ENABLE_BACKWARDS_COMPATIBILITY
#endif])
AH_BOTTOM([#endif // UTILITIES_DEFS_H])
......
......@@ -9,7 +9,7 @@
# ----------------------------------------------------------------------
AC_PREREQ(2.57)
AC_INIT(CLHEP Vector, 1.9.0.0, CLHEP@cern.ch, Vector)
AC_INIT(CLHEP Vector, 2.0.0.0, CLHEP@cern.ch, Vector)
AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_TARGET
AC_CONFIG_SRCDIR([src/AxisAngle.cc])
......@@ -93,12 +93,6 @@ AH_VERBATIM([VERSION],[/* Version number of package */
#undef VERSION
#endif])
## backwards compatibility
AH_VERBATIM([ENABLE_BACKWARDS_COMPATIBILITY],[/* backwards compatibility will be enabled ONLY in CLHEP 1.9 */
#ifndef ENABLE_BACKWARDS_COMPATIBILITY
#define ENABLE_BACKWARDS_COMPATIBILITY
#endif])
AH_BOTTOM([#endif // VECTOR_DEFS_H])
......
......@@ -9,7 +9,7 @@
# ----------------------------------------------------------------------
AC_PREREQ(2.57)
AC_INIT(CLHEP, 1.9.0.0, CLHEP@cern.ch )
AC_INIT(CLHEP, 2.0.0.0, CLHEP@cern.ch )
AC_CANONICAL_TARGET
AC_CONFIG_SRCDIR([Vector/src/AxisAngle.cc])
AM_INIT_AUTOMAKE(1.6 foreign)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment