Commit 01a7fa48 authored by Lynn Garren's avatar Lynn Garren

merged changes from 1.9

ready for 2.0.1.2
parent 80dec617
......@@ -10,6 +10,8 @@ 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 LIBS=-lsunmath.
#-------------------------------------------------------------
# installing from a source code tar ball
#-------------------------------------------------------------
......
......@@ -9,7 +9,7 @@
# ----------------------------------------------------------------------
AC_PREREQ(2.59)
AC_INIT(CLHEP Cast, 2.0.1.1, CLHEP@cern.ch, Cast)
AC_INIT(CLHEP Cast, 2.0.1.2, CLHEP@cern.ch, Cast)
AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_TARGET
AC_CONFIG_SRCDIR([src/itos.cc])
......
==============================
30.11.04 Release CLHEP-2.0.1.2
==============================
Tue Nov 30 2004 Andreas Pfeiffer <andreas.pfeiffer@cern.ch>
* Geometry/Plane3D.h: replaced wrong <float> by <T> in
Point3D<T> point(const Point3D<float> & p) const {
Mon Nov 29 2004 Mark Fischler <mf@fnal.gov>
* In LorentzVectorC.cc, in deltaR, fixed to use pp.deltaRPhi(w.getV())
Mon Nov 29 2004 Lynn Garren <garren@fnal.gov>
* Vector/src: add missing implemetations
Fri Nov 26 2004 Andreas Pfeiffer <andreas.pfeiffer@cern.ch>
* HepMC/doc/Makefile.in: add -o option to dvips, otherwise it
prints on some systems
==============================
27.10.04 Release CLHEP-2.0.1.1
==============================
......
==============================
30.11.04 Release CLHEP-2.0.1.2
==============================
==============================
27.10.04 Release CLHEP-2.0.1.1
==============================
......
......@@ -10,6 +10,8 @@ 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 LIBS=-lsunmath.
#-------------------------------------------------------------
# installing from a source code tar ball
#-------------------------------------------------------------
......
......@@ -9,7 +9,7 @@
# ----------------------------------------------------------------------
AC_PREREQ(2.59)
AC_INIT(CLHEP Evaluator, 2.0.1.1, CLHEP@cern.ch, Evaluator)
AC_INIT(CLHEP Evaluator, 2.0.1.2, CLHEP@cern.ch, Evaluator)
AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_TARGET
AC_CONFIG_SRCDIR([src/Evaluator.cc])
......
==============================
30.11.04 Release CLHEP-2.0.1.2
==============================
==============================
27.10.04 Release CLHEP-2.0.1.1
==============================
......
......@@ -10,6 +10,8 @@ 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 LIBS=-lsunmath.
#-------------------------------------------------------------
# installing from a source code tar ball
#-------------------------------------------------------------
......
......@@ -9,7 +9,7 @@
# ----------------------------------------------------------------------
AC_PREREQ(2.59)
AC_INIT(CLHEP Exceptions, 2.0.1.1, CLHEP@cern.ch, Exceptions)
AC_INIT(CLHEP Exceptions, 2.0.1.2, CLHEP@cern.ch, Exceptions)
AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_TARGET
AC_CONFIG_SRCDIR([src/ZMerrno.cc])
......
==============================
30.11.04 Release CLHEP-2.0.1.2
==============================
==============================
27.10.04 Release CLHEP-2.0.1.1
==============================
......
......@@ -10,6 +10,8 @@ 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 LIBS=-lsunmath.
#-------------------------------------------------------------
# installing from a source code tar ball
#-------------------------------------------------------------
......
......@@ -9,7 +9,7 @@
# ----------------------------------------------------------------------
AC_PREREQ(2.59)
AC_INIT(CLHEP GenericFunctions, 2.0.1.1, CLHEP@cern.ch, GenericFunctions)
AC_INIT(CLHEP GenericFunctions, 2.0.1.2, CLHEP@cern.ch, GenericFunctions)
AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_TARGET
AC_CONFIG_SRCDIR([src/Abs.cc])
......
==============================
30.11.04 Release CLHEP-2.0.1.2
==============================
Tue Nov 30 2004 Andreas Pfeiffer <andreas.pfeiffer@cern.ch>
* Geometry/Plane3D.h: replaced wrong <float> by <T> in
Point3D<T> point(const Point3D<float> & p) const {
==============================
27.10.04 Release CLHEP-2.0.1.1
==============================
......
// -*- C++ -*-
// $Id: BasicVector3D.h,v 1.3.4.2 2004/10/28 11:37:33 pfeiffer Exp $
// $Id: BasicVector3D.h,v 1.3.4.3 2004/11/30 20:08:38 garren Exp $
// ---------------------------------------------------------------------------
//
// This file is a part of the CLHEP - a Class Library for High Energy Physics.
......@@ -12,6 +12,7 @@
#ifndef BASIC_VECTOR3D_H
#define BASIC_VECTOR3D_H
#include <iosfwd>
#include "CLHEP/Geometry/defs.h"
namespace HepGeom {
......
// -*- C++ -*-
// $Id: Plane3D.h,v 1.3 2003/10/23 21:29:50 garren Exp $
// $Id: Plane3D.h,v 1.3.4.1 2004/11/30 20:08:38 garren Exp $
// ---------------------------------------------------------------------------
//
// This file is a part of the CLHEP - a Class Library for High Energy Physics.
......@@ -106,7 +106,7 @@ namespace HepGeom {
/**
* Returns projection of the point to the plane. */
Point3D<T> point(const Point3D<float> & p) const {
Point3D<T> point(const Point3D<T> & p) const {
T k = distance(p)/(a()*a()+b()*b()+c()*c());
return Point3D<T>(p.x()-a()*k, p.y()-b()*k, p.z()-c()*k);
}
......
......@@ -10,6 +10,8 @@ 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 LIBS=-lsunmath.
#-------------------------------------------------------------
# installing from a source code tar ball
#-------------------------------------------------------------
......
......@@ -9,7 +9,7 @@
# ----------------------------------------------------------------------
AC_PREREQ(2.59)
AC_INIT(CLHEP Geometry, 2.0.1.1, CLHEP@cern.ch, Geometry)
AC_INIT(CLHEP Geometry, 2.0.1.2, CLHEP@cern.ch, Geometry)
AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_TARGET
AC_CONFIG_SRCDIR([src/Plane3D.cc])
......
==============================
30.11.04 Release CLHEP-2.0.1.2
==============================
Fri Nov 26 2004 Andreas Pfeiffer <andreas.pfeiffer@cern.ch>
* add -o option to dvips, otherwise it prints on some systems
Wed Nov 3 2004 Lynn Garren <garren@fnal.gov>
* use HepGeom namespace instead of old names for Geometry classes
==============================
27.10.04 Release CLHEP-2.0.1.1
==============================
......
......@@ -10,6 +10,8 @@ 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 LIBS=-lsunmath.
#-------------------------------------------------------------
# installing from a source code tar ball
#-------------------------------------------------------------
......
......@@ -9,7 +9,7 @@
# ----------------------------------------------------------------------
AC_PREREQ(2.59)
AC_INIT(CLHEP HepMC, 2.0.1.1, CLHEP@cern.ch, HepMC)
AC_INIT(CLHEP HepMC, 2.0.1.2, CLHEP@cern.ch, HepMC)
AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_TARGET
AC_CONFIG_SRCDIR([src/DummyDecayModel.cc])
......
==============================
30.11.04 Release CLHEP-2.0.1.2
==============================
Fri Nov 26 2004 Andreas Pfeiffer <andreas.pfeiffer@cern.ch>
* add -o option to dvips, otherwise it prints on some systems
Wed Nov 3 2004 Lynn Garren <garren@fnal.gov>
* use HepGeom namespace instead of old names for Geometry classes
Fri Sep 24 2004 Lynn Garren <garren@fnal.gov>
* use AM_CXXFLAGS
Tue Sep 14 2004 Lynn Garren <garren@fnal.gov>
* require autoconf 2.59, automake 1.9.1, and libtool 1.9b
Tue Aug 31 2004 Lynn Garren <garren@fnal.gov>
* change Solaris CC compile flags from "-O -mt" to "-O"
* libtools 1.9b or later is required for Solaris CC
-------------------- CLHEP 1.9.0.2/2.0.0.2 ------------------
2004-05-11 Lynn Garren <garren@fnal.gov>
......
......@@ -25,7 +25,7 @@ $(DOC_POSTSCRIPT): $(DOC_SOURCE)
if test ! -f $$file; then \
(cp $(doc_srcdir)/$$file $(doc_builddir)/$$file); fi; done
$(TEX) $(DOC_SOURCE)
dvips HepMC_user_manual.dvi
dvips -o HepMC_user_manual.dvi
install-docs: $(DOC_POSTSCRIPT)
$(mkinstalldirs) $(DESTDIR)$(doc_installdir)
......
......@@ -31,8 +31,8 @@ endif
INCDIR = -I$(CLHEP_DIR)/include
HepMCinc = $(INCDIR)/CLHEP/HepMC
PythiaLIB = $(LULIB)/pydata.o $(LULIB)/liblund.a $(LULIB)/libpydum.a
HerwigLIB = $(HERWIG_DIR)/lib/libherwig.a $(HERWIG_DIR)/lib/libherdum.a
LIBNAME = $(CLHEP_DIR)/lib/libCLHEP-2.0.1.1.a
HerwigLIB = $(HERWIG_DIR)/lib/libherwig.a $(HERWIG_DIR)/lib/libherdum.a $(HERWIG_DIR)/lib/timel.o
LIBNAME = $(CLHEP_DIR)/lib/libCLHEP-2.0.1.2.a
################################################################################
......
echo ""
echo "Executing ---------> examplePythiaWriteHepMC.exe"
examplePythiaWriteHepMC.exe
echo ""
echo "Executing ---------> exampleReadHepMC.exe"
exampleReadHepMC.exe
echo ""
echo "Executing ---------> test_MakeUsingIteratorsInput.exe"
test_MakeUsingIteratorsInput.exe
......@@ -7,10 +15,6 @@ echo "Executing ---------> example_UsingIterators.exe"
echo " (relies on output from test_MakeUsingIteratorsInput.exe)"
example_UsingIterators.exe
echo ""
echo "Executing ---------> example_ReadPDGtable.exe"
example_ReadPDGtable.exe
echo ""
echo "Executing ---------> example_MyPythiaWithEventSelection.exe"
example_MyPythiaWithEventSelection.exe
......@@ -24,5 +28,5 @@ echo "Executing ---------> example_MyPythia.exe"
example_MyPythia.exe
echo ""
echo "Executing ---------> example_EventSelection.exe"
example_EventSelection.exe
echo "Executing ---------> example_MyHerwig.exe"
example_MyHerwig.exe
==============================
30.11.04 Release CLHEP-2.0.1.2
==============================
==============================
27.10.04 Release CLHEP-2.0.1.1
==============================
......
// $Id: ParticleDataTableT.icc,v 1.1.1.1.4.1 2004/07/23 23:09:29 garren Exp $
// $Id: ParticleDataTableT.icc,v 1.1.1.1.4.2 2004/11/30 20:08:39 garren Exp $
// ----------------------------------------------------------------------
//
// ParticleDataTableT.icc
......@@ -108,7 +108,7 @@ void ParticleDataTableT<Config>::writeParticleData( std::ostream & outstr )
outstr << " ( " << size() << " entries )" << std::endl;
outstr << "PARTICLE NAME ID CHARGE COLOR"
<< " SPIN: J S L"
<< " MASS"
<< " MASS"
<< " WIDTH"
<< " LIFETIME"
<< std::endl;
......
......@@ -10,6 +10,8 @@ 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 LIBS=-lsunmath.
#-------------------------------------------------------------
# installing from a source code tar ball
#-------------------------------------------------------------
......
......@@ -9,7 +9,7 @@
# ----------------------------------------------------------------------
AC_PREREQ(2.59)
AC_INIT(CLHEP HepPDT, 2.0.1.1, CLHEP@cern.ch, HepPDT)
AC_INIT(CLHEP HepPDT, 2.0.1.2, CLHEP@cern.ch, HepPDT)
AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_TARGET
AC_CONFIG_SRCDIR([src/Constituent.cc])
......
#
# $Id: GNUmakefile,v 1.2.2.6 2004/09/24 22:43:54 garren Exp $
# $Id: GNUmakefile,v 1.2.2.7 2004/11/30 20:08:39 garren Exp $
#
# makefile for HepPDT examples
#
......@@ -23,7 +23,7 @@ ifndef CXX
endif
ifndef PDTLIB
PDTLIB = $(CLHEP_DIR)/lib/libCLHEP-HepPDT-2.0.1.1.a
PDTLIB = $(CLHEP_DIR)/lib/libCLHEP-HepPDT-2.0.1.2.a
endif
ifndef INCDIR
......
// $Id: ParticleName.cc,v 1.1.2.1 2004/04/21 16:14:51 garren Exp $
// $Id: ParticleName.cc,v 1.1.2.2 2004/11/30 20:08:39 garren Exp $
// ----------------------------------------------------------------------
//
// ParticleName.cc
......@@ -38,9 +38,9 @@ ParticleNameMap const & ParticleNameInit()
static ParticleNameMap m;
static struct {
static const struct {
int pid;
char* pname;
const char* pname;
} SNames[] = {
{ 0, "" },
{ 1, "d" },
......
// $Id: listPythiaTranslation.cc,v 1.1.2.2 2004/05/19 22:59:10 garren Exp $
// $Id: listPythiaTranslation.cc,v 1.1.2.3 2004/11/30 20:08:39 garren Exp $
// ----------------------------------------------------------------------
//
// listPythiaTranslation.cc
......@@ -76,7 +76,7 @@ ParticleTranslation getPythiaAntiParticle( int & anti,
bool listPythiaTranslation ( std::istream & pdfile, std::ostream & os )
{
std::string pdline, aname;
int id, kf;
int kf;
int anti=0;
// read and parse each line
while( std::getline( pdfile, pdline) ) {
......
// $Id: write.cc,v 1.2 2003/08/13 20:00:11 garren Exp $
// $Id: write.cc,v 1.2.4.1 2004/11/30 20:08:39 garren Exp $
// ----------------------------------------------------------------------
//
// write.cc
......@@ -45,8 +45,8 @@ void CommonParticleData::write( std::ostream & ostr ) const
ostr << itsSpin.spin() ;
ostr.width(5);
ostr << itsSpin.orbAngMom() ;
ostr.width(12);
ostr.precision(4);
ostr.width(13);
ostr.precision(5);
ostr.setf(std::ios::scientific, std::ios::floatfield);
ostr << mass.value() << "+/-" << mass.sigma() ;
ostr.width(12);
......
This diff is collapsed.
......@@ -17,6 +17,8 @@ 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 LIBS=-lsunmath.
#-------------------------------------------------------------
# about linking
#-------------------------------------------------------------
......
==============================
30.11.04 Release CLHEP-2.0.1.2
==============================
==============================
27.10.04 Release CLHEP-2.0.1.1
==============================
......
......@@ -10,6 +10,8 @@ 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 LIBS=-lsunmath.
#-------------------------------------------------------------
# installing from a source code tar ball
#-------------------------------------------------------------
......
......@@ -9,7 +9,7 @@
# ----------------------------------------------------------------------
AC_PREREQ(2.59)
AC_INIT(CLHEP Matrix, 2.0.1.1, CLHEP@cern.ch, Matrix)
AC_INIT(CLHEP Matrix, 2.0.1.2, CLHEP@cern.ch, Matrix)
AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_TARGET
AC_CONFIG_SRCDIR([src/DiagMatrix.cc])
......
==============================
30.11.04 Release CLHEP-2.0.1.2
==============================
==============================
27.10.04 Release CLHEP-2.0.1.1
==============================
......
......@@ -10,6 +10,8 @@ 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 LIBS=-lsunmath.
#-------------------------------------------------------------
# installing from a source code tar ball
#-------------------------------------------------------------
......
......@@ -9,7 +9,7 @@
# ----------------------------------------------------------------------
AC_PREREQ(2.59)
AC_INIT(CLHEP Random, 2.0.1.1, CLHEP@cern.ch, Random)
AC_INIT(CLHEP Random, 2.0.1.2, CLHEP@cern.ch, Random)
AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_TARGET
AC_CONFIG_SRCDIR([src/DRand48Engine.cc])
......
// -*- C++ -*-
// $Id: testRandDists.cc,v 1.5 2003/08/13 20:00:12 garren Exp $
// $Id: testRandDists.cc,v 1.5.4.1 2004/11/30 20:08:39 garren Exp $
// ----------------------------------------------------------------------
// ----------------------------------------------------------------------
......@@ -27,6 +27,12 @@
// confusion with the gammln in RandPoisson.
// M. Fischler 2/04/99 Added validation for the Q and T versions of
// Poisson and Gauss
// M. Fischler 11/04/04 Add kludge to gaussianTest to deal with
// different behaviour under optimization on
// some compilers (gcc 2.95.2)
// This behaviour was only seen with stepwise
// RandGeneral and appears to be solely a
// function of the test program.
//
// ----------------------------------------------------------------------
......@@ -38,6 +44,7 @@
#include "CLHEP/Units/PhysicalConstants.h"
#include "CLHEP/Random/defs.h"
#include <iostream>
#include <iomanip>
#include <cmath> // double abs()
#include <stdlib.h> // int abs()
......@@ -202,6 +209,9 @@ bool gaussianTest ( HepRandom & dist, double mu,
for (int ifire = 0; ifire < nNumbers; ifire++) {
x = dist(); // We avoid fire() because that is not virtual
// in HepRandom.
if( x < mu - 12.0*sigma ) {
cout << "x = " << x << "\n";
}
if ( (ifire % ipr) == 0 ) {
cout << ifire << endl;
}
......@@ -376,7 +386,7 @@ double* createRefDist ( poisson pdist, int N,
c++;
// Fill all the other bins until one has less than 20 items.
double next;
double next = 0;
while ( c < MAXBINS ) {
for ( ic=0, binc=0; ic < clumping; ic++, r++ ) {
binc += pdist(r) * N;
......
==============================
30.11.04 Release CLHEP-2.0.1.2
==============================
==============================
27.10.04 Release CLHEP-2.0.1.1
==============================
......
......@@ -10,6 +10,8 @@ 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 LIBS=-lsunmath.
#-------------------------------------------------------------
# installing from a source code tar ball
#-------------------------------------------------------------
......
......@@ -9,7 +9,7 @@
# ----------------------------------------------------------------------
AC_PREREQ(2.59)
AC_INIT(CLHEP RandomObjects, 2.0.1.1, CLHEP@cern.ch, RandomObjects)
AC_INIT(CLHEP RandomObjects, 2.0.1.2, CLHEP@cern.ch, RandomObjects)
AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_TARGET
AC_CONFIG_SRCDIR([src/RandMultiGauss.cc])
......
......@@ -10,6 +10,8 @@ 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 LIBS=-lsunmath.
#-------------------------------------------------------------
# installing from a source code tar ball
#-------------------------------------------------------------
......
......@@ -9,7 +9,7 @@
# ----------------------------------------------------------------------
AC_PREREQ(2.59)
AC_INIT(CLHEP RefCount, 2.0.1.1, CLHEP@cern.ch, RefCount)
AC_INIT(CLHEP RefCount, 2.0.1.2, CLHEP@cern.ch, RefCount)
AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_TARGET
AC_CONFIG_SRCDIR([src/ZMuseCount.cc])
......
==============================
30.11.04 Release CLHEP-2.0.1.2
==============================
==============================
27.10.04 Release CLHEP-2.0.1.1
==============================
......
......@@ -10,6 +10,8 @@ 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 LIBS=-lsunmath.
#-------------------------------------------------------------
# installing from a source code tar ball
#-------------------------------------------------------------
......
......@@ -9,7 +9,7 @@
# ----------------------------------------------------------------------
AC_PREREQ(2.59)
AC_INIT(CLHEP StdHep, 2.0.1.1, CLHEP@cern.ch, StdHep)
AC_INIT(CLHEP StdHep, 2.0.1.2, CLHEP@cern.ch, StdHep)
AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_TARGET
AC_CONFIG_SRCDIR([src/collision.cc])
......
......@@ -8,7 +8,7 @@ ifndef CXX
endif
ifndef LIBNAME
LIBNAME = libCLHEP-2.0.1.1.a
LIBNAME = libCLHEP-2.0.1.2.a
endif