6 modified files
lcio/src/cpp
diff -u -r1.22.2.1 -r1.22.2.2
--- CMakeLists.txt 7 Jul 2009 12:48:43 -0000 1.22.2.1
+++ CMakeLists.txt 8 Jul 2009 15:09:02 -0000 1.22.2.2
@@ -117,6 +117,112 @@
)
+
+
+
+
+#------ require proper C++ -------
+ADD_DEFINITIONS( "-Wall -ansi -pedantic" )
+#----- need long long for int64 for now ------
+ADD_DEFINITIONS( "-Wno-long-long -fno-strict-aliasing" )
+
+#---- special flags for cfortran code : --------
+SET_SOURCE_FILES_PROPERTIES(
+ ${LCIO_CPPFORT_SRCS} PROPERTIES
+ COMPILE_FLAGS "-Df2cFortran -Wno-unused"
+)
+
+ADD_LIBRARY( lib_LCIOF77 STATIC
+ ${LCIO_CPPFORT_SRCS}
+)
+
+SET_TARGET_PROPERTIES( lib_LCIOF77 PROPERTIES
+ # create *nix style library versions + symbolic links
+ #VERSION ${LCIO_VERSION}
+ #SOVERSION ${LCIO_SOVERSION}
+ # allow creating static and shared libs without conflicts
+ CLEAN_DIRECT_OUTPUT 1
+ # avoid conflicts between library and binary target names
+ OUTPUT_NAME lcioF77
+)
+
+ADD_CUSTOM_TARGET( lib DEPENDS lib_LCIO lib_LCIOF77 lib_SIO )
+
+ADD_LIBRARY( lib_LCIO
+ ${LCIO_IMPL_SRCS}
+ ${LCIO_IOIMPL_SRCS}
+ ${LCIO_UTIL_SRCS}
+ ${LCIO_SIO_SRCS}
+)
+
+SET_TARGET_PROPERTIES( lib_LCIO PROPERTIES
+ # create *nix style library versions + symbolic links
+ VERSION ${LCIO_VERSION}
+ SOVERSION ${LCIO_SOVERSION}
+ # allow creating static and shared libs without conflicts
+ CLEAN_DIRECT_OUTPUT 1
+ # avoid conflicts between library and binary target names
+ OUTPUT_NAME lcio
+)
+
+TARGET_LINK_LIBRARIES( lib_LCIO lib_SIO )
+TARGET_LINK_LIBRARIES( lib_LCIOF77 lib_LCIO )
+
+
+# create symbolic target for calling targets bin_XXX
+ADD_CUSTOM_TARGET( bin )
+
+# ==== a macro for adding binaries from the EXAMPLE directory =====
+MACRO( ADD_LCIO_BIN file )
+ ADD_EXECUTABLE( bin_${file} ./src/EXAMPLE/${file}.cc )
+ ADD_DEPENDENCIES( bin bin_${file} )
+# MESSAGE( STATUS " in ADD_LCIO_BIN : " ${file} " " ./src/EXAMPLE/${file}.cc )
+ SET_TARGET_PROPERTIES( bin_${file} PROPERTIES OUTPUT_NAME ${file} )
+ TARGET_LINK_LIBRARIES( bin_${file} lib_LCIO )
+ INSTALL( TARGETS bin_${file} DESTINATION bin )
+ENDMACRO()
+#===================================================================
+
+ADD_LCIO_BIN( simjob )
+ADD_LCIO_BIN( anajob )
+ADD_LCIO_BIN( recjob )
+ADD_LCIO_BIN( dumpevent )
+ADD_LCIO_BIN( copyfix )
+ADD_LCIO_BIN( stdhepjob )
+
+
+IF( BUILD_LCIO_EXAMPLES )
+ ADD_LCIO_BIN( lcrtrelation )
+ ADD_LCIO_BIN( readcalibration )
+
+ # LCIO SHELL needs curses and readline libraries
+ FIND_PACKAGE( Curses )
+ FIND_LIBRARY( READLINE_LIBRARY
+ NAMES readline
+ PATHS
+ /usr/local/lib
+ /usr/local/lib64
+ /usr/lib
+ /usr/lib64
+ /lib
+ /lib64
+ )
+ IF( CURSES_LIBRARY AND READLINE_LIBRARY )
+ ADD_LCIO_BIN( lsh )
+ TARGET_LINK_LIBRARIES( bin_lsh ${CURSES_LIBRARY} ${READLINE_LIBRARY} )
+ ELSE()
+ MESSAGE( STATUS "Warning: didn't find curses and/or readline libraries. Cannot build lsh" )
+ ENDIF()
+
+
+
+# INCLUDE( ${PROJECT_SOURCE_DIR}/FindROOT.cmake )
+# INCLUDE( ${PROJECT_SOURCE_DIR}/MacroLoadPackage.cmake )
+# SET( CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR} )
+# LOAD_PACKAGE( ROOT REQUIRED )
+
+ENDIF()
+
#------ root dict -----------------------------
IF( BUILD_ROOTIO )
@@ -143,7 +249,7 @@
FILE( GLOB_RECURSE lcio_headers include/*.h )
# list of headers to exclude
- FILE( GLOB_RECURSE exclude_headers include/empty_ignore.h include/SIO/*.h include/CPPFORT/*.h )
+ FILE( GLOB_RECURSE exclude_headers include/empty_ignore.h include/SIO/*.h include/CPPFORT/*.h include/UTIL/CellIDDecoder.h)
# remove items to exclude
LIST( REMOVE_ITEM lcio_headers ${exclude_headers} )
@@ -227,6 +333,12 @@
INCLUDE_DIRECTORIES( "${CMAKE_CURRENT_SOURCE_DIR}" )
ADD_LIBRARY( lib_LCIODICT ${dict_lib_srcs} )
+
+ IF( APPLE )
+ SET( ROOT_DICT_LINK_FLAGS "-single_module -undefined dynamic_lookup -bind_at_load")
+ ELSE( APPLE )
+ SET( ROOT_DICT_LINK_FLAGS " " )
+ ENDIF( APPLE )
SET_TARGET_PROPERTIES( lib_LCIODICT PROPERTIES
# create *nix style library versions + symbolic links
@@ -236,10 +348,13 @@
CLEAN_DIRECT_OUTPUT 1
# avoid conflicts between library and binary target names
OUTPUT_NAME lcioDict
+ LINKER_FLAGS ${ROOT_DICT_LINK_FLAGS}
)
ADD_CUSTOM_TARGET( dict DEPENDS lib_LCIODICT )
-
+
+ TARGET_LINK_LIBRARIES( lib_LCIODICT ${ROOT_LIBRARIES} lib_LCIO)
+
ELSE( ROOT_FOUND )
@@ -250,112 +365,6 @@
ENDIF( BUILD_ROOTIO )
#----------------------------------------------
-
-
-
-
-#------ require proper C++ -------
-ADD_DEFINITIONS( "-Wall -ansi -pedantic" )
-#----- need long long for int64 for now ------
-ADD_DEFINITIONS( "-Wno-long-long -fno-strict-aliasing" )
-
-#---- special flags for cfortran code : --------
-SET_SOURCE_FILES_PROPERTIES(
- ${LCIO_CPPFORT_SRCS} PROPERTIES
- COMPILE_FLAGS "-Df2cFortran -Wno-unused"
-)
-
-ADD_LIBRARY( lib_LCIOF77 STATIC
- ${LCIO_CPPFORT_SRCS}
-)
-
-SET_TARGET_PROPERTIES( lib_LCIOF77 PROPERTIES
- # create *nix style library versions + symbolic links
- #VERSION ${LCIO_VERSION}
- #SOVERSION ${LCIO_SOVERSION}
- # allow creating static and shared libs without conflicts
- CLEAN_DIRECT_OUTPUT 1
- # avoid conflicts between library and binary target names
- OUTPUT_NAME lcioF77
-)
-
-ADD_CUSTOM_TARGET( lib DEPENDS lib_LCIO lib_LCIOF77 lib_SIO )
-
-ADD_LIBRARY( lib_LCIO
- ${LCIO_IMPL_SRCS}
- ${LCIO_IOIMPL_SRCS}
- ${LCIO_UTIL_SRCS}
- ${LCIO_SIO_SRCS}
-)
-
-SET_TARGET_PROPERTIES( lib_LCIO PROPERTIES
- # create *nix style library versions + symbolic links
- VERSION ${LCIO_VERSION}
- SOVERSION ${LCIO_SOVERSION}
- # allow creating static and shared libs without conflicts
- CLEAN_DIRECT_OUTPUT 1
- # avoid conflicts between library and binary target names
- OUTPUT_NAME lcio
-)
-
-TARGET_LINK_LIBRARIES( lib_LCIO lib_SIO )
-TARGET_LINK_LIBRARIES( lib_LCIOF77 lib_LCIO )
-
-
-# create symbolic target for calling targets bin_XXX
-ADD_CUSTOM_TARGET( bin )
-
-# ==== a macro for adding binaries from the EXAMPLE directory =====
-MACRO( ADD_LCIO_BIN file )
- ADD_EXECUTABLE( bin_${file} ./src/EXAMPLE/${file}.cc )
- ADD_DEPENDENCIES( bin bin_${file} )
-# MESSAGE( STATUS " in ADD_LCIO_BIN : " ${file} " " ./src/EXAMPLE/${file}.cc )
- SET_TARGET_PROPERTIES( bin_${file} PROPERTIES OUTPUT_NAME ${file} )
- TARGET_LINK_LIBRARIES( bin_${file} lib_LCIO )
- INSTALL( TARGETS bin_${file} DESTINATION bin )
-ENDMACRO()
-#===================================================================
-
-ADD_LCIO_BIN( simjob )
-ADD_LCIO_BIN( anajob )
-ADD_LCIO_BIN( recjob )
-ADD_LCIO_BIN( dumpevent )
-ADD_LCIO_BIN( copyfix )
-ADD_LCIO_BIN( stdhepjob )
-
-
-IF( BUILD_LCIO_EXAMPLES )
- ADD_LCIO_BIN( lcrtrelation )
- ADD_LCIO_BIN( readcalibration )
-
- # LCIO SHELL needs curses and readline libraries
- FIND_PACKAGE( Curses )
- FIND_LIBRARY( READLINE_LIBRARY
- NAMES readline
- PATHS
- /usr/local/lib
- /usr/local/lib64
- /usr/lib
- /usr/lib64
- /lib
- /lib64
- )
- IF( CURSES_LIBRARY AND READLINE_LIBRARY )
- ADD_LCIO_BIN( lsh )
- TARGET_LINK_LIBRARIES( bin_lsh ${CURSES_LIBRARY} ${READLINE_LIBRARY} )
- ELSE()
- MESSAGE( STATUS "Warning: didn't find curses and/or readline libraries. Cannot build lsh" )
- ENDIF()
-
-
-
-# INCLUDE( ${PROJECT_SOURCE_DIR}/FindROOT.cmake )
-# INCLUDE( ${PROJECT_SOURCE_DIR}/MacroLoadPackage.cmake )
-# SET( CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR} )
-# LOAD_PACKAGE( ROOT REQUIRED )
-
-ENDIF()
-
IF( BUILD_ROOTIO )
ADD_LCIO_BIN( rootio )
TARGET_LINK_LIBRARIES( bin_rootio lib_LCIODICT )
lcio/src/cpp/include/IMPL
diff -u -r1.23 -r1.23.16.1
--- MCParticleImpl.h 4 Aug 2006 16:52:46 -0000 1.23
+++ MCParticleImpl.h 8 Jul 2009 15:09:02 -0000 1.23.16.1
@@ -19,7 +19,7 @@
/** Implementation of MCParticle.
*
* @author gaede
- * @version $Id: MCParticleImpl.h,v 1.23 2006/08/04 16:52:46 gaede Exp $
+ * @version $Id: MCParticleImpl.h,v 1.23.16.1 2009/07/08 15:09:02 gaede Exp $
*/
class MCParticleImpl : public EVENT::MCParticle, public AccessChecked {
@@ -59,7 +59,7 @@
/** Returns the i-th parent of this particle.
*/
- virtual MCParticle * getParent(int i) const ;
+ virtual EVENT::MCParticle * getParent(int i) const ;
/** Returns the endpoint of the particle in [mm] - returns NULL if
lcio/src/cpp/include/IMPL
diff -u -r1.17 -r1.17.8.1
--- SimCalorimeterHitImpl.h 26 Apr 2007 16:39:53 -0000 1.17
+++ SimCalorimeterHitImpl.h 8 Jul 2009 15:09:02 -0000 1.17.8.1
@@ -17,7 +17,7 @@
int PDG ;
} MCParticleCont ;
- typedef std::vector< MCParticleCont* > MCParticleContVec ;
+ typedef std::vector< IMPL::MCParticleCont* > MCParticleContVec ;
/** Implementation of the generic SimCalorimeterHit.
*
@@ -36,7 +36,7 @@
/** Copy constructor - shallow copy.
*/
- SimCalorimeterHitImpl(const SimCalorimeterHit& hit) ;
+ SimCalorimeterHitImpl(const EVENT::SimCalorimeterHit& hit) ;
/// Destructor.
virtual ~SimCalorimeterHitImpl() ;
lcio/src/cpp/include/IOIMPL
diff -u -r1.1.2.1 -r1.1.2.2
--- rootio_templates.h 8 Jul 2009 12:34:08 -0000 1.1.2.1
+++ rootio_templates.h 8 Jul 2009 15:09:02 -0000 1.1.2.2
@@ -1,5 +1,5 @@
-#ifndef lcio_templates_h
-#define lcio_templates_h 1
+#ifndef rootio_templates_h
+#define rootio_templates_h 1
#include "UTIL/LCTypedVector.h"
lcio/src/cpp/include/UTIL
diff -u -r1.9 -r1.9.12.1
--- CellIDDecoder.h 8 Dec 2006 10:18:59 -0000 1.9
+++ CellIDDecoder.h 8 Jul 2009 15:09:02 -0000 1.9.12.1
@@ -24,7 +24,7 @@
* See UTIL::BitField64 for a description of the encoding string.
*
* @see BitField64
- * @version $Id: CellIDDecoder.h,v 1.9 2006/12/08 10:18:59 gaede Exp $
+ * @version $Id: CellIDDecoder.h,v 1.9.12.1 2009/07/08 15:09:02 gaede Exp $
*/
template <class T>
class CellIDDecoder {
@@ -111,7 +111,7 @@
* Specialization for SimTrackerHits that have only one cellID.
*/
template<>
- inline const BitField64 & CellIDDecoder<SimTrackerHit>::operator()( SimTrackerHit* hit ){
+ inline const BitField64 & CellIDDecoder<EVENT::SimTrackerHit>::operator()( EVENT::SimTrackerHit* hit ){
if( hit != _oldHit && hit ) {
@@ -127,7 +127,7 @@
template <>
- std::string* CellIDDecoder<SimTrackerHit>::_defaultEncoding ;
+ std::string* CellIDDecoder<EVENT::SimTrackerHit>::_defaultEncoding ;
} // namespace
#endif
lcio/src/cpp/include/UTIL
diff -u -r1.1 -r1.1.6.1
--- PIDHandler.h 30 May 2008 13:27:08 -0000 1.1
+++ PIDHandler.h 8 Jul 2009 15:09:02 -0000 1.1.6.1
@@ -31,7 +31,7 @@
* @see ReconstructedParticle
* @see ParticleID
* @author F.Gaede, DESY
- * @version $Id: PIDHandler.h,v 1.1 2008/05/30 13:27:08 gaede Exp $
+ * @version $Id: PIDHandler.h,v 1.1.6.1 2009/07/08 15:09:02 gaede Exp $
*/
class PIDHandler {
@@ -83,7 +83,7 @@
/** Set the particleID algorithm that is used for this particle's kinematic variables
* - throws UnknownAlgorithm.
*/
- void setParticleIDUsed( ReconstructedParticleImpl* particle , int algorithmID ) ;
+ void setParticleIDUsed( IMPL::ReconstructedParticleImpl* particle , int algorithmID ) ;
/** The names of parameters for the algorithm with algorithmID - throws UnknownAlgoritm.
CVSspam 0.2.8
