Commit a9ee331d authored by Lynn Garren's avatar Lynn Garren

merging changes from 1.9 and 2.0 into the HEAD

parent 8ab133f0
......@@ -19,6 +19,34 @@ 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
#-------------------------------------------------------------
......@@ -29,7 +57,7 @@ See building autotools below.
cvs co CLHEP/package OR cvs co package
cd [CLHEP/]package
bootstrap
./bootstrap
Now continue with directions as if you unpacked a source code tarball.
......
......@@ -9,7 +9,7 @@
# ----------------------------------------------------------------------
AC_PREREQ(2.57)
AC_INIT(CLHEP Cast, 2.0.0.0, CLHEP@cern.ch, Cast)
AC_INIT(CLHEP Cast, 2.0.0.1, CLHEP@cern.ch, Cast)
AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_TARGET
AC_CONFIG_SRCDIR([src/itos.cc])
......@@ -176,7 +176,6 @@ powerpc-apple-darwin*)
esac;;
esac
# ----------------------------------------------------------------------
# Set system-dependent options:
# ----------------------------------------------------------------------
......
Wed Apr 28 2004 Lynn Garren <garren@fnal.gov>
* make CLHEP work with Visual C++
Wed Apr 21 2004 Lynn Garren <garren@fnal.gov>
* change version to CLHEP 2.0.0.1
* fix Herwig and Isajet translation routines in HepPDT
add translation checking tests
Thu Nov 06 2003 Lynn Garren <garren@fnal.gov>
* adding ZOOM Exceptions package for FNAL
......
......@@ -19,6 +19,34 @@ 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
#-------------------------------------------------------------
......@@ -29,7 +57,7 @@ See building autotools below.
cvs co CLHEP/package OR cvs co package
cd [CLHEP/]package
bootstrap
./bootstrap
Now continue with directions as if you unpacked a source code tarball.
......
......@@ -9,7 +9,7 @@
# ----------------------------------------------------------------------
AC_PREREQ(2.57)
AC_INIT(CLHEP Evaluator, 2.0.0.0, CLHEP@cern.ch, Evaluator)
AC_INIT(CLHEP Evaluator, 2.0.0.1, CLHEP@cern.ch, Evaluator)
AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_TARGET
AC_CONFIG_SRCDIR([src/Evaluator.cc])
......
# $Id: link_Exceptions.mk,v 1.2 2004/04/27 17:08:42 garren Exp $
# $Id: link_Exceptions.mk,v 1.3 2004/04/29 02:47:30 garren Exp $
#
# Makefile fragment for PackageList linking system
#
......
......@@ -19,6 +19,34 @@ 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
#-------------------------------------------------------------
......@@ -29,7 +57,7 @@ See building autotools below.
cvs co CLHEP/package OR cvs co package
cd [CLHEP/]package
bootstrap
./bootstrap
Now continue with directions as if you unpacked a source code tarball.
......
......@@ -9,7 +9,7 @@
# ----------------------------------------------------------------------
AC_PREREQ(2.57)
AC_INIT(CLHEP Exceptions, 2.0.0.0, CLHEP@cern.ch, Exceptions)
AC_INIT(CLHEP Exceptions, 2.0.0.1, CLHEP@cern.ch, Exceptions)
AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_TARGET
AC_CONFIG_SRCDIR([src/ZMerrno.cc])
......
# Applicable to each test program:
INCLUDES = -I../
# libraries to link, and whence
LDADD = $(top_builddir)/src/libCLHEP-@PACKAGE@-@VERSION@.la \
${top_builddir}/../Cast/src/libCLHEP-Cast-@VERSION@.la \
LDADD = $(top_builddir)/src/libCLHEP-@PACKAGE@-@VERSION@.la \
${top_builddir}/../Cast/src/libCLHEP-Cast-@VERSION@.la \
${top_builddir}/../RefCount/src/libCLHEP-RefCount-@VERSION@.la
# Identify executables needed during testing:
......
// -*- C++ -*-
// $Id: PuncturedSmearedExp.hh,v 1.1 2004/02/05 15:35:25 boudreau Exp $
// $Id: PuncturedSmearedExp.hh,v 1.2 2004/04/29 02:47:30 garren Exp $
// ------------------------------------------------------------------------------//
// This function-object makes an exponential with acceptance holes ("punctures") //
// smeared by a resolution function. //
......
......@@ -19,6 +19,34 @@ 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
#-------------------------------------------------------------
......@@ -29,7 +57,7 @@ See building autotools below.
cvs co CLHEP/package OR cvs co package
cd [CLHEP/]package
bootstrap
./bootstrap
Now continue with directions as if you unpacked a source code tarball.
......
......@@ -9,7 +9,7 @@
# ----------------------------------------------------------------------
AC_PREREQ(2.57)
AC_INIT(CLHEP GenericFunctions, 2.0.0.0, CLHEP@cern.ch, GenericFunctions)
AC_INIT(CLHEP GenericFunctions, 2.0.0.1, CLHEP@cern.ch, GenericFunctions)
AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_TARGET
AC_CONFIG_SRCDIR([src/Abs.cc])
......@@ -190,12 +190,12 @@ esac
# Check for needed header files:
# ----------------------------------------------------------------------
AC_CHECK_HEADERS([sstream])
# ----------------------------------------------------------------------
# Check for needed typedefs, structures, and compiler characteristics:
# ----------------------------------------------------------------------
# ----------------------------------------------------------------------
# Check for needed library functions:
# ----------------------------------------------------------------------
......
// -*- C++ -*-
// $Id: PuncturedSmearedExp.cc,v 1.2 2004/04/20 15:03:52 pfeiffer Exp $
// $Id: PuncturedSmearedExp.cc,v 1.3 2004/04/29 02:47:30 garren Exp $
#include "CLHEP/GenericFunctions/PuncturedSmearedExp.hh"
#include <sstream>
#include <cmath>
......
// -*- C++ -*-
// $Id: Sqrt.cc,v 1.5 2004/04/20 15:03:52 pfeiffer Exp $
// $Id: Sqrt.cc,v 1.6 2004/04/29 02:47:30 garren Exp $
#include "CLHEP/GenericFunctions/Sqrt.hh"
#include <assert.h>
#include <cmath>
#include <cmath> // for sqrt
namespace Genfun {
FUNCTION_OBJECT_IMP(Sqrt)
......
......@@ -19,6 +19,34 @@ 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
#-------------------------------------------------------------
......@@ -29,7 +57,7 @@ See building autotools below.
cvs co CLHEP/package OR cvs co package
cd [CLHEP/]package
bootstrap
./bootstrap
Now continue with directions as if you unpacked a source code tarball.
......
......@@ -9,7 +9,7 @@
# ----------------------------------------------------------------------
AC_PREREQ(2.57)
AC_INIT(CLHEP Geometry, 2.0.0.0, CLHEP@cern.ch, Geometry)
AC_INIT(CLHEP Geometry, 2.0.0.1, CLHEP@cern.ch, Geometry)
AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_TARGET
AC_CONFIG_SRCDIR([src/Plane3D.cc])
......
......@@ -19,6 +19,34 @@ 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
#-------------------------------------------------------------
......@@ -29,7 +57,7 @@ See building autotools below.
cvs co CLHEP/package OR cvs co package
cd [CLHEP/]package
bootstrap
./bootstrap
Now continue with directions as if you unpacked a source code tarball.
......
......@@ -9,7 +9,7 @@
# ----------------------------------------------------------------------
AC_PREREQ(2.57)
AC_INIT(CLHEP HepMC, 2.0.0.0, CLHEP@cern.ch, HepMC)
AC_INIT(CLHEP HepMC, 2.0.0.1, CLHEP@cern.ch, HepMC)
AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_TARGET
AC_CONFIG_SRCDIR([src/DummyDecayModel.cc])
......
......@@ -32,7 +32,7 @@ endif
HepMCinc = $(INCDIR)/CLHEP/HepMC
PythiaLIB = $(LULIB)/pydata.o $(LULIB)/liblund.a $(LULIB)/libpydum.a
HerwigLIB = $(HERWIG_DIR)/lib/timel.o $(HERWIG_DIR)/lib/libherwig.a $(HERWIG_DIR)/lib/libherdum.a
LIBNAME = $(CLHEP_DIR)/lib/libCLHEP-2.0.0.0.a
LIBNAME = $(CLHEP_DIR)/lib/libCLHEP-2.0.0.1.a
################################################################################
......
#ifndef PARTICLENAME_HH
#define PARTICLENAME_HH
// $Id: ParticleName.hh,v 1.1 2004/04/14 23:56:27 garren Exp $
// $Id: ParticleName.hh,v 1.2 2004/04/29 02:47:31 garren Exp $
// ----------------------------------------------------------------------
//
// ParticleName.hh
......
// $Id: ParticleTranslation.hh,v 1.1 2004/04/14 23:56:27 garren Exp $
// $Id: ParticleTranslation.hh,v 1.2 2004/04/29 02:47:31 garren Exp $
// ----------------------------------------------------------------------
//
// ParticleTranslation.hh
......
// $Id: ParticleTranslation.icc,v 1.1 2004/04/14 23:56:27 garren Exp $
// $Id: ParticleTranslation.icc,v 1.2 2004/04/29 02:47:31 garren Exp $
// ----------------------------------------------------------------------
//
// ParticleTranslation.icc
......
#ifndef TRANSLATIONLIST_HH
#define TRANSLATIONLIST_HH
// $Id: TranslationList.hh,v 1.1 2004/04/14 23:56:27 garren Exp $
// $Id: TranslationList.hh,v 1.2 2004/04/29 02:47:31 garren Exp $
// ----------------------------------------------------------------------
//
// TranslationList.hh
......
......@@ -19,6 +19,34 @@ 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
#-------------------------------------------------------------
......@@ -29,7 +57,7 @@ See building autotools below.
cvs co CLHEP/package OR cvs co package
cd [CLHEP/]package
bootstrap
./bootstrap
Now continue with directions as if you unpacked a source code tarball.
......
......@@ -9,7 +9,7 @@
# ----------------------------------------------------------------------
AC_PREREQ(2.57)
AC_INIT(CLHEP HepPDT, 2.0.0.0, CLHEP@cern.ch, HepPDT)
AC_INIT(CLHEP HepPDT, 2.0.0.1, CLHEP@cern.ch, HepPDT)
AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_TARGET
AC_CONFIG_SRCDIR([src/Constituent.cc])
......
#
# $Id: GNUmakefile,v 1.3 2004/04/14 23:56:27 garren Exp $
# $Id: GNUmakefile,v 1.4 2004/04/29 02:47:31 garren Exp $
#
# makefile for HepPDT examples
#
......@@ -25,7 +25,7 @@ ifndef CXX
endif
ifndef PDTLIB
PDTLIB = $(CLHEP_DIR)/lib/libCLHEP-HepPDT-2.0.0.0.a
PDTLIB = $(CLHEP_DIR)/lib/libCLHEP-HepPDT-2.0.0.1.a
endif
ifndef INCDIR
......@@ -48,10 +48,6 @@ AR=ar
ARFLG = -urs
CXXFLAGS = $(DFLG) $(INCDIR)
ifeq "$(CXX)" "KCC"
CXXFLAGS += +K0 -O0 --no_implicit_include --one_per
PDTLIB = $(CLHEP_DIR)/lib/libCLHEP-KCC.1.7.0.0.a
endif
SOURCE = $(wildcard *.cc)
......
// $Id: examListHerwig.cc,v 1.1 2004/04/14 23:56:27 garren Exp $
// $Id: examListHerwig.cc,v 1.2 2004/04/29 02:47:31 garren Exp $
// -------------------------------------------------------------------
//
// List the herwig translation
......
// $Id: examListIsajet.cc,v 1.1 2004/04/14 23:56:27 garren Exp $
// $Id: examListIsajet.cc,v 1.2 2004/04/29 02:47:31 garren Exp $
// -------------------------------------------------------------------
//
// List the isajet translation
......
// $Id: ParticleName.cc,v 1.1 2004/04/14 23:56:28 garren Exp $
// $Id: ParticleName.cc,v 1.2 2004/04/29 02:47:31 garren Exp $
// ----------------------------------------------------------------------
//
// ParticleName.cc
......
// $Id: getPDGpid.cc,v 1.1 2004/04/14 23:56:28 garren Exp $
// $Id: getPDGpid.cc,v 1.2 2004/04/29 02:47:31 garren Exp $
// ----------------------------------------------------------------------
//
// getPDGpid.cc
......
// $Id: getPythiaid.cc,v 1.1 2004/04/14 23:56:28 garren Exp $
// $Id: getPythiaid.cc,v 1.2 2004/04/29 02:47:31 garren Exp $
// ----------------------------------------------------------------------
//
// getPythiaid.cc
......
// $Id: listPDGTranslation.cc,v 1.1 2004/04/14 23:56:28 garren Exp $
// $Id: listPDGTranslation.cc,v 1.2 2004/04/29 02:47:31 garren Exp $
// ----------------------------------------------------------------------
//
// listPDGTranslation.cc
......
// $Id: listPythiaTranslation.cc,v 1.1 2004/04/14 23:56:28 garren Exp $
// $Id: listPythiaTranslation.cc,v 1.2 2004/04/29 02:47:31 garren Exp $
// ----------------------------------------------------------------------
//
// listPythiaTranslation.cc
......
// $Id: listPDGNames.cc.in,v 1.1 2004/04/14 23:56:28 garren Exp $
// $Id: listPDGNames.cc.in,v 1.2 2004/04/29 02:47:31 garren Exp $
// ----------------------------------------------------------------------
// listPDGNames.cc
//
......
// $Id: listParticleNames.cc,v 1.1 2004/04/14 23:56:28 garren Exp $
// $Id: listParticleNames.cc,v 1.2 2004/04/29 02:47:31 garren Exp $
// ----------------------------------------------------------------------
// listParticleNames.cc
//
......
// $Id: listPythiaNames.cc.in,v 1.1 2004/04/14 23:56:28 garren Exp $
// $Id: listPythiaNames.cc.in,v 1.2 2004/04/29 02:47:31 garren Exp $
// ----------------------------------------------------------------------
// listPythiaNames.cc
//
......
;
; $Id: listQQ.dec,v 1.1 2004/04/14 23:56:28 garren Exp $
; $Id: listQQ.dec,v 1.2 2004/04/29 02:47:31 garren Exp $
;
; $Log: listQQ.dec,v $
; Revision 1.2 2004/04/29 02:47:31 garren
; merging changes from 1.9 and 2.0 into the HEAD
;
; Revision 1.1.2.1 2004/04/21 16:14:52 garren
; merge in changes and translation bug fix from HEAD
;
; Revision 1.1 2004/04/14 23:56:28 garren
; fix bugs in translation
; add translation tests
......
// $Id: listQQTranslation.cc.in,v 1.1 2004/04/14 23:56:28 garren Exp $
// $Id: listQQTranslation.cc.in,v 1.2 2004/04/29 02:47:31 garren Exp $
// ----------------------------------------------------------------------
// listQQTranslation.cc
//
......
......@@ -3,5 +3,6 @@
./testHepPDT@EXEEXT@ < testHepPDT.input
diff -b -q testHepPDT.out @srcdir@/testHepPDT.output > /dev/null
sed 's/e-0\([0-9][0-9]\)/e-\1/g ; s/e+0\([0-9][0-9]\)/e+\1/g' testHepPDT.out | \
diff -b -q - @srcdir@/testHepPDT.output > /dev/null
</