Import Geant4 10.6.0.beta source tree
This commit is contained in:
@@ -89,9 +89,7 @@ namespace HepGeom {
|
||||
|
||||
/**
|
||||
* Assignment. */
|
||||
BasicVector3D<T> & operator= (const BasicVector3D<T> & v) {
|
||||
v_[0] = v.v_[0]; v_[1] = v.v_[1]; v_[2] = v.v_[2]; return *this;
|
||||
}
|
||||
BasicVector3D<T> & operator= (const BasicVector3D<T> &) = default;
|
||||
/**
|
||||
* Addition. */
|
||||
BasicVector3D<T> & operator+=(const BasicVector3D<T> & v) {
|
||||
|
||||
+1
-3
@@ -67,9 +67,7 @@ namespace HepGeom {
|
||||
|
||||
/**
|
||||
* Assignment. */
|
||||
Plane3D<T> & operator=(const Plane3D<T> & p) {
|
||||
a_ = p.a_; b_ = p.b_; c_ = p.c_; d_ = p.d_; return *this;
|
||||
}
|
||||
Plane3D<T> & operator=(const Plane3D<T> &) = default;
|
||||
|
||||
/**
|
||||
* Returns the a-coefficient in the plane equation: a*x+b*y+c*z+d=0. */
|
||||
|
||||
+15
-15
@@ -214,7 +214,7 @@ namespace HepGeom {
|
||||
|
||||
/**
|
||||
* Constructor: rotation and then translation. */
|
||||
inline Transform3D(const CLHEP::HepRotation & m, const CLHEP::Hep3Vector & v);
|
||||
inline Transform3D(const CLHEP::HepRotation & mt, const CLHEP::Hep3Vector & v);
|
||||
|
||||
/**
|
||||
* Constructor: transformation of basis (assumed - no reflection). */
|
||||
@@ -227,10 +227,10 @@ namespace HepGeom {
|
||||
|
||||
/**
|
||||
* Copy constructor. */
|
||||
Transform3D(const Transform3D & m)
|
||||
: xx_(m.xx_), xy_(m.xy_), xz_(m.xz_), dx_(m.dx_),
|
||||
yx_(m.yx_), yy_(m.yy_), yz_(m.yz_), dy_(m.dy_),
|
||||
zx_(m.zx_), zy_(m.zy_), zz_(m.zz_), dz_(m.dz_) {}
|
||||
Transform3D(const Transform3D & mt)
|
||||
: xx_(mt.xx_), xy_(mt.xy_), xz_(mt.xz_), dx_(mt.dx_),
|
||||
yx_(mt.yx_), yy_(mt.yy_), yz_(mt.yz_), dy_(mt.dy_),
|
||||
zx_(mt.zx_), zy_(mt.zy_), zz_(mt.zz_), dz_(mt.dz_) {}
|
||||
|
||||
/**
|
||||
* Destructor.
|
||||
@@ -285,10 +285,10 @@ namespace HepGeom {
|
||||
|
||||
/**
|
||||
* Assignment. */
|
||||
Transform3D & operator=(const Transform3D &m) {
|
||||
xx_= m.xx_; xy_= m.xy_; xz_= m.xz_; dx_= m.dx_;
|
||||
yx_= m.yx_; yy_= m.yy_; yz_= m.yz_; dy_= m.dy_;
|
||||
zx_= m.zx_; zy_= m.zy_; zz_= m.zz_; dz_= m.dz_;
|
||||
Transform3D & operator=(const Transform3D &mt) {
|
||||
xx_= mt.xx_; xy_= mt.xy_; xz_= mt.xz_; dx_= mt.dx_;
|
||||
yx_= mt.yx_; yy_= mt.yy_; yz_= mt.yz_; dy_= mt.dy_;
|
||||
zx_= mt.zx_; zy_= mt.zy_; zz_= mt.zz_; dz_= mt.dz_;
|
||||
return *this;
|
||||
}
|
||||
|
||||
@@ -378,7 +378,7 @@ namespace HepGeom {
|
||||
|
||||
/**
|
||||
* Constructor from CLHEP::HepRotation. */
|
||||
inline Rotate3D(const CLHEP::HepRotation &m);
|
||||
inline Rotate3D(const CLHEP::HepRotation &mt);
|
||||
|
||||
/**
|
||||
* Constructor from angle and axis given by two points.
|
||||
@@ -621,8 +621,8 @@ namespace HepGeom {
|
||||
class Reflect3D : public Transform3D {
|
||||
protected:
|
||||
Reflect3D(double XX, double XY, double XZ, double DX,
|
||||
double YX, double YY, double YZ, double DY,
|
||||
double ZX, double ZY, double ZZ, double DZ)
|
||||
double YX, double YY, double YZ, double DY,
|
||||
double ZX, double ZY, double ZZ, double DZ)
|
||||
: Transform3D(XX,XY,XZ,DX, YX,YY,YZ,DY, ZX,ZY,ZZ,DZ) {}
|
||||
|
||||
public:
|
||||
@@ -639,7 +639,7 @@ namespace HepGeom {
|
||||
/**
|
||||
* Constructor from a plane given by its normal and origin. */
|
||||
inline Reflect3D(const Normal3D<double> & normal,
|
||||
const Point3D<double> & point);
|
||||
const Point3D<double> & point);
|
||||
};
|
||||
|
||||
/**
|
||||
@@ -735,8 +735,8 @@ namespace HepGeom {
|
||||
|
||||
/**
|
||||
* Constructor from a number: sets uniform scaling in all directions. */
|
||||
Scale3D(double s)
|
||||
: Transform3D(s,0,0,0, 0,s,0,0, 0,0,s,0) {}
|
||||
Scale3D(double sc)
|
||||
: Transform3D(sc,0,0,0, 0,sc,0,0, 0,0,sc,0) {}
|
||||
};
|
||||
|
||||
/**
|
||||
|
||||
+12
-12
@@ -26,20 +26,20 @@ const Transform3D::Transform3D_row Transform3D::operator[](int i) const {
|
||||
}
|
||||
|
||||
inline
|
||||
Transform3D::Transform3D(const CLHEP::HepRotation & m, const CLHEP::Hep3Vector & v) {
|
||||
xx_= m.xx(); xy_= m.xy(); xz_= m.xz();
|
||||
yx_= m.yx(); yy_= m.yy(); yz_= m.yz();
|
||||
zx_= m.zx(); zy_= m.zy(); zz_= m.zz();
|
||||
Transform3D::Transform3D(const CLHEP::HepRotation & mt, const CLHEP::Hep3Vector & v) {
|
||||
xx_= mt.xx(); xy_= mt.xy(); xz_= mt.xz();
|
||||
yx_= mt.yx(); yy_= mt.yy(); yz_= mt.yz();
|
||||
zx_= mt.zx(); zy_= mt.zy(); zz_= mt.zz();
|
||||
dx_= v.x(); dy_= v.y(); dz_= v.z();
|
||||
}
|
||||
|
||||
inline
|
||||
CLHEP::HepRotation
|
||||
Transform3D::getRotation() const {
|
||||
CLHEP::HepRotation m;
|
||||
return m.rotateAxes(CLHEP::Hep3Vector(xx_,yx_,zx_),
|
||||
CLHEP::Hep3Vector(xy_,yy_,zy_),
|
||||
CLHEP::Hep3Vector(xz_,yz_,zz_));
|
||||
CLHEP::HepRotation mt;
|
||||
return mt.rotateAxes(CLHEP::Hep3Vector(xx_,yx_,zx_),
|
||||
CLHEP::Hep3Vector(xy_,yy_,zy_),
|
||||
CLHEP::Hep3Vector(xz_,yz_,zz_));
|
||||
}
|
||||
|
||||
inline
|
||||
@@ -51,10 +51,10 @@ Transform3D::getTranslation() const {
|
||||
// I N L I N E S F O R R O T A T I O N
|
||||
|
||||
inline
|
||||
Rotate3D::Rotate3D(const CLHEP::HepRotation & m) {
|
||||
xx_= m.xx(); xy_= m.xy(); xz_= m.xz();
|
||||
yx_= m.yx(); yy_= m.yy(); yz_= m.yz();
|
||||
zx_= m.zx(); zy_= m.zy(); zz_= m.zz();
|
||||
Rotate3D::Rotate3D(const CLHEP::HepRotation & mt) {
|
||||
xx_= mt.xx(); xy_= mt.xy(); xz_= mt.xz();
|
||||
yx_= mt.yx(); yy_= mt.yy(); yz_= mt.yz();
|
||||
zx_= mt.zx(); zy_= mt.zy(); zz_= mt.zz();
|
||||
dx_= 0; dy_= 0; dz_= 0;
|
||||
}
|
||||
|
||||
|
||||
@@ -7,15 +7,9 @@
|
||||
//
|
||||
// ======================================================================
|
||||
|
||||
#if defined (G4MULTITHREADED)
|
||||
|
||||
#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 7) || __clang__ || WIN32
|
||||
#include <atomic>
|
||||
#define CLHEP_ATOMIC_INT_TYPE std::atomic<int>
|
||||
#else
|
||||
#define CLHEP_ATOMIC_INT_TYPE int
|
||||
#endif
|
||||
|
||||
#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 7) || __clang__ || WIN32
|
||||
#include <atomic>
|
||||
#define CLHEP_ATOMIC_INT_TYPE std::atomic<int>
|
||||
#else
|
||||
#define CLHEP_ATOMIC_INT_TYPE int
|
||||
#endif
|
||||
|
||||
@@ -7,14 +7,8 @@
|
||||
//
|
||||
// ======================================================================
|
||||
|
||||
#if defined (G4MULTITHREADED)
|
||||
|
||||
#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 7) || __clang__ || WIN32
|
||||
#define CLHEP_THREAD_LOCAL thread_local
|
||||
#else
|
||||
#define CLHEP_THREAD_LOCAL
|
||||
#endif
|
||||
|
||||
#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 7) || __clang__ || WIN32
|
||||
#define CLHEP_THREAD_LOCAL thread_local
|
||||
#else
|
||||
#define CLHEP_THREAD_LOCAL
|
||||
#endif
|
||||
|
||||
@@ -6,14 +6,9 @@
|
||||
// Use std::atomic when the compiler declares it uses the C++11 standard
|
||||
//
|
||||
// ======================================================================
|
||||
|
||||
#if defined (G4MULTITHREADED)
|
||||
|
||||
#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 7) || __clang__ || WIN32
|
||||
#include <atomic>
|
||||
#define CLHEP_USE_ATOMIC
|
||||
#endif
|
||||
|
||||
#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 7) || __clang__ || WIN32
|
||||
#include <atomic>
|
||||
#define CLHEP_USE_ATOMIC
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user