lcio

diff -u -r1.10 -r1.11
--- BuildSetup.cmake	13 Jul 2007 15:28:42 -0000	1.10
+++ BuildSetup.cmake	13 Nov 2007 11:34:59 -0000	1.11
@@ -41,12 +41,12 @@

 # CLHEP
 #############################################################################
 

-# Enable this for building LCIO with CLHEP
-SET( BUILD_WITH "CLHEP" CACHE STRING "Build LCIO with these optional packages" FORCE )

+# LCIO no longer depends directly on CLHEP 
+
+# only dependency is  UTIL::LCFourVector.h which can be used in programs 
+# linking against LCIO and CLHEP 
+# -> specify BUILD_WITH("CLHEP") in this program's BuildSetup

-# Path to CLHEP
-SET( CLHEP_HOME "${ILC_HOME}/CLHEP/2.0.2.2"
-    CACHE PATH "Path to CLHEP" FORCE )

 
 #############################################################################
 # Project options

lcio

diff -u -r1.36 -r1.37
--- CMakeLists.txt	8 Nov 2007 17:35:55 -0000	1.36
+++ CMakeLists.txt	13 Nov 2007 11:34:59 -0000	1.37
@@ -325,23 +325,25 @@

 # This code would not be necessary if the DEPENDENCIES code above would not
 # be commented out, but this way LCIO does not depend on CMakeModules
 IF( DEFINED BUILD_WITH AND BUILD_WITH STREQUAL "CLHEP" )

-    IF( NOT DEFINED CLHEP_HOME )
-        MESSAGE( FATAL_ERROR "Check for CLHEP: CLHEP_HOME not set!! "
-            "Please call cmake with -DCLHEP_HOME=<path_to_CLHEP>" )
-    ENDIF()
-    MESSAGE( STATUS "Check for CLHEP: ${CLHEP_HOME}" )
-    INCLUDE( FindCLHEP.cmake )

+  MESSAGE( STATUS " --- LCIO no longer (optionally) depends on CLHEP =>  BUILD_WITH \"CLHEP\" ignored !"  )

-    IF( CLHEP_FOUND )
-        INCLUDE_DIRECTORIES( ${CLHEP_INCLUDE_DIR} )

+#    IF( NOT DEFINED CLHEP_HOME )
+#        MESSAGE( FATAL_ERROR "Check for CLHEP: CLHEP_HOME not set!! "
+#            "Please call cmake with -DCLHEP_HOME=<path_to_CLHEP>" )
+#    ENDIF()
+#    MESSAGE( STATUS "Check for CLHEP: ${CLHEP_HOME}" )
+#    INCLUDE( FindCLHEP.cmake )
+#
+#    IF( CLHEP_FOUND )
+#        INCLUDE_DIRECTORIES( ${CLHEP_INCLUDE_DIR} )

 #        LINK_LIBRARIES( ${CLHEP_LIBRARIES} )

-        ADD_DEFINITIONS( ${CLHEP_DEFINITIONS} )
-        SEPARATE_ARGUMENTS( CLHEP_DEFINITIONS )
-        LIST( APPEND ${PROJECT_NAME}_DEFINITIONS ${CLHEP_DEFINITIONS} )
-    ENDIF()

+#        ADD_DEFINITIONS( ${CLHEP_DEFINITIONS} )
+#        SEPARATE_ARGUMENTS( CLHEP_DEFINITIONS )
+#        LIST( APPEND ${PROJECT_NAME}_DEFINITIONS ${CLHEP_DEFINITIONS} )
+#    ENDIF()

-    SET( BUILD_WITH "${BUILD_WITH}" CACHE STRING
-        "Build ${PROJECT_NAME} with these optional packages" FORCE )

+#    SET( BUILD_WITH "${BUILD_WITH}" CACHE STRING
+#        "Build ${PROJECT_NAME} with these optional packages" FORCE )

 ENDIF()
 
 # input directories

lcio/doc

diff -u -r1.64 -r1.65
--- versions.readme	9 Nov 2007 20:21:09 -0000	1.64
+++ versions.readme	13 Nov 2007 11:34:59 -0000	1.65
@@ -7,15 +7,22 @@

 =====================
   no changes in file format
 

-   - made compatible with new stdhep files (Java/C++)

+   - added event weight: LCEvent.getWeight()  (Java/C++)

-   - LCStdHepRdr now fills MCParticle::charge properly (C++)

+   - added LCWriter::setCompressionLevel(int level)  (C++) 

+   - lcio (java tool) and stdhepjob (C++) improved
+       - made compatible with new stdhep files (Java/C++)
+       - fill stdhep event weight ( and _idrup / user process id )
+       - stdhepjob now build by default (an be used to convert stdhep to LCIO)
+ 
+   - LCStdHepRdr now fill MCParticle::charge properly (C++)
+ 

    - Java uses new sio classes from hep.io.sio
 

-   - added event weight: LCEvent.getWeight()  (Java/C++)
-
-   - added LCWriter::setCompressionLevel(int level)  (C++) 

+   - LCIO (C++) no longer has optional direct dependency on CLHEP 
+     ( only file is UTIL/LCFourVector.h that can be used in
+       programs built with LCIO and CLHEP )   

 
 
 =====================