Commit 54e24c23 authored by Lynn Garren's avatar Lynn Garren

CLHEP 2.1.2.3

parent 62417623
......@@ -25,7 +25,7 @@ cmake_minimum_required(VERSION 2.6)
# project name
project(CLHEP)
set( VERSION 2.1.2.2 )
set( VERSION 2.1.2.3 )
set(CMAKE_MODULE_PATH
${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules
......
......@@ -9,7 +9,7 @@
# ----------------------------------------------------------------------
AC_PREREQ(2.59)
AC_INIT(CLHEP Cast, 2.1.2.2, http://savannah.cern.ch/projects/clhep/, Cast)
AC_INIT(CLHEP Cast, 2.1.2.3, http://savannah.cern.ch/projects/clhep/, Cast)
AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_TARGET
AC_CONFIG_SRCDIR([src/itos.cc])
......
==============================
31.05.12 Release CLHEP-2.1.2.3
==============================
2012-05-31 Lynn Garren <garren@fnal.gov>
* Random: fix for shadowing when global units used
* Vector: fix for shadowing when global units used
USING_VISUAL code blocks are no longer needed
2012-05-30 Lynn Garren <garren@fnal.gov>
* GenericFunctions: latest changes from Joe Boudreau
* Matrix: cleanup for -Wextra
2012-05-11 Lynn Garren <garren@fnal.gov>
......
==============================
31.05.12 Release CLHEP-2.1.2.3
==============================
2012-05-31 Lynn Garren <garren@fnal.gov>
......
......@@ -9,7 +9,7 @@
# ----------------------------------------------------------------------
AC_PREREQ(2.59)
AC_INIT(CLHEP Evaluator, 2.1.2.2, http://savannah.cern.ch/projects/clhep/, Evaluator)
AC_INIT(CLHEP Evaluator, 2.1.2.3, http://savannah.cern.ch/projects/clhep/, Evaluator)
AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_TARGET
AC_CONFIG_SRCDIR([src/Evaluator.cc])
......
......@@ -62,7 +62,7 @@ int main() {
int err=0;
for(unsigned i=0; i<sizeof(tests)/sizeof(Test); ++i) {
double v=e.evaluate(tests[i].expr);
if(isnan(v) || std::fabs(v-tests[i].value1) > 1E-12 || !e.isOK()) {
if(std::isnan(v) || std::fabs(v-tests[i].value1) > 1E-12 || !e.isOK()) {
printf("%s = %.6f should be %.6f\n",tests[i].expr,
e.evaluate(tests[i].expr),tests[i].value1);
err = 1;
......@@ -75,7 +75,7 @@ int main() {
//printf("x=10.0 y=-20.0 z=-30.0\n");
for(unsigned i=0; i<sizeof(tests)/sizeof(Test); ++i) {
double v=e.evaluate(tests[i].expr);
if(isnan(v) || std::fabs(v-tests[i].value2) > 1E-12 || !e.isOK()) {
if(std::isnan(v) || std::fabs(v-tests[i].value2) > 1E-12 || !e.isOK()) {
printf("%s = %.6f should be %.6f\n",tests[i].expr,
e.evaluate(tests[i].expr),tests[i].value2);
err = 1;
......@@ -83,13 +83,13 @@ int main() {
}
double v=e.evaluate("unknown(0.0)");
if(!isnan(v) || e.isOK()) {
if(!std::isnan(v) || e.isOK()) {
printf("%s succeeded\n","unknown(0.0)");
err=1;
}
v = e.evaluate("unknown+0.0");
if(!isnan(v) || e.isOK()) {
if(!std::isnan(v) || e.isOK()) {
printf("%s succeeded\n","unknown+0.0");
err=1;
}
......
==============================
31.05.12 Release CLHEP-2.1.2.3
==============================
==============================
14.02.12 Release CLHEP-2.1.2.2
==============================
==============================
......
......@@ -9,7 +9,7 @@
# ----------------------------------------------------------------------
AC_PREREQ(2.59)
AC_INIT(CLHEP Exceptions, 2.1.2.2, http://savannah.cern.ch/projects/clhep/, Exceptions)
AC_INIT(CLHEP Exceptions, 2.1.2.3, http://savannah.cern.ch/projects/clhep/, Exceptions)
AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_TARGET
AC_CONFIG_SRCDIR([src/ZMerrno.cc])
......
==============================
31.05.12 Release CLHEP-2.1.2.3
==============================
==============================
14.02.12 Release CLHEP-2.1.2.2
==============================
==============================
......
......@@ -9,7 +9,7 @@
# ----------------------------------------------------------------------
AC_PREREQ(2.57)
AC_INIT(CLHEP Fields, 2.1.2.2, CLHEP@cern.ch, Fields)
AC_INIT(CLHEP Fields, 2.1.2.3, CLHEP@cern.ch, Fields)
AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_TARGET
AC_CONFIG_SRCDIR([src/XF.cc])
......
==============================
31.05.12 Release CLHEP-2.1.2.3
==============================
2012-05-30 Lynn Garren <garren@fnal.gov>
......
......@@ -9,7 +9,7 @@
# ----------------------------------------------------------------------
AC_PREREQ(2.59)
AC_INIT(CLHEP GenericFunctions, 2.1.2.2, http://savannah.cern.ch/projects/clhep/, GenericFunctions)
AC_INIT(CLHEP GenericFunctions, 2.1.2.3, http://savannah.cern.ch/projects/clhep/, GenericFunctions)
AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_TARGET
AC_CONFIG_SRCDIR([src/Abs.cc])
......
==============================
31.05.12 Release CLHEP-2.1.2.3
==============================
2012-05-11 Lynn Garren <garren@fnal.gov>
......
......@@ -9,7 +9,7 @@
# ----------------------------------------------------------------------
AC_PREREQ(2.59)
AC_INIT(CLHEP Geometry, 2.1.2.2, http://savannah.cern.ch/projects/clhep/, Geometry)
AC_INIT(CLHEP Geometry, 2.1.2.3, http://savannah.cern.ch/projects/clhep/, Geometry)
AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_TARGET
AC_CONFIG_SRCDIR([src/Plane3D.cc])
......
......@@ -5,28 +5,13 @@
You may build CLHEP as a complete package, starting from this
top level directory, or you may build any package separately.
Cmake is now the preferred build option - see cmake/INSTALL.
Cmake is now the preferred build option.
Building with autotools and configure is deprecated.
Although it may be possible to build with autotools,
we strongly recommend building with cmake.
You MUST use cmake when building with clang and other exotic compilers.
The instructions below are for the autoconf/automake build system.
#-------------------------------------------------------------
# platform specific issues
#-------------------------------------------------------------
This package requires autoconf 2.59 or later and automake 1.9.1 or later.
If you bootstrap, you will probably have to build these yourself.
See "building autotools" below.
The new libtool no longer properly supports shared libraries for gcc 2.95.2.
If you build CLHEP with gcc 2.95.2, you must configure --disable-shared.
To build for Solaris CC, configure with CXX=CC CC=cc and use gmake.
On MacOSX, you need to define MACOSX_DEPLOYMENT_TARGET appropriately.
For instance, set MACOSX_DEPLOYMENT_TARGET to "10.4" if you
have MacOS 10.4 installed on your system.
Please see either INSTALL.cmake or INSTALL.autotools for directions.
#-------------------------------------------------------------
# about linking
......@@ -34,101 +19,12 @@ have MacOS 10.4 installed on your system.
CLHEP builds libraries for each package in addition to a single CLHEP library.
This alllows you to link with only the necessary parts of CLHEP.
We provide a "clheplib" script which gives the list of libraries to link,
in the correct order. The script can be embedded in a makefile.
clheplib - provides link list of ALL CLHEP libraries
clheplib <package> - provides link list of ONLY those libraries
needed to use <package>
#-------------------------------------------------------------
# installing from a source code tar ball
#-------------------------------------------------------------
Unwind the source code tar ball in some relevant directory.
Autoconf and automake will aready have been run.
Determine where the files will be installed.
Create a build directory that is NOT in the source code directory tree.
cd <build_directory>
<source_code_direcotry>/configure --prefix=<install_dir>
(Note that files will be installed under /usr/local if you do not
specify a prefix.)
make
(Build temporary copies of libraries and executables.)
make check
(Run the tests.)
make install
(Copy libraries, headers, executables, etc. to relevant
subdirectories under <install_dir>.)
#-------------------------------------------------------------
# configure options
#-------------------------------------------------------------
A variety of options can be given to configure. Below is a list
of the options that you are likely to find most useful.
--help provides a partial list of options
--prefix=PREFIX install architecture-independent files in PREFIX
[default is /usr/local]
--exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
[default is the same as PREFIX]
--disable-shared build only static libraries
--disable-static build only shared libraries
--enable-exceptions use the CLHEP/Exceptions package
--disable-exceptions DO NOT use the CLHEP/Exceptions package
[--disable-exceptions is the default]
#-------------------------------------------------------------
# building documents
#-------------------------------------------------------------
Documents are neither built nor installed automatically.
Use the following commands to build and install documents:
make docs
make install-docs
#-------------------------------------------------------------
# building from cvs
#-------------------------------------------------------------
You will need current versions of automake, autoconf, and libtool.
See building autotools below.
cvs co CLHEP OR cvs co CLHEP/package
cd CLHEP[/package]
./bootstrap
Now continue with directions as if you unpacked a source code tarball.
#-------------------------------------------------------------
# building autotools
#-------------------------------------------------------------
If you do not have at least autoconf 2.59 and automake 1.9.1, you will
need to build autoconf, automake, and libtool. On some platforms,
you may also need to build m4 and texinfo.
Download the relevant tarballs from gnu.org
(http://www.gnu.org/software/autoconf/, http://www.gnu.org/software/automake/,
and http://www.gnu.org/software/libtool/)
Untar them in a common source code tree.
Decide whether you want to install them in /usr/local or your own
install directory. If you use your own install directory, use
--prefix=<install_dir>
with configure.
For each autotool package:
<source_code_dir>/configure [--prefix=<install_dir>]
make
make install
We provide a set of <package>-config scripts which gives the list of
libraries to link, in the correct order.
The script can be embedded in a makefile.
Make sure that <install_dir>/bin is at the front of your path.
clhep-config --libs - link list of ALL CLHEP libraries
<package>-config --libs - link list of ONLY those libraries
needed to use <package>
#-------------------------------------------------------------
#-------------------------------------------------------------
# building CLHEP with configure
#-------------------------------------------------------------
Although it may be possible to build the HepMC libraries from this directory,
we recommend that you create a separate build directory and work from there.
Cmake is now the preferred build option - see INSTALL.cmake
You MUST use cmake when building with clang and other exotic compilers.
The instructions below are for the autoconf/automake build system.
#-------------------------------------------------------------
# platform specific issues
#-------------------------------------------------------------
This package requires autoconf 2.59 or later and automake 1.9.1 or later.
#-------------------------------------------------------------
# installing from a source code tar ball
#-------------------------------------------------------------
Unwind the source code tar ball in some relevant directory.
If you see only configure.ac, and not configure, you need to run
autoconf and automake:
cd CLHEP
./bootstrap
Determine where the files will be installed.
Create a build directory that is NOT in the source code directory tree.
cd <build_directory>
<source_code_direcotry>/configure --prefix=<install_dir>
(Note that files will be installed under /usr/local if you do not
specify a prefix.)
make
(Build temporary copies of libraries and executables.)
make check
(Run the tests.)
make install
(Copy libraries, headers, executables, etc. to relevant
subdirectories under <install_dir>.)
#-------------------------------------------------------------
# configure options
#-------------------------------------------------------------
A variety of options can be given to configure. Below is a list
of the options that you are likely to find most useful.
--help provides a partial list of options
--prefix=PREFIX install architecture-independent files in PREFIX
[default is /usr/local]
--exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
[default is the same as PREFIX]
--disable-shared build only static libraries
--disable-static build only shared libraries
--enable-exceptions use the CLHEP/Exceptions package
--disable-exceptions DO NOT use the CLHEP/Exceptions package
[--disable-exceptions is the default]
#-------------------------------------------------------------
# building documents
#-------------------------------------------------------------
Documents are neither built nor installed automatically.
Use the following commands to build and install documents:
make docs
make install-docs
#-------------------------------------------------------------
# building from svn
#-------------------------------------------------------------
You will need current versions of automake, autoconf, and libtool.
On some machines, you will need to build them. See building autotools below.
To work with a tagged branch:
svn co svn+ssh://svn.cern.ch/reps/clhep/tags/CLHEP_2_1_2_2
To work with the head:
svn co svn+ssh://svn.cern.ch/reps/clhep/trunk CLHEP
You may also download directly from the online browser
http://svnweb.cern.ch/world/wsvn/clhep/
Now continue with directions as if you unpacked a source code tarball.
#-------------------------------------------------------------
# building autotools
#-------------------------------------------------------------
If you do not have at least autoconf 2.59 and automake 1.9.1, you will
need to build autoconf, automake, and libtool. On some platforms,
you may also need to build m4 and texinfo.
Download the relevant tarballs from gnu.org
(http://www.gnu.org/software/autoconf/, http://www.gnu.org/software/automake/,
and http://www.gnu.org/software/libtool/)
Untar them in a common source code tree.
Decide whether you want to install them in /usr/local or your own
install directory. If you use your own install directory, use
--prefix=<install_dir>
with configure.
For each autotool package:
<source_code_dir>/configure [--prefix=<install_dir>]
make
make install
Make sure that <install_dir>/bin is at the front of your path.
#-------------------------------------------------------------
......@@ -5,25 +5,8 @@
At this time, the cmake build system only supports building
CLHEP as a complete package, starting from the top level directory.
#-------------------------------------------------------------
# platform specific issues
#-------------------------------------------------------------
This package requires cmake 2.6 or later.
#-------------------------------------------------------------
# about linking
#-------------------------------------------------------------
CLHEP builds libraries for each package in addition to a single CLHEP library.
This alllows you to link with only the necessary parts of CLHEP.
We provide a "clheplib" script which gives the list of libraries to link,
in the correct order. The script can be embedded in a makefile.
clheplib - provides link list of ALL CLHEP libraries
clheplib <package> - provides link list of ONLY those libraries
needed to use <package>
#-------------------------------------------------------------
# installing from a source code tar ball
#-------------------------------------------------------------
......@@ -56,7 +39,8 @@ make install
-DCMAKE_C_COMPILER=...
-DCMAKE_CXX_COMPILER=...
-DCMAKE_CXX_FLAGS="list_of_flags"
#-------------------------------------------------------------
# building documents
#-------------------------------------------------------------
......@@ -68,11 +52,41 @@ Documents will then be built during the normal build.
You will need to have latex in your path.
#-------------------------------------------------------------
# building from cvs
# building from svn
#-------------------------------------------------------------
cvs co CLHEP
To work with a tagged branch:
svn co svn+ssh://svn.cern.ch/reps/clhep/tags/CLHEP_2_1_2_2
To work with the head:
svn co svn+ssh://svn.cern.ch/reps/clhep/trunk CLHEP
You may also download directly from the online browser
http://svnweb.cern.ch/world/wsvn/clhep/
Now continue with directions as if you unpacked a source code tarball.
#-------------------------------------------------------------
# building cmake
#-------------------------------------------------------------
cmake 2.6 or later is readily available for Linux,
although you may need to install it
download the cmake tar file from http://www.cmake.org/cmake/resources/software.html
You may find a usable binary distribution there.
If not, get the source code and proceed as below (for either MacOSX or Linux).
Unwind the source code tarball. This directory is <cmake_source_dir>.
Identify a separate build directory and a separate install directory:
<cmake_build_dir> and <cmake_install_dir>.
cd <cmake_build_dir>
<cmake_source_dir>/bootstrap --prefix=<cmake_install_dir>
make
make install
Add <cmake_install_dir>/bin to your path.
#-------------------------------------------------------------
==============================
31.05.12 Release CLHEP-2.1.2.3
==============================
2012-05-30 Lynn Garren <garren@fnal.gov>
......
......@@ -9,7 +9,7 @@
# ----------------------------------------------------------------------
AC_PREREQ(2.59)
AC_INIT(CLHEP Matrix, 2.1.2.2, http://savannah.cern.ch/projects/clhep/, Matrix)
AC_INIT(CLHEP Matrix, 2.1.2.3, http://savannah.cern.ch/projects/clhep/, Matrix)
AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_TARGET
AC_CONFIG_SRCDIR([src/DiagMatrix.cc])
......
......@@ -494,7 +494,7 @@ return mret(num_row(),num_col());
int HepMatrix::dfinv_matrix(int *ir) {
if (num_col()!=num_row())
error("dfinv_matrix: Matrix is not NxN");
register int n = num_col();
int n = num_col();
if (n==1) return 0;
double s31, s32;
......@@ -598,7 +598,7 @@ int HepMatrix::dfact_matrix(double &det, int *ir) {
error("dfact_matrix: Matrix is not NxN");
int ifail, jfail;
register int n = ncol;
int n = ncol;
double tf;
double g1 = 1.0e-19, g2 = 1.0e19;
......
......@@ -6,12 +6,14 @@ Full information on CLHEP is available on the WEB:
# about linking
#-------------------------------------------------------------
CLHEP builds libraries for each package instead of a single CLHEP library.
CLHEP builds libraries for each package in addition to a single CLHEP library.
This alllows you to link with only the necessary parts of CLHEP.
We provide a "clheplib" script which gives the list of libraries to link,
in the correct order. The script can be embedded in a makefile.
We provide a set of <package>-config scripts which gives the list of
libraries to link, in the correct order.
The script can be embedded in a makefile.
clheplib - provides link list of ALL CLHEP libraries
clheplib <package> - provides link list of ONLY those libraries
needed to use <package>
clhep-config --libs - link list of ALL CLHEP libraries
<package>-config --libs - link list of ONLY those libraries
needed to use <package>
#-------------------------------------------------------------
==============================
31.05.12 Release CLHEP-2.1.2.3
==============================
2012-05-31 Lynn Garren <garren@fnal.gov>
......
......@@ -9,7 +9,7 @@
# ----------------------------------------------------------------------
AC_PREREQ(2.59)
AC_INIT(CLHEP Random, 2.1.2.2, http://savannah.cern.ch/projects/clhep/, Random)
AC_INIT(CLHEP Random, 2.1.2.3, http://savannah.cern.ch/projects/clhep/, Random)
AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_TARGET
AC_CONFIG_SRCDIR([src/DRand48Engine.cc])
......
......@@ -128,7 +128,7 @@ Ranlux64Engine::Ranlux64Engine(long seed, int lux)
// point in the sequence.
}
Ranlux64Engine::Ranlux64Engine(int rowIndex, int colIndex, int lux)
Ranlux64Engine::Ranlux64Engine(int rowIndex, int, int lux)
: HepRandomEngine()
{
luxury = lux;
......
==============================
31.05.12 Release CLHEP-2.1.2.3
==============================
==============================
14.02.12 Release CLHEP-2.1.2.2
==============================
==============================
......
......@@ -9,7 +9,7 @@
# ----------------------------------------------------------------------
AC_PREREQ(2.59)
AC_INIT(CLHEP RandomObjects, 2.1.2.2, http://savannah.cern.ch/projects/clhep/, RandomObjects)
AC_INIT(CLHEP RandomObjects, 2.1.2.3, http://savannah.cern.ch/projects/clhep/, RandomObjects)
AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_TARGET
AC_CONFIG_SRCDIR([src/RandMultiGauss.cc])
......
......@@ -9,7 +9,7 @@
# ----------------------------------------------------------------------
AC_PREREQ(2.59)
AC_INIT(CLHEP RefCount, 2.1.2.2, http://savannah.cern.ch/projects/clhep/, RefCount)
AC_INIT(CLHEP RefCount, 2.1.2.3, http://savannah.cern.ch/projects/clhep/, RefCount)
AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_TARGET
AC_CONFIG_SRCDIR([src/ZMuseCount.cc])
......
==============================
31.05.12 Release CLHEP-2.1.2.3
==============================
==============================
14.02.12 Release CLHEP-2.1.2.2
==============================
......
......@@ -9,7 +9,7 @@
# ----------------------------------------------------------------------
AC_PREREQ(2.59)
AC_INIT(CLHEP Units, 2.1.2.2, http://savannah.cern.ch/projects/clhep/, Units)
AC_INIT(CLHEP Units, 2.1.2.3, http://savannah.cern.ch/projects/clhep/, Units)
AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_TARGET
AM_INIT_AUTOMAKE(1.9 foreign)
......
==============================
31.05.12 Release CLHEP-2.1.2.3
==============================
==============================
14.02.12 Release CLHEP-2.1.2.2
==============================
......