lcio/src/cpp/src/UTIL
diff -u -r1.3 -r1.4
--- GNUmakefile 29 Nov 2005 19:55:34 -0000 1.3
+++ GNUmakefile 24 Mar 2006 11:12:09 -0000 1.4
@@ -23,7 +23,7 @@
CPPFLAGS = $(LCIOCPPFLAGS) $(INCLUDE)
ifdef CLHEP
- CPPFLAGS += -DCLHEP=CLHEP -I$(CLHEP)/include
+ CPPFLAGS += -DUSE_CLHEP -I$(CLHEP)/include
endif
objects := $(patsubst %.cc,%.o,$(wildcard *.cc))
lcio/src/cpp/src/UTIL
diff -u -r1.46 -r1.47
--- LCTOOLS.cc 10 Mar 2006 16:23:19 -0000 1.46
+++ LCTOOLS.cc 24 Mar 2006 11:12:09 -0000 1.47
@@ -22,7 +22,7 @@
#include "EVENT/LCRelation.h"
#include "LCIOSTLTypes.h"
-#ifdef CLHEP
+#ifdef USE_CLHEP
#include "UTIL/LCFourVector.h"
#endif
#include "UTIL/LCObjectHandle.h"
@@ -1315,7 +1315,7 @@
for( int i=0 ; i< nPrint ; i++ ){
-#ifdef CLHEP
+#ifdef USE_CLHEP
ReconstructedParticle4V recP( col->getElementAt( i ) ) ;
#else
ReconstructedParticle* recP =
@@ -1513,7 +1513,7 @@
for( int index = 0 ; index < nParticles ; index++){
-#ifdef CLHEP
+#ifdef USE_CLHEP
MCParticle4V part( col->getElementAt( index ) ) ;
#else
MCParticle* part = dynamic_cast<MCParticle*>( col->getElementAt( index ) ) ;
@@ -1550,7 +1550,7 @@
cout << part->getMass() << " | "
<< part->getCharge() << " | "
<< part->getEnergy()
-#ifdef CLHEP
+#ifdef USE_CLHEP
//---- DEBUG
<< " m(4V) : " << part.m()
<< " e(4V) : " << part.e()
