5 modified files
lcio/src/cpp/include/UTIL
diff -u -r1.8 -r1.9
--- LCFourVector.h 28 Apr 2006 10:35:04 -0000 1.8
+++ LCFourVector.h 17 Jan 2011 13:11:11 -0000 1.9
@@ -1,6 +1,4 @@
// -*- C++ -*-
-#ifdef USE_CLHEP // only if CLHEP is available !
-
#ifndef UTIL_LCFourVector_H
#define UTIL_LCFourVector_H 1
@@ -87,4 +85,4 @@
#endif /* ifndef UTIL_LCFOURVECTOR_H */
-#endif // USE_CLHEP
+
lcio/src/cpp/include/UTIL
diff -u -r1.8 -r1.9
--- LCFourVector.icc 28 Apr 2006 10:35:05 -0000 1.8
+++ LCFourVector.icc 17 Jan 2011 13:11:11 -0000 1.9
@@ -1,5 +1,3 @@
-#ifdef USE_CLHEP // only if CLHEP is available !
-
#include "UTIL/LCFourVector.h"
#include "IMPL/MCParticleImpl.h"
#include "IMPL/ReconstructedParticleImpl.h"
@@ -70,4 +68,4 @@
}
} // end namespace
-#endif // USE_CLHEP
+
lcio/src/cpp/include/rootDict
diff -u -r1.8 -r1.9
--- CMakeLists.txt 11 Nov 2010 12:02:32 -0000 1.8
+++ CMakeLists.txt 17 Jan 2011 13:11:11 -0000 1.9
@@ -178,6 +178,7 @@
${LCIO_CXX_HEADERS_DIR}/UTIL/CellIDDecoder.h
${LCIO_CXX_HEADERS_DIR}/UTIL/LCWarning.h
${LCIO_CXX_HEADERS_DIR}/UTIL/Operators.h
+ ${LCIO_CXX_HEADERS_DIR}/UTIL/LCFourVector.h
)
# remove items to exclude
lcio/src/cpp/src/UTIL
diff -u -r1.69 -r1.70
--- LCTOOLS.cc 15 Nov 2010 16:58:02 -0000 1.69
+++ LCTOOLS.cc 17 Jan 2011 13:11:11 -0000 1.70
@@ -24,9 +24,6 @@
#include "EVENT/LCRelation.h"
#include "LCIOSTLTypes.h"
-// #ifdef USE_CLHEP
-// #include "UTIL/LCFourVector.h"
-// #endif
#include "UTIL/LCObjectHandle.h"
#include "UTIL/LCTime.h"
#include "UTIL/CellIDDecoder.h"
@@ -1371,13 +1368,8 @@
for( int i=0 ; i< nPrint ; i++ ){
-// #ifdef USE_CLHEP
-// ReconstructedParticle4V recP( col->getElementAt( i ) ) ;
-// #else
ReconstructedParticle* recP =
dynamic_cast<ReconstructedParticle*>( col->getElementAt( i ) ) ;
-// #endif
-
int compound = recP->isCompound() ;
int type = recP->getType() ;
lcio/src/cpp/src/UTIL
diff -u -r1.11 -r1.12
--- Operators.cc 15 Nov 2010 16:58:02 -0000 1.11
+++ Operators.cc 17 Jan 2011 13:11:11 -0000 1.12
@@ -38,9 +38,6 @@
#include <sstream>
-// #ifdef USE_CLHEP
-// #include "UTIL/LCFourVector.h"
-// #endif
#include "UTIL/LCObjectHandle.h"
#include "UTIL/LCTime.h"
#include "UTIL/CellIDDecoder.h"
CVSspam 0.2.8