Skip to content

GitLab

Commit 65e2e758 authored by Lynn Garren's avatar Lynn Garren
Browse files

Merge branch 'develop' into CLHEP_2_200_branch

parents 813a4122 9cb9cc25
Hide whitespace changes
Inline Side-by-side
CMakeLists.txt
View file @ 65e2e758
......@@ -31,7 +31,7 @@ cmake_minimum_required(VERSION 2.6)
# project name
project(CLHEP)
set( VERSION 2.1.4.1 )
set( VERSION 2.1.4.2 )
set(CMAKE_MODULE_PATH
${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules
......
Cast/configure.ac
View file @ 65e2e758
......@@ -9,7 +9,7 @@
# ----------------------------------------------------------------------
AC_PREREQ(2.59)
AC_INIT(CLHEP Cast, 2.1.4.1, http://savannah.cern.ch/projects/clhep/, Cast)
AC_INIT(CLHEP Cast, 2.1.4.2, http://savannah.cern.ch/projects/clhep/, Cast)
AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_TARGET
AC_CONFIG_SRCDIR([src/itos.cc])
......
ChangeLog
View file @ 65e2e758
==============================
12.05.14 Release CLHEP-2.1.4.2
==============================
2014-05-04 Lynn Garren <garren@fnal.gov>
* Random/test/testBug58950.cc: accept fix for bug 104289
2014-05-04 Lynn Garren <garren@fnal.gov>
* Matrix/src/Vector.cc: remove inline - no reason to use it in a cc file
2014-02-24 Lynn Garren <garren@fnal.gov>
......
Evaluator/ChangeLog
View file @ 65e2e758
==============================
12.05.14 Release CLHEP-2.1.4.2
==============================
==============================
18.11.13 Release CLHEP-2.1.4.1
==============================
......
Evaluator/configure.ac
View file @ 65e2e758
......@@ -9,7 +9,7 @@
# ----------------------------------------------------------------------
AC_PREREQ(2.59)
AC_INIT(CLHEP Evaluator, 2.1.4.1, http://savannah.cern.ch/projects/clhep/, Evaluator)
AC_INIT(CLHEP Evaluator, 2.1.4.2, http://savannah.cern.ch/projects/clhep/, Evaluator)
AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_TARGET
AC_CONFIG_SRCDIR([src/Evaluator.cc])
......
Exceptions/ChangeLog
View file @ 65e2e758
==============================
12.05.14 Release CLHEP-2.1.4.2
==============================
==============================
14.11.13 Release CLHEP-2.1.4.1
==============================
==============================
......
Exceptions/configure.ac
View file @ 65e2e758
......@@ -9,7 +9,7 @@
# ----------------------------------------------------------------------
AC_PREREQ(2.59)
AC_INIT(CLHEP Exceptions, 2.1.4.1, http://savannah.cern.ch/projects/clhep/, Exceptions)
AC_INIT(CLHEP Exceptions, 2.1.4.2, http://savannah.cern.ch/projects/clhep/, Exceptions)
AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_TARGET
AC_CONFIG_SRCDIR([src/ZMerrno.cc])
......
Fields/ChangeLog
View file @ 65e2e758
==============================
12.05.14 Release CLHEP-2.1.4.2
==============================
==============================
14.11.13 Release CLHEP-2.1.4.1
==============================
==============================
......
Fields/configure.ac
View file @ 65e2e758
......@@ -9,7 +9,7 @@
# ----------------------------------------------------------------------
AC_PREREQ(2.57)
AC_INIT(CLHEP Fields, 2.1.4.1, CLHEP@cern.ch, Fields)
AC_INIT(CLHEP Fields, 2.1.4.2, CLHEP@cern.ch, Fields)
AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_TARGET
AC_CONFIG_SRCDIR([src/XF.cc])
......
GenericFunctions/ChangeLog
View file @ 65e2e758
==============================
12.05.14 Release CLHEP-2.1.4.2
==============================
2014-02-24 Lynn Garren <garren@fnal.gov>
......
GenericFunctions/configure.ac
View file @ 65e2e758
......@@ -9,7 +9,7 @@
# ----------------------------------------------------------------------
AC_PREREQ(2.59)
AC_INIT(CLHEP GenericFunctions, 2.1.4.1, http://savannah.cern.ch/projects/clhep/, GenericFunctions)
AC_INIT(CLHEP GenericFunctions, 2.1.4.2, http://savannah.cern.ch/projects/clhep/, GenericFunctions)
AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_TARGET
AC_CONFIG_SRCDIR([src/Abs.cc])
......
Geometry/ChangeLog
View file @ 65e2e758
==============================
12.05.14 Release CLHEP-2.1.4.2
==============================
2014-02-24 Lynn Garren <garren@fnal.gov>
......
Geometry/configure.ac
View file @ 65e2e758
......@@ -9,7 +9,7 @@
# ----------------------------------------------------------------------
AC_PREREQ(2.59)
AC_INIT(CLHEP Geometry, 2.1.4.1, http://savannah.cern.ch/projects/clhep/, Geometry)
AC_INIT(CLHEP Geometry, 2.1.4.2, http://savannah.cern.ch/projects/clhep/, Geometry)
AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_TARGET
AC_CONFIG_SRCDIR([src/Plane3D.cc])
......
Matrix/ChangeLog
View file @ 65e2e758
==============================
12.05.14 Release CLHEP-2.1.4.2
==============================
2014-05-04 Lynn Garren <garren@fnal.gov>
* src/Vector.cc: remove inline - no reason to use it in a cc file
2014-02-24 Lynn Garren <garren@fnal.gov>
......
Matrix/configure.ac
View file @ 65e2e758
......@@ -9,7 +9,7 @@
# ----------------------------------------------------------------------
AC_PREREQ(2.59)
AC_INIT(CLHEP Matrix, 2.1.4.1, http://savannah.cern.ch/projects/clhep/, Matrix)
AC_INIT(CLHEP Matrix, 2.1.4.2, http://savannah.cern.ch/projects/clhep/, Matrix)
AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_TARGET
AC_CONFIG_SRCDIR([src/DiagMatrix.cc])
......
Matrix/src/Vector.cc
View file @ 65e2e758
......@@ -114,19 +114,19 @@ HepVector::HepVector(const HepMatrix &hm1)
// trivial methods
inline int HepVector::num_row() const {return nrow;}
inline int HepVector::num_size() const {return nrow;}
inline int HepVector::num_col() const { return 1; }
int HepVector::num_row() const {return nrow;}
int HepVector::num_size() const {return nrow;}
int HepVector::num_col() const { return 1; }
// operator()
#ifdef MATRIX_BOUND_CHECK
inline double & HepVector::operator()(int row, int col)
double & HepVector::operator()(int row, int col)
{
if( col!=1 || row<1 || row>nrow)
error("Range error in HepVector::operator(i,j)");
#else
inline double & HepVector::operator()(int row, int)
double & HepVector::operator()(int row, int)
{
#endif
......@@ -134,12 +134,12 @@ inline double & HepVector::operator()(int row, int)
}
#ifdef MATRIX_BOUND_CHECK
inline const double & HepVector::operator()(int row, int col) const
const double & HepVector::operator()(int row, int col) const
{
if( col!=1 || row<1 || row>nrow)
error("Range error in HepVector::operator(i,j)");
#else
inline const double & HepVector::operator()(int row, int) const
const double & HepVector::operator()(int row, int) const
{
#endif
......
Random/ChangeLog
View file @ 65e2e758
2014-03-04 W. David Dagenhart <wdd@fnal.gov>
* In Random package convert statics and globals to const, thread
local or atomic to improve thread safety.
==============================
12.05.14 Release CLHEP-2.1.4.2
==============================
2014-05-04 Lynn Garren <garren@fnal.gov>
* test/testBug58950.cc: accept fix for bug 104289
2014-02-24 Lynn Garren <garren@fnal.gov>
* remove register declaration of ints and doubles
......
Random/configure.ac
View file @ 65e2e758
......@@ -9,7 +9,7 @@
# ----------------------------------------------------------------------
AC_PREREQ(2.59)
AC_INIT(CLHEP Random, 2.1.4.1, http://savannah.cern.ch/projects/clhep/, Random)
AC_INIT(CLHEP Random, 2.1.4.2, http://savannah.cern.ch/projects/clhep/, Random)
AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_TARGET
AC_CONFIG_SRCDIR([src/DRand48Engine.cc])
......
Random/test/testBug58950.cc
View file @ 65e2e758
......@@ -10,6 +10,8 @@
#include <stdexcept>
#include <cmath>
#include <stdlib.h>
#include <limits>
#include <complex>
#include "CLHEP/Random/RanecuEngine.h"
#include "CLHEP/Random/Random.h"
#include "pretend.h"
......@@ -151,7 +153,8 @@ int main() {
g->setTheSeeds(seeds);
for (int i=0; i < nNumbers; ++i) {
double r = g->flat();
if(v[i] != r ) {
// if(v[i] != r ) {
if(std::abs(v[i] - r) >= std::numeric_limits<double>::epsilon()) {
++badcount;
std::cerr << " rollback fails: i, v[i], r "
<< i << " " << v[i] << " " << r << std::endl;
......
RandomObjects/ChangeLog
View file @ 65e2e758
==============================
12.05.14 Release CLHEP-2.1.4.2
==============================
==============================
14.11.13 Release CLHEP-2.1.4.1
==============================
==============================
......
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