Commit fe39d2ff authored by Lynn Garren's avatar Lynn Garren

merge in changes from CLHEP_2_000_branch

set release to 2.1.0.0
add Fields to SUBDIRS list
parent 00a4e838
......@@ -9,7 +9,7 @@
# ----------------------------------------------------------------------
AC_PREREQ(2.57)
AC_INIT(CLHEP Cast, 2.0.0.1, CLHEP@cern.ch, Cast)
AC_INIT(CLHEP Cast, 2.1.0.0, CLHEP@cern.ch, Cast)
AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_TARGET
AC_CONFIG_SRCDIR([src/itos.cc])
......
Tue May 11 2004 Lynn Garren <garren@fnal.gov>
* tagged for CLHEP 1.9.0.2 (CLHEP_1_9_0_2)
* tagged for CLHEP 2.0.0.2 (CLHEP_2_0_0_2)
* library version changed to 2.1.0.0
* build Fields
Tue May 11 2004 Lynn Garren <garren@fnal.gov>
* HepMC 1.25 changes merged with CLHEP/HepMC
* HepMC/HepMC/CBhepevt.icc: include stdio.h
* HepMC/HepMC/CBherwig.icc: include stdio.h
note that CLHEP/HepMC already had the most important change to use
std::iterator<std::forward_iterator_tag,GenParticle*,ptrdiff_t>
Tue May 11 2004 Mark Fischler <mf@fnal.gov>
* RandPoissonT.cc
......
......@@ -9,7 +9,7 @@
# ----------------------------------------------------------------------
AC_PREREQ(2.57)
AC_INIT(CLHEP Evaluator, 2.0.0.1, CLHEP@cern.ch, Evaluator)
AC_INIT(CLHEP Evaluator, 2.1.0.0, CLHEP@cern.ch, Evaluator)
AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_TARGET
AC_CONFIG_SRCDIR([src/Evaluator.cc])
......
......@@ -9,7 +9,7 @@
# ----------------------------------------------------------------------
AC_PREREQ(2.57)
AC_INIT(CLHEP Exceptions, 2.0.0.1, CLHEP@cern.ch, Exceptions)
AC_INIT(CLHEP Exceptions, 2.1.0.0, CLHEP@cern.ch, Exceptions)
AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_TARGET
AC_CONFIG_SRCDIR([src/ZMerrno.cc])
......
CLHEP-@PACKAGE@-@VERSION@ CLHEP-@PACKAGE@-@VERSION@
CLHEP-@PACKAGE@-@VERSION@ CLHEP-GenericFunctions-@VERSION@
CLHEP-@PACKAGE@-@VERSION@ CLHEP-Geometry-@VERSION@
CLHEP-@PACKAGE@-@VERSION@ CLHEP-Vector-@VERSION@
CLHEP-@PACKAGE@-@VERSION@ CLHEP-Units-@VERSION@
## Process this file with automake to produce Makefile.in
includedir = $(prefix)/include/CLHEP
tempincludedir = $(TEMPDIR)/CLHEP/@PACKAGE@
COPY_P = @COPY_P@
pkginclude_HEADERS = \
XF.h \
......@@ -8,3 +10,15 @@ pkginclude_HEADERS = \
# Identify generated file(s) to be removed when 'make clean' is requested:
CLEANFILES = defs.h
# copy headers into $(tempincludedir)
install-tmpHEADERS:
@echo " install headers in $(tempincludedir) "
@list='$(pkginclude_HEADERS)'; \
if test $(tempincludedir); then \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f="`echo $$p | sed -e 's|^.*/||'`"; \
./copy-header.pl $$d$$p $(tempincludedir)/$$f; \
done; \
fi; test -z "$$fail"
#!/usr/bin/env perl
#
# copy a header into the temporary CLHEP header tree if
# a) the header is not already there
# b) the source is newer
#
if ($#ARGV != 1) {
print "mungeit requires two arguments - exit\n";
exit;
} else {
$source_header=$ARGV[0];
$dest_header=$ARGV[1];
&check_header;
}
exit;
sub check_header {
# make sure source exists
if ( ! -e $source_header ) {
print "$source_header does not exist - exit\n";
exit;
}
# copy if not already there - otherwise, check the time stamp
if ( ! -e $dest_header ) {
$cmd = "cp -p ".$source_header." ".$dest_header;
print "$cmd\n";
system($cmd);
} else {
$source_header_time = -M $source_header;
$dest_header_time = -M $dest_header;
# copy only if source is newer
if( $source_header_time < $dest_header_time ) {
$cmd = "cp -p ".$source_header." ".$dest_header;
print "$cmd\n";
system($cmd);
}
}
}
......@@ -11,6 +11,11 @@ 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.)
To use Visual C++:
<source_code_direcotry>/configure --prefix=<install_dir> CXX=cl CC=cl
(You must specify both CXX and CL or configure will attempt to use
gcc/g++ for the unspecified variable. Also, do not use
environmental varialbles.)
make
(Build temporary copies of libraries and executables.)
make check
......@@ -19,6 +24,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 +62,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.
......
......@@ -4,48 +4,54 @@ includedir = $(prefix)/include/CLHEP
# put . first so that CLHEP directory is built before anything else
SUBDIRS = Fields . src test
# list all subdirectories - for distribution and cleaning
DIST_SUBDIRS = Fields . src test
all-local: $(top_builddir)/CLHEP
# create temporary CLHEP header tree
# we only copy headers for packages listed in @PACKAGE@-deps
# search for header directories in the following order:
# 1. $(top_srcdir)/..
# 2. $(CLHEPSOURCE_DIR)/CLHEP
# 3. $(CLHEP_DIR)/CLHEP
# 1. $(top_builddir)/this-package
# 2. $(top_builddir)/../other-packages
# 3. $(CLHEPSOURCE_DIR)/CLHEP
# 4. $(CLHEP_DIR)/include/CLHEP
#
# abs_ => absolute path
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
COPY_P = @COPY_P@
$(top_builddir)/CLHEP:
mkdir $(top_builddir)/CLHEP;
cd $(abs_top_builddir); list=`ls $(abs_top_srcdir)/..`; \
$(top_builddir)/CLHEP: temp-package-dirs
@list="`cat @PACKAGE@-deps | sed s/CLHEP-@PACKAGE@-@VERSION@// | sed s/CLHEP-// | sed s/-@VERSION@//`"; \
for pkg in $$list; do \
if test -d $(abs_top_srcdir)/../"$$pkg"/"$$pkg"; then \
(cd $(abs_top_builddir)/CLHEP; mkdir $$pkg; cd $$pkg; \
hdrs=`ls $(abs_top_srcdir)/../$$pkg/$$pkg`; \
for hdr in $$hdrs; do $(LN_S) $(abs_top_srcdir)/../$$pkg/$$pkg/$$hdr $$hdr; done; \
if test -f $(abs_top_builddir)/../"$$pkg"/"$$pkg"/defs.h; then $(LN_S) $(abs_top_builddir)/../$$pkg/$$pkg/defs.h defs.h; fi; \
if test -f $(abs_top_builddir)/"$$pkg"/defs.h && test ! -e defs.h ; then $(LN_S) $(abs_top_builddir)/$$pkg/defs.h defs.h; fi); \
fi; done
cd $(abs_top_builddir); \
if test -n "$(CLHEPSOURCE_DIR)" && test -d $(CLHEPSOURCE_DIR)/CLHEP; then \
(list=`ls $(CLHEPSOURCE_DIR)/CLHEP`; \
for pkg in $$list; do cd $(abs_top_builddir)/CLHEP; \
if test -d $(CLHEPSOURCE_DIR)/CLHEP/"$$pkg"/"$$pkg" && test ! -d "$$pkg"; then \
(mkdir $$pkg; cd $$pkg; \
hdrs=`ls $(CLHEPSOURCE_DIR)/CLHEP/$$pkg/$$pkg`; \
for hdr in $$hdrs; do $(LN_S) $(CLHEPSOURCE_DIR)/CLHEP/$$pkg/$$pkg/$$hdr $$hdr; done); \
fi; done); fi
cd $(abs_top_builddir); \
if test -n "$(CLHEP_DIR)" && test -d $(CLHEP_DIR)/CLHEP; then \
(list=`ls $(CLHEP_DIR)/CLHEP`; \
for pkg in $$list; do cd $(abs_top_builddir)/CLHEP; \
if test -d $(CLHEP_DIR)/CLHEP/"$$pkg"/"$$pkg" && test ! -d "$$pkg"; then \
(mkdir $$pkg; cd $$pkg; \
hdrs=`ls $(CLHEP_DIR)/CLHEP/$$pkg/$$pkg`; \
for hdr in $$hdrs; do $(LN_S) $(CLHEP_DIR)/CLHEP/$$pkg/$$pkg/$$hdr $$hdr; done); \
fi; done); fi
if test -d "$$pkg" ; then \
(cd $$pkg && $(MAKE) $(AM_MAKEFLAGS) TEMPDIR=$(abs_top_builddir) install-tmpHEADERS) || exit 1 ; \
else \
if test -d ../"$$pkg"/"$$pkg" ; then \
(cd ../$$pkg/$$pkg && $(MAKE) $(AM_MAKEFLAGS) TEMPDIR=$(abs_top_builddir) install-tmpHEADERS) || exit 1 ; \
else \
if test -d $(CLHEPSOURCE_DIR)/CLHEP/"$$pkg"/"$$pkg"; then \
hdrs=`ls $(CLHEPSOURCE_DIR)/CLHEP/$$pkg/$$pkg`; \
for hdr in $$hdrs; do $(COPY_P) $(CLHEPSOURCE_DIR)/CLHEP/$$pkg/$$pkg/$$hdr $(abs_top_builddir)/CLHEP/$$pkg/$$hdr; done; \
else \
if test -n "$(CLHEP_DIR)" && test -d $(CLHEP_DIR)/include/CLHEP; then \
if test -d $(CLHEP_DIR)/include/CLHEP/"$$pkg"; then \
hdrs=`ls $(CLHEP_DIR)/include/CLHEP/$$pkg`; \
for hdr in $$hdrs; do $(COPY_P) $(CLHEP_DIR)/include/CLHEP/$$pkg/$$hdr $(abs_top_builddir)/CLHEP/$$pkg/$$hdr; done; \
fi; \
fi; \
fi; \
fi; \
fi; \
done;
temp-package-dirs:
$(mkinstalldirs) $(abs_top_builddir)/CLHEP;
@list="`cat @PACKAGE@-deps | sed s/CLHEP-@PACKAGE@-@VERSION@// | sed s/CLHEP-// | sed s/-@VERSION@//`"; \
for pkg in $$list; do \
$(mkinstalldirs) $(abs_top_builddir)/CLHEP/$$pkg; \
done;
docs:
cd doc; $(MAKE) $(AM_MAKEFLAGS)
......
......@@ -9,7 +9,7 @@
# ----------------------------------------------------------------------
AC_PREREQ(2.57)
AC_INIT(CLHEP Fields, 2.0.0.0, CLHEP@cern.ch, Fields)
AC_INIT(CLHEP Fields, 2.1.0.0, CLHEP@cern.ch, Fields)
AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_TARGET
AC_CONFIG_SRCDIR([src/XF.cc])
......@@ -32,6 +32,7 @@ AC_CONFIG_FILES([Fields/Makefile])
AC_CONFIG_FILES([src/Makefile])
AC_CONFIG_FILES([test/Makefile])
AC_CONFIG_FILES([Fields-deps])
AC_CONFIG_FILES([Fields/copy-header.pl], [chmod +x Fields/copy-header.pl])
# Test driver program/script:
AC_CONFIG_FILES([test/testXF.sh], [chmod +x test/testXF.sh])
......@@ -100,7 +101,7 @@ AH_BOTTOM([#endif // FIELDS_DEFS_H])
# ----------------------------------------------------------------------
# Locate a C++ compiler:
AC_PROG_CXX(g++ c++ aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC gpp)
AC_PROG_CXX(cl g++ c++ aCC CC cxx cc++ FCC KCC RCC xlC_r xlC gpp)
# Use it hereinafter:
AC_LANG(C++)
......@@ -112,64 +113,64 @@ AC_REQUIRE_CPP
case "$target" in
*-*-win32*)
case "$CXX" in
cl) CXXFLAGS="-DWIN32 -O -GX -GR -MD";;
g++) CXXFLAGS="-O";;
c++) CXXFLAGS="-O";;
cl) CXXFLAGS="-DWIN32 -O -GX -GR -MD";COPY_P="copy -p";;
g++) CXXFLAGS="-O";COPY_P="copy -p";;
c++) CXXFLAGS="-O";COPY_P="copy -p";;
*) echo UNEXPECTED CHOICE OF C++ COMPILER: $CXX
esac;;
*-*-cygwin*)
case "$CXX" in
cl) CXXFLAGS="-DWIN32 -O -GX -GR -MD";;
g++) CXXFLAGS="-O -ansi -pedantic -Wall";;
c++) CXXFLAGS="-O -ansi -pedantic -Wall";;
cl) CXXFLAGS="-DWIN32 -O -GX -GR -MD";COPY_P="cp -p";;
g++) CXXFLAGS="-O -ansi -pedantic -Wall";COPY_P="cp -p";;
c++) CXXFLAGS="-O -ansi -pedantic -Wall";COPY_P="cp -p";;
*) echo UNEXPECTED CHOICE OF C++ COMPILER: $CXX
esac;;
*-*-solaris*)
case "$CXX" in
CC) CXXFLAGS="-O -mt";;
g++) CXXFLAGS="-O -ansi -pedantic -Wall";;
c++) CXXFLAGS="-O -ansi -pedantic -Wall";;
CC) CXXFLAGS="-O -mt";COPY_P="cp -p";;
g++) CXXFLAGS="-O -ansi -pedantic -Wall";COPY_P="cp -p";;
c++) CXXFLAGS="-O -ansi -pedantic -Wall";COPY_P="cp -p";;
*) echo UNEXPECTED CHOICE OF C++ COMPILER: $CXX
esac;;
*-*-linux*)
case "$CXX" in
g++) CXXFLAGS="-O -ansi -pedantic -Wall -D_GNU_SOURCE";;
c++) CXXFLAGS="-O -ansi -pedantic -Wall -D_GNU_SOURCE";;
g++) CXXFLAGS="-O -ansi -pedantic -Wall -D_GNU_SOURCE";COPY_P="cp -p";;
c++) CXXFLAGS="-O -ansi -pedantic -Wall -D_GNU_SOURCE";COPY_P="cp -p";;
*) echo UNEXPECTED CHOICE OF C++ COMPILER: $CXX
esac;;
alpha*-dec-osf*)
case "$CXX" in
cxx) CXXFLAGS="-O -std strict_ansi -timplicit_local";;
g++) CXXFLAGS="-O -ansi -pedantic -Wall";;
c++) CXXFLAGS="-O -ansi -pedantic -Wall";;
cxx) CXXFLAGS="-O -std strict_ansi -timplicit_local";COPY_P="cp -p";;
g++) CXXFLAGS="-O -ansi -pedantic -Wall";COPY_P="cp -p";;
c++) CXXFLAGS="-O -ansi -pedantic -Wall";COPY_P="cp -p";;
*) echo UNEXPECTED CHOICE OF C++ COMPILER: $CXX
esac;;
*-*-hpux*)
case "$CXX" in
aCC) CXXFLAGS="-O -Aa +DAportable +Onolimit";;
CC) CXXFLAGS="+O3 +DAportable +a1 -z -pta +Onolimit";;
g++) CXXFLAGS="-O -ansi -pedantic -Wall";;
c++) CXXFLAGS="-O -ansi -pedantic -Wall";;
aCC) CXXFLAGS="-O -Aa +DAportable +Onolimit";COPY_P="cp -p";;
CC) CXXFLAGS="+O3 +DAportable +a1 -z -pta +Onolimit";COPY_P="cp -p";;
g++) CXXFLAGS="-O -ansi -pedantic -Wall";COPY_P="cp -p";;
c++) CXXFLAGS="-O -ansi -pedantic -Wall";COPY_P="cp -p";;
*) echo UNEXPECTED CHOICE OF C++ COMPILER: $CXX
esac;;
*-*-aix*)
case "$CXX" in
xlC) CXXFLAGS="-O3 -qtwolink -+";;
g++) CXXFLAGS="-O -ansi -pedantic -Wall";;
c++) CXXFLAGS="-O -ansi -pedantic -Wall";;
xlC) CXXFLAGS="-O3 -qtwolink -+";COPY_P="cp -p";;
g++) CXXFLAGS="-O -ansi -pedantic -Wall";COPY_P="cp -p";;
c++) CXXFLAGS="-O -ansi -pedantic -Wall";COPY_P="cp -p";;
*) echo UNEXPECTED CHOICE OF C++ COMPILER: $CXX
esac;;
*-*-irix*)
case "$CXX" in
CC) CXXFLAGS="-O -OPT:Olimit=0 -pta";;
g++) CXXFLAGS="-O -ansi -pedantic -Wall";;
c++) CXXFLAGS="-O -ansi -pedantic -Wall";;
CC) CXXFLAGS="-O -OPT:Olimit=0 -pta";COPY_P="cp -p";;
g++) CXXFLAGS="-O -ansi -pedantic -Wall";COPY_P="cp -p";;
c++) CXXFLAGS="-O -ansi -pedantic -Wall";COPY_P="cp -p";;
*) echo UNEXPECTED CHOICE OF C++ COMPILER: $CXX
esac;;
powerpc-apple-darwin*)
case "$CXX" in
g++) CXXFLAGS="-O -ansi -pedantic -Wall";;
c++) CXXFLAGS="-O -ansi -pedantic -Wall";;
g++) CXXFLAGS="-O -ansi -pedantic -Wall";COPY_P="cp -p";;
c++) CXXFLAGS="-O -ansi -pedantic -Wall";COPY_P="cp -p";;
*) echo UNEXPECTED CHOICE OF C++ COMPILER: $CXX
esac;;
esac
......
......@@ -9,7 +9,7 @@
# ----------------------------------------------------------------------
AC_PREREQ(2.57)
AC_INIT(CLHEP GenericFunctions, 2.0.0.1, CLHEP@cern.ch, GenericFunctions)
AC_INIT(CLHEP GenericFunctions, 2.1.0.0, CLHEP@cern.ch, GenericFunctions)
AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_TARGET
AC_CONFIG_SRCDIR([src/Abs.cc])
......
......@@ -9,7 +9,7 @@
# ----------------------------------------------------------------------
AC_PREREQ(2.57)
AC_INIT(CLHEP Geometry, 2.0.0.1, CLHEP@cern.ch, Geometry)
AC_INIT(CLHEP Geometry, 2.1.0.0, CLHEP@cern.ch, Geometry)
AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_TARGET
AC_CONFIG_SRCDIR([src/Plane3D.cc])
......
// $Id: CBhepevt.icc,v 1.3 2003/10/10 15:56:34 garren Exp $
// $Id: CBhepevt.icc,v 1.4 2004/05/12 05:19:35 garren Exp $
// ----------------------------------------------------------------------
// CBhepevt.icc
// ----------------------------------------------------------------------
// Author: Lynn Garren, Marc Paterno,
//
#include <stdio.h> // needed for formatted output using sprintf
namespace HepMC {
......
// $Id: CBherwig.icc,v 1.1 2003/10/10 15:56:34 garren Exp $
// $Id: CBherwig.icc,v 1.2 2004/05/12 05:19:35 garren Exp $
// ----------------------------------------------------------------------
// CBherwig.icc
// ----------------------------------------------------------------------
// Author: Lynn Garren, Marc Paterno,
//
#include <stdio.h> // needed for formatted output using sprintf
namespace HepMC {
CBherwig::CBherwig()
......
......@@ -376,7 +376,7 @@ namespace HepMC {
private: // data members
int m_signal_process_id;
int m_event_number;
double m_event_scale;// GeV, see hep-ph/0109068
double m_event_scale;// energy scale, see hep-ph/0109068
double m_alphaQCD; // QCD coupling, see hep-ph/0109068
double m_alphaQED; // QED coupling, see hep-ph/0109068
GenVertex* m_signal_process_vertex;
......
......@@ -64,6 +64,7 @@ namespace HepMC {
typedef HepMCConfig::ParticleData ParticleData;
typedef HepMCConfig::DecayData DecayData;
GenParticle(void);
GenParticle( const CLHEP::HepLorentzVector& momentum, int pdg_id,
int status = 0, const Flow& itsflow = Flow(),
const Polarization& polar = Polarization(0,0) );
......@@ -189,7 +190,7 @@ namespace HepMC {
void set_barcode_( int the_bar_code ); // for use by GenEvent only
private:
CLHEP::HepLorentzVector m_momentum; // 4 vector in GeV
CLHEP::HepLorentzVector m_momentum; // 4 vector
int m_pdg_id; // id according to PDG convention
int m_status; // As defined for HEPEVT
Flow m_flow;
......@@ -197,7 +198,7 @@ namespace HepMC {
GenVertex* m_production_vertex; // null if vacuum or beam
GenVertex* m_end_vertex; // null if not-decayed
int m_barcode; // unique identifier in the event
double itsGeneratedMass; // (in GeV/c**2)
double itsGeneratedMass; //
int itsCollisionNumber; // for StdHep
ParticleData * itsParticleData; // should be null only if no
// particle data is desired
......
......@@ -9,7 +9,7 @@
# ----------------------------------------------------------------------
AC_PREREQ(2.57)
AC_INIT(CLHEP HepMC, 2.0.0.1, CLHEP@cern.ch, HepMC)
AC_INIT(CLHEP HepMC, 2.1.0.0, CLHEP@cern.ch, HepMC)
AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_TARGET
AC_CONFIG_SRCDIR([src/DummyDecayModel.cc])
......
-------------------- CLHEP 1.9.0.2/2.0.0.2 ------------------
2004-05-11 Lynn Garren <garren@fnal.gov>
integrating changes from HepMC 1.25 into CLHEP/HepMC
note that CLHEP/HepMC was already using
std::iterator<std::forward_iterator_tag,GenParticle*,ptrdiff_t>
#ifdefs used to retain compatibility with gcc 2.95.2
(gcc 2.95.2 compatibility only guaranteed for 1.9.x)
-------------------- HepMC 1.25 -------------
2004-03-27 Matt Dobbs <Matt.Dobbs@Cern.CH>
Removed the #define statements that allow backwards compatibility
with gcc 2.95, and specialized the 3.2 compliant iterators to be
forward iterators such that they work properly with std
algorithms.
Thanks to Ulrik Egede for pointing this out.
* HepMC/GenVertex.h, .cxx HepMC/GenEvent.h, .cxx: changed
std::forward_iterator<GenParticle*,ptrdiff_t>
to
std::iterator<std::forward_iterator_tag,GenParticle*,ptrdiff_t>
for standard
compliance, and removed #define statements.
* HepMC/IO_Ascii.h,.cxx: changed open_mode to openmode for standard
compliance, and removed #define statements.
2003-12-17 David Rousseau <droussea@lxplus072.cern.ch>
* cmt/requirements: remove HepMC_libraries
2003-10-22 Matt Dobbs <Matt.Dobbs@Cern.CH>
* src/GenEvent.cxx and lots of other files + latex documentation.
REmoved any mention of units--- GeV, MeV etc, since HepMC merely
accepts whatever is put in. I do this because, though HEPEVT has
used GeV/mm, ATLAS plans to use CLHEP units of MeV/mm.
2003-10-15 Matt Dobbs <Matt.Dobbs@Cern.CH>
* src/GenParticle.cxx (HepMC): added a default constructor for
GenParticle as requested by Giorgos S.
-------------------- CLHEP_1_900 --------------------
......
......@@ -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.1.a
LIBNAME = $(CLHEP_DIR)/lib/libCLHEP-2.1.0.0.a
################################################################################
......
......@@ -133,7 +133,7 @@ namespace HepMC {
wgt != weights().end(); wgt++ ) { ostr << *wgt << " "; }
ostr << "\n";
ostr << " EventScale " << event_scale()
<< " GeV \t alphaQCD=" << alphaQCD()
<< " [energy] \t alphaQCD=" << alphaQCD()
<< "\t alphaQED=" << alphaQED() << std::endl;
// print a legend to describe the particle info
char particle_legend[80];
......
......@@ -11,6 +11,18 @@
namespace HepMC {
GenParticle::GenParticle( void ) :
m_momentum(0), m_pdg_id(0), m_status(0), m_flow(this),
m_polarization(0), m_production_vertex(0), m_end_vertex(0),
m_barcode(0),
itsGeneratedMass( 0 ),
itsCollisionNumber(0),
itsParticleData( NULL ),
itsDecayData( NULL )
{
s_counter++;
}
GenParticle::GenParticle( const CLHEP::HepLorentzVector& momentum,
int pdg_id, int status,
const Flow& itsflow,
......@@ -208,7 +220,7 @@ namespace HepMC {
part.momentum().px(),part.momentum().py(),
part.momentum().pz(),part.momentum().e(),
part.status(),
part.end_vertex() );
(void*)part.end_vertex() );
}
return ostr << outline;
}
......
......@@ -145,14 +145,14 @@ namespace HepMC {
if ( position() != CLHEP::HepLorentzVector(0,0,0,0) ) {
sprintf( outline,
"Vertex:%9p ID:%5d (X,cT)=%+9.2e,%+9.2e,%+9.2e,%+9.2e"
,this, id(),
,(void*)this, id(),
position().x(),
position().y(),
position().z(),
position().t() );
} else {
sprintf( outline, "GenVertex:%9p ID:%5d (X,cT):0",
this, id() );
(void*)this, id() );
}
}
......
......@@ -9,7 +9,7 @@
# ----------------------------------------------------------------------
AC_PREREQ(2.57)
AC_INIT(CLHEP HepPDT, 2.0.0.1, CLHEP@cern.ch, HepPDT)
AC_INIT(CLHEP HepPDT, 2.1.0.0, CLHEP@cern.ch, HepPDT)
AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_TARGET
AC_CONFIG_SRCDIR([src/Constituent.cc])
......
#
# $Id: GNUmakefile,v 1.4 2004/04/29 02:47:31 garren Exp $
# $Id: GNUmakefile,v 1.5 2004/05/12 05:19:36 garren Exp $
#
# makefile for HepPDT examples
#
......@@ -25,7 +25,7 @@ ifndef CXX
endif
ifndef PDTLIB
PDTLIB = $(CLHEP_DIR)/lib/libCLHEP-HepPDT-2.0.0.1.a
PDTLIB = $(CLHEP_DIR)/lib/libCLHEP-HepPDT-2.1.0.0.a
endif
ifndef INCDIR
......
......@@ -3,7 +3,7 @@
includedir = $(prefix)/include/CLHEP
SUBDIRS = Units Vector Evaluator GenericFunctions Geometry \
Random Matrix RandomObjects HepPDT HepMC StdHep \
Random Matrix RandomObjects Fields HepPDT HepMC StdHep \
RefCount Cast Exceptions