Print

Print


Commit in lcio on MAIN
src/cpp/src/UTIL/LCTOOLS.cc+17-171.53 -> 1.54
CMakeLists.txt+3-31.35 -> 1.36
+20-20
2 modified files
removed dependency on CLHEP library 

lcio/src/cpp/src/UTIL
LCTOOLS.cc 1.53 -> 1.54
diff -u -r1.53 -r1.54
--- LCTOOLS.cc	5 Nov 2007 13:17:00 -0000	1.53
+++ LCTOOLS.cc	8 Nov 2007 17:35:55 -0000	1.54
@@ -24,9 +24,9 @@
 #include "EVENT/LCRelation.h"
 #include "LCIOSTLTypes.h"
 
-#ifdef USE_CLHEP
-#include "UTIL/LCFourVector.h"
-#endif
+// #ifdef USE_CLHEP
+// #include "UTIL/LCFourVector.h"
+// #endif
 #include "UTIL/LCObjectHandle.h"
 #include "UTIL/LCTime.h"
 #include "UTIL/CellIDDecoder.h"
@@ -1249,12 +1249,12 @@
     
     for( int i=0 ; i< nPrint ; i++ ){
       
-#ifdef USE_CLHEP
-      ReconstructedParticle4V recP( col->getElementAt( i ) ) ;
-#else
+// #ifdef USE_CLHEP
+//       ReconstructedParticle4V recP( col->getElementAt( i ) ) ;
+// #else
       ReconstructedParticle* recP = 
       	dynamic_cast<ReconstructedParticle*>( col->getElementAt( i ) ) ;
-#endif
+// #endif
 
       
       int compound = recP->isCompound() ;
@@ -1470,11 +1470,11 @@
     for(  int index = 0 ; index < nParticles ; index++){
       
 
-#ifdef USE_CLHEP
-      MCParticle4V part( col->getElementAt( index ) ) ;
-#else
+// #ifdef USE_CLHEP
+//       MCParticle4V part( col->getElementAt( index ) ) ;
+// #else
       MCParticle* part =  dynamic_cast<MCParticle*>( col->getElementAt( index ) ) ;
-#endif
+// #endif
       printf(" [%8.8x] |", part->id() );
       cout << index << " [" ;
       for(unsigned int k=0;k<part->getParents().size();k++){
@@ -1507,12 +1507,12 @@
       cout <<  part->getMass()         << " | " 
 	   <<  part->getCharge()       << " | " 
 	   <<  part->getEnergy()      
-#ifdef USE_CLHEP
-	//---- DEBUG
-	   << " m(4V) : " << part.m()
-	   << " e(4V) : " << part.e()
-	//---- DEBUG
-#endif
+// #ifdef USE_CLHEP
+// 	//---- DEBUG
+// 	   << " m(4V) : " << part.m()
+// 	   << " e(4V) : " << part.e()
+// 	//---- DEBUG
+// #endif
 	   << endl ;	
 
 

lcio
CMakeLists.txt 1.35 -> 1.36
diff -u -r1.35 -r1.36
--- CMakeLists.txt	5 Nov 2007 17:12:19 -0000	1.35
+++ CMakeLists.txt	8 Nov 2007 17:35:55 -0000	1.36
@@ -20,8 +20,8 @@
 
 # project version
 SET( ${PROJECT_NAME}_MAJOR_VERSION 1 )
-SET( ${PROJECT_NAME}_MINOR_VERSION 8 )
-SET( ${PROJECT_NAME}_PATCH_LEVEL 5 )
+SET( ${PROJECT_NAME}_MINOR_VERSION 9 )
+SET( ${PROJECT_NAME}_PATCH_LEVEL 0 )
 
 # project options
 OPTION( BUILD_SHARED_LIBS "Set to OFF to build static libraries" ON )
@@ -334,7 +334,7 @@
 
     IF( CLHEP_FOUND )
         INCLUDE_DIRECTORIES( ${CLHEP_INCLUDE_DIR} )
-        LINK_LIBRARIES( ${CLHEP_LIBRARIES} )
+#        LINK_LIBRARIES( ${CLHEP_LIBRARIES} )
         ADD_DEFINITIONS( ${CLHEP_DEFINITIONS} )
         SEPARATE_ARGUMENTS( CLHEP_DEFINITIONS )
         LIST( APPEND ${PROJECT_NAME}_DEFINITIONS ${CLHEP_DEFINITIONS} )
CVSspam 0.2.8