21 modified files
lcio
diff -u -r1.41 -r1.42
--- CMakeLists.txt 30 May 2008 14:05:16 -0000 1.41
+++ CMakeLists.txt 4 Jun 2008 17:37:15 -0000 1.42
@@ -20,12 +20,13 @@
# project version
SET( ${PROJECT_NAME}_MAJOR_VERSION 1 )
-SET( ${PROJECT_NAME}_MINOR_VERSION 9 )
-SET( ${PROJECT_NAME}_PATCH_LEVEL 1 )
+SET( ${PROJECT_NAME}_MINOR_VERSION 10 )
+SET( ${PROJECT_NAME}_PATCH_LEVEL 0 )
# project options
OPTION( BUILD_SHARED_LIBS "Set to OFF to build static libraries" ON )
-OPTION( BUILD_LCIO_TESTJOBS "Set to ON to build LCIO testjobs" OFF )
+OPTION( BUILD_LCIO_TESTS "Set to ON to build LCIO tests under src/cpp/src/TESTS" OFF )
+OPTION( BUILD_LCIO_EXAMPLES "Set to ON to build LCIO examples under src/cpp/src/EXAMPLES" OFF )
OPTION( BUILD_LCIO_SHELL "Set to ON to build LCIO shell lsh" OFF )
OPTION( BUILD_F77_TESTJOBS "Set to ON to build LCIO F77 testjobs" OFF )
OPTION( BUILD_WITH_DCAP "Set to ON to build LCIO with dcap (dCache) support" OFF )
@@ -387,7 +388,8 @@
MESSAGE( STATUS "CMAKE_INSTALL_PREFIX = ${CMAKE_INSTALL_PREFIX}" )
MESSAGE( STATUS "CMAKE_BUILD_TYPE = ${CMAKE_BUILD_TYPE}" )
MESSAGE( STATUS "CMAKE_MODULE_PATH = ${CMAKE_MODULE_PATH}" )
-MESSAGE( STATUS "BUILD_LCIO_TESTJOBS = ${BUILD_LCIO_TESTJOBS}" )
+MESSAGE( STATUS "BUILD_LCIO_TESTS = ${BUILD_LCIO_TESTS}" )
+MESSAGE( STATUS "BUILD_LCIO_EXAMPLES = ${BUILD_LCIO_EXAMPLES}" )
MESSAGE( STATUS "BUILD_LCIO_SHELL = ${BUILD_LCIO_SHELL}" )
MESSAGE( STATUS "BUILD_F77_TESTJOBS = ${BUILD_F77_TESTJOBS}" )
MESSAGE( STATUS "BUILD_WITH_DCAP = ${BUILD_WITH_DCAP}" )
@@ -407,8 +409,10 @@
"Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel." FORCE )
SET( CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" CACHE PATH
"Path to custom CMake Modules" FORCE )
-SET( BUILD_LCIO_TESTJOBS "${BUILD_LCIO_TESTJOBS}" CACHE BOOL
- "Set to ON to build LCIO testbobs" FORCE )
+SET( BUILD_LCIO_TESTS "${BUILD_LCIO_TESTS}" CACHE BOOL
+ "Set to ON to build LCIO tests under src/cpp/src/TESTS" FORCE )
+SET( BUILD_LCIO_EXAMPLES "${BUILD_LCIO_EXAMPLES}" CACHE BOOL
+ "Set to ON to build LCIO examples under src/cpp/src/EXAMPLES" FORCE )
SET( BUILD_F77_TESTJOBS "${BUILD_F77_TESTJOBS}" CACHE BOOL
"Set to ON to build LCIO F77 testbobs" FORCE )
SET( BUILD_WITH_DCAP "${BUILD_WITH_DCAP}" CACHE BOOL
lcio/config
diff -u -r1.65 -r1.66
--- lcio.properties 30 May 2008 14:05:16 -0000 1.65
+++ lcio.properties 4 Jun 2008 17:37:15 -0000 1.66
@@ -1,7 +1,7 @@
# ANT property file for LCIO
#
# Author: Mark Donszelmann
-# Version: $Id: lcio.properties,v 1.65 2008/05/30 14:05:16 gaede Exp $
+# Version: $Id: lcio.properties,v 1.66 2008/06/04 17:37:15 engels Exp $
#
debug=true
@@ -11,7 +11,7 @@
mainpackage=hep/lcio/event
title=LCIO Linear Collider IO
-version=v01-09-01
+version=v01-10-00
copyright=Copyright &\#169; 2002-2003 LCIO Team, All Rights Reserved.
name=lcio-event
packages=hep.lcio.event.*
@@ -137,7 +137,7 @@
#
# General definitions for project wide targets
#
-dist.version=v01-09-01
+dist.version=v01-10-00
dist.dst=release
dist.doc.dst=release
dist.dir=dist
lcio/doc
diff -u -r1.10 -r1.11
--- index.html 30 May 2008 14:05:16 -0000 1.10
+++ index.html 4 Jun 2008 17:37:15 -0000 1.11
@@ -4,7 +4,7 @@
<body>
<hr>
-<h1>Documentation for LCIO v01-09-01</h1>
+<h1>Documentation for LCIO v01-10-00</h1>
<hr>
lcio/doc
diff -u -r1.61 -r1.62
--- lcio.xml 8 Nov 2007 17:38:43 -0000 1.61
+++ lcio.xml 4 Jun 2008 17:37:15 -0000 1.62
@@ -13,7 +13,7 @@
-->
<sio>
<record name="LCRunHeader">
- <block name="RunHeader" major="1" minor="9">
+ <block name="RunHeader" major="1" minor="10">
<data type="int" name="runNumber"></data>
<data type="string" name="detectorName"></data>
<data type="string" name="description"></data>
@@ -25,7 +25,7 @@
</block>
</record>
<record name="LCEventHeader">
- <block name="EventHeader" major="1" minor="9">
+ <block name="EventHeader" major="1" minor="10">
<data type="int" name="runNumber"></data>
<data type="int" name="eventNumber"></data>
<data type="long" name="timeStamp"></data>
@@ -39,7 +39,7 @@
</block>
</record>
<record name="LCEvent">
- <block name="MCParticle" major="1" minor="9">
+ <block name="MCParticle" major="1" minor="10">
<data type="int" name="flags"> not yet used, Bits 0-15 user/application dependent</data>
<include subroutine="namedParameters"/>
<data type="int" name="nMC"></data>
@@ -86,7 +86,7 @@
</if>
</repeat>
</block>
- <block name="SimTrackerHit" major="1" minor="9">
+ <block name="SimTrackerHit" major="1" minor="10">
<data type="int" name="flags">Bit 31 Barrel = 0, Endcap = 1, Bit 30 momentum (not) stored: 1(0), Bits 0-15 user/detector specific</data>
<include subroutine="namedParameters"/>
<data type="int" name="n"></data>
@@ -107,7 +107,7 @@
</if>
</repeat>
</block>
- <block name="SimCalorimeterHit" major="1" minor="9">
+ <block name="SimCalorimeterHit" major="1" minor="10">
<data type="int" name="flags">Bit 31 long = 1, short = 0; Bit 30 Barrel = 0, Endcap = 1;
Bit 29 cellid1 = 1, no cellid1 = 0; Bit 28 PDG = 1, no PDG =0, Bits 0-15 user/detector specific</data>
<include subroutine="namedParameters"/>
@@ -135,7 +135,7 @@
</if>
</repeat>
</block>
- <block name="LCFloatVec" major="1" minor="9">
+ <block name="LCFloatVec" major="1" minor="10">
<data type="int" name="flags">not yet used, Bits 0-15 user/detector specific</data>
<include subroutine="namedParameters"/>
<data type="int" name="nVectors"></data>
@@ -149,7 +149,7 @@
</if>
</repeat>
</block>
- <block name="LCIntVec" major="1" minor="9">
+ <block name="LCIntVec" major="1" minor="10">
<data type="int" name="flags">not yet used, Bits 0-15 user/detector specific</data>
<include subroutine="namedParameters"/>
<data type="int" name="nVectors"></data>
@@ -163,7 +163,7 @@
</if>
</repeat>
</block>
- <block name="LCStrVec" major="1" minor="9">
+ <block name="LCStrVec" major="1" minor="10">
<data type="int" name="flags">not yet used, Bits 0-15 user/detector specific</data>
<include subroutine="namedParameters"/>
<data type="int" name="nVectors"></data>
@@ -177,7 +177,7 @@
</if>
</repeat>
</block>
- <block name="RawCalorimeterHit" major="1" minor="9">
+ <block name="RawCalorimeterHit" major="1" minor="10">
<data type="int" name="flags">Bit 31 long = 1, short = 0; Bit 30 Barrel = 0, Endcap = 1;
Bit 29 cellid1 = 1, no cellid1 = 0;Bit 28 = 1: don't store ptr tag;
Bit 27 = 1: timeStamp stored; Bits 0-15 user/detector specific</data>
@@ -197,7 +197,7 @@
</if>
</repeat>
</block>
- <block name="CalorimeterHit" major="1" minor="9">
+ <block name="CalorimeterHit" major="1" minor="10">
<data type="int" name="flags">Bit 31 long = 1, short = 0; Bit 30 Barrel = 0, Endcap = 1;
Bit 29 cellid1 = 1, no cellid1 = 0;
Bit 27 = 1: timeStamp stored; Bits 0-15 user/detector specific</data>
@@ -209,6 +209,9 @@
<data type="int" name="cellId1">second word for cell id</data>
</if>
<data type="float" name="energy"></data>
+ <if condition="1000*major+minor>1009&&(flags&(1<<26)) != 0">
+ <data type="float" name="energyError"></data>
+ </if>
<if condition="1000*major+minor>1002&&(flags&(1<<27)) != 0">
<data type="float" name="time"></data>
</if>
@@ -228,7 +231,7 @@
</if>
</repeat>
</block>
- <block name="TrackerHit" major="1" minor="9">
+ <block name="TrackerHit" major="1" minor="10">
<data type="int" name="flags">Bits 0-15 user/detector specific</data>
<include subroutine="namedParameters"/>
<data type="int" name="n"></data>
@@ -252,7 +255,7 @@
<data type="ptag" name="this"></data>
</repeat>
</block>
- <block name="TPCHit" major="1" minor="9">
+ <block name="TPCHit" major="1" minor="10">
<data type="int" name="flags">Bit 31 no raw data = 0, raw data = 1, Bits 0-15 user/detector specific</data>
<include subroutine="namedParameters"/>
<data type="int" name="n"></data>
@@ -278,7 +281,7 @@
</if>
</repeat>
</block>
- <block name="TrackerRawData" major="1" minor="9">
+ <block name="TrackerRawData" major="1" minor="10">
<data type="int" name="flags">Bits 0-15 user/detector specific</data>
<include subroutine="namedParameters"/>
<data type="int" name="n"></data>
@@ -296,7 +299,7 @@
<data type="ptag" name="this"></data>
</repeat>
</block>
- <block name="TrackerData" major="1" minor="9">
+ <block name="TrackerData" major="1" minor="10">
<data type="int" name="flags">Bits 0-15 user/detector specific</data>
<include subroutine="namedParameters"/>
<data type="int" name="n"></data>
@@ -314,7 +317,7 @@
<data type="ptag" name="this"></data>
</repeat>
</block>
- <block name="TrackerPulse" major="1" minor="9">
+ <block name="TrackerPulse" major="1" minor="10">
<data type="int" name="flags">Bits 0-15 user/detector specific</data>
<include subroutine="namedParameters"/>
<data type="int" name="n"></data>
@@ -330,7 +333,7 @@
<data type="ptag" name="this"></data>
</repeat>
</block>
- <block name="SiliconRawHit" major="1" minor="9">
+ <block name="SiliconRawHit" major="1" minor="10">
<data type="int" name="flags">Bits 0-15 user/detector specific</data>
<include subroutine="namedParameters"/>
<data type="int" name="n"></data>
@@ -342,7 +345,7 @@
<data type="ptag" name="this"></data>
</repeat>
</block>
- <block name="Track" major="1" minor="9">
+ <block name="Track" major="1" minor="10">
<data type="int" name="flag">Bit 31 Hits are kept =1, Hits are not kept = 0</data>
<include subroutine="namedParameters"/>
<data type="int" name="nTrack"/>
@@ -378,7 +381,7 @@
<data type="ptag" name="this"></data>
</repeat>
</block>
- <block name="Cluster" major="1" minor="9">
+ <block name="Cluster" major="1" minor="10">
<data type="int" name="flag">Bit 31 Hits are kept =0, Hits are not kept = 1</data>
<include subroutine="namedParameters"/>
<data type="int" name="nCluster"/>
@@ -432,7 +435,7 @@
<data type="ptag" name="this"></data>
</repeat>
</block>
- <block name="Vertex" major="1" minor="9">
+ <block name="Vertex" major="1" minor="10">
<data type="int" name="flag"></data>
<include subroutine="namedParameters"/>
<data type="int" name="nVertex"></data>
@@ -451,7 +454,7 @@
<data type="ptag" name="this"></data>
</repeat>
</block>
- <block name="ReconstructedParticle" major="1" minor="9">
+ <block name="ReconstructedParticle" major="1" minor="10">
<data type="int" name="flag"></data>
<include subroutine="namedParameters"/>
<data type="int" name="nObject"/>
@@ -527,7 +530,7 @@
<data type="ptag" name="this"></data>
</repeat>
</block>
- <block name="LCGenericObject" major="1" minor="9">
+ <block name="LCGenericObject" major="1" minor="10">
<data type="int" name="flag"></data>
<include subroutine="namedParameters"/>
<if condition="(flag&(1<<31)) !=0">
@@ -554,7 +557,7 @@
<data type="ptag" name="this"></data>
</repeat>
</block>
- <block name="LCRelation" major="1" minor="9">
+ <block name="LCRelation" major="1" minor="10">
<data type="int" name="flag">Bit 31: 1[0] Weights are [not] stored</data>
<include subroutine="namedParameters"/>
<data type="int" name="nRelations"/>
@@ -567,7 +570,7 @@
</repeat>
</block>
<!-- generic block description for subset collections that hold references to existing objects -->
- <block name="References" major="1" minor="9">
+ <block name="References" major="1" minor="10">
<data type="int" name="flags"></data>
<include subroutine="namedParameters"/>
<data type="int" name="nReferences"></data>
lcio/sio
diff -u -r1.12 -r1.13
--- CMakeLists.txt 30 May 2008 14:05:16 -0000 1.12
+++ CMakeLists.txt 4 Jun 2008 17:37:15 -0000 1.13
@@ -9,8 +9,8 @@
# project version
SET( SIO_MAJOR_VERSION 1 )
-SET( SIO_MINOR_VERSION 9 )
-SET( SIO_PATCH_LEVEL 1 )
+SET( SIO_MINOR_VERSION 10 )
+SET( SIO_PATCH_LEVEL 0 )
# library *nix style versioning
SET( ${PROJECT_NAME}_SOVERSION
lcio/src/aid/EVENT
diff -u -r1.15 -r1.16
--- CalorimeterHit.aid 3 Aug 2006 16:53:34 -0000 1.15
+++ CalorimeterHit.aid 4 Jun 2008 17:37:15 -0000 1.16
@@ -24,7 +24,7 @@
* flag(LCIO::RCHBIT_NO_PTR)==1.
*
* @author gaede
- * @version $Id: CalorimeterHit.aid,v 1.15 2006/08/03 16:53:34 gaede Exp $
+ * @version $Id: CalorimeterHit.aid,v 1.16 2008/06/04 17:37:15 engels Exp $
*/
public interface CalorimeterHit extends LCObject {
@@ -49,7 +49,12 @@
/** Returns the energy of the hit in [GeV].
*/
public float getEnergy() const ;
-
+
+ /** Returns the error of the hit energy in [GeV]. Optional, check/set
+ * flag(LCIO::RCHBIT_ENERGY_ERROR)==1.
+ */
+ public float getEnergyError() const ;
+
/** Returns the time of the hit in [ns]. Optional, check/set
* flag(LCIO::RCHBIT_TIME)==1.
*/
lcio/src/aid/EVENT
diff -u -r1.63 -r1.64
--- LCIO.aid 30 May 2008 14:05:16 -0000 1.63
+++ LCIO.aid 4 Jun 2008 17:37:15 -0000 1.64
@@ -3,8 +3,8 @@
@ifdef cpp
@cpp{
#define LCIO_MAJOR_VERSION 1
-#define LCIO_MINOR_VERSION 9
-#define LCIO_PATCH_LEVEL 1
+#define LCIO_MINOR_VERSION 10
+#define LCIO_PATCH_LEVEL 0
#define LCIO_VERSION_GE( MAJV , MINV ) ( ( LCIO_MAJOR_VERSION > MAJV ) || ( (LCIO_MAJOR_VERSION==MAJV) && ( LCIO_MINOR_VERSION >= MINV ) ) )
@@ -16,7 +16,7 @@
/** Global constants used in LCIO.
*
* @author gaede
- * @version $Id: LCIO.aid,v 1.63 2008/05/30 14:05:16 gaede Exp $
+ * @version $Id: LCIO.aid,v 1.64 2008/06/04 17:37:15 engels Exp $
* @see LCObject
* @see LCIO
*/
@@ -46,6 +46,7 @@
static const int RCHBIT_ID1 = 29 ; // cellid1 stored
static const int RCHBIT_NO_PTR = 28 ; // 1: pointer tag not added
static const int RCHBIT_TIME = 27 ; // 1: time information stored
+ static const int RCHBIT_ENERGY_ERROR = 26 ; // 1: store energy error
// raw tracker data (pulses)
static const int TRAWBIT_ID1 = 31 ; // cellid1 stored
@@ -115,7 +116,7 @@
@else
// current version number of lcio
public static const int MAJORVERSION = 1 ;
- public static const int MINORVERSION = 9 ;
+ public static const int MINORVERSION = 10 ;
// bits in flag words
@@ -131,6 +132,7 @@
public static const int RCHBIT_ID1 = 29 ; // cellid1 stored
public static const int RCHBIT_NO_PTR = 28 ; // 1: pointer tag not added
public static const int RCHBIT_TIME = 27 ; // 1: time information stored
+ public static const int RCHBIT_ENERGY_ERROR = 26 ; // 1: store energy error
// raw tracker data (pulses)
public static const int TRAWBIT_ID1 = 31 ; // cellid1 stored
lcio/src/cpp
diff -u -r1.16 -r1.17
--- CMakeLists.txt 30 May 2008 13:27:51 -0000 1.16
+++ CMakeLists.txt 4 Jun 2008 17:37:15 -0000 1.17
@@ -164,7 +164,9 @@
TARGET_LINK_LIBRARIES( lib_LCIO lib_SIO )
TARGET_LINK_LIBRARIES( lib_LCIOF77 lib_LCIO )
-# create symbolic bin target for calling targets bin_XXX
+
+
+# create symbolic target for calling targets bin_XXX
ADD_CUSTOM_TARGET( bin )
# ==== a macro for adding binaries from the EXAMPLE directory =====
@@ -173,7 +175,7 @@
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_${PROJECT_NAME} ) #readline ncurses)
+ TARGET_LINK_LIBRARIES( bin_${file} lib_${PROJECT_NAME} )
INSTALL( TARGETS bin_${file} DESTINATION bin )
ENDMACRO()
#===================================================================
@@ -186,18 +188,51 @@
ADD_LCIO_BIN( stdhepjob )
-IF( BUILD_LCIO_SHELL )
- ADD_LCIO_BIN( lsh )
- TARGET_LINK_LIBRARIES( bin_lsh readline ncurses)
-ENDIF()
-
-IF( BUILD_LCIO_TESTJOBS )
- ADD_LCIO_BIN( readcalibration )
- ADD_LCIO_BIN( testvtx )
+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()
ENDIF()
+
+
+# create symbolic target for calling targets test_XXX
+ADD_CUSTOM_TARGET( tests )
+
+# ==== a macro for adding binaries from the TESTS directory =====
+MACRO( ADD_LCIO_CTEST file )
+ ADD_EXECUTABLE( ${file} EXCLUDE_FROM_ALL ./src/TESTS/${file}.cc )
+ ADD_DEPENDENCIES( tests ${file} )
+ TARGET_LINK_LIBRARIES( ${file} lib_${PROJECT_NAME} )
+ ADD_TEST( t_${file} "${EXECUTABLE_OUTPUT_PATH}/${file}" )
+ #SET_TESTS_PROPERTIES( t_${file} EXECUTABLE_OUTPUT_PATH
+ # PROPERTIES PASS_REGULAR_EXPRESSION "PASSED" )
+ENDMACRO()
+#===================================================================
+
+
+ADD_LCIO_CTEST( test_example )
+
+
#------------- install the library and the (public) header files -------
INSTALL( TARGETS lib_${PROJECT_NAME} DESTINATION lib PERMISSIONS
@@ -220,21 +255,19 @@
#------------- ctest stuff (call with ctest or 'make test') ------------
-IF( BUILD_LCIO_TESTJOBS )
- ADD_TEST( t_simjob "${EXECUTABLE_OUTPUT_PATH}/simjob" )
- ADD_TEST( t_anajob_sim "${EXECUTABLE_OUTPUT_PATH}/anajob" simjob.slcio )
- ADD_TEST( t_recjob "${EXECUTABLE_OUTPUT_PATH}/recjob" simjob.slcio recjob.slcio )
- ADD_TEST( t_anajob_rec "${EXECUTABLE_OUTPUT_PATH}/anajob" recjob.slcio )
-
- SET_TESTS_PROPERTIES( t_simjob EXECUTABLE_OUTPUT_PATH PROPERTIES PASS_REGULAR_EXPRESSION
- "created 10 runs with 100 events" )
- SET_TESTS_PROPERTIES( t_anajob_sim PROPERTIES PASS_REGULAR_EXPRESSION
- "100 events read from files:" )
- SET_TESTS_PROPERTIES( t_recjob PROPERTIES PASS_REGULAR_EXPRESSION
- "added collection: 'SomeClusters' and 'SomeTracks' to 100 events and added one extra MCParticle to each event." )
- SET_TESTS_PROPERTIES( t_anajob_rec PROPERTIES PASS_REGULAR_EXPRESSION
- "100 events read from files:" )
-ENDIF()
+ADD_TEST( t_simjob "${EXECUTABLE_OUTPUT_PATH}/simjob" )
+ADD_TEST( t_anajob_sim "${EXECUTABLE_OUTPUT_PATH}/anajob" simjob.slcio )
+ADD_TEST( t_recjob "${EXECUTABLE_OUTPUT_PATH}/recjob" simjob.slcio recjob.slcio )
+ADD_TEST( t_anajob_rec "${EXECUTABLE_OUTPUT_PATH}/anajob" recjob.slcio )
+
+SET_TESTS_PROPERTIES( t_simjob EXECUTABLE_OUTPUT_PATH PROPERTIES PASS_REGULAR_EXPRESSION
+ "created 10 runs with 100 events" )
+SET_TESTS_PROPERTIES( t_anajob_sim PROPERTIES PASS_REGULAR_EXPRESSION
+ "100 events read from files:" )
+SET_TESTS_PROPERTIES( t_recjob PROPERTIES PASS_REGULAR_EXPRESSION
+ "added collection: 'SomeClusters' and 'SomeTracks' to 100 events and added one extra MCParticle to each event." )
+SET_TESTS_PROPERTIES( t_anajob_rec PROPERTIES PASS_REGULAR_EXPRESSION
+ "100 events read from files:" )
IF( BUILD_F77_TESTJOBS )
ADD_TEST( t_simjob_F "${EXECUTABLE_OUTPUT_PATH}/simjob_F" )
lcio/src/cpp/include
diff -u -r1.31 -r1.32
--- lcio.h 30 May 2008 14:05:16 -0000 1.31
+++ lcio.h 4 Jun 2008 17:37:15 -0000 1.32
@@ -7,7 +7,7 @@
* documentation with doxygen.
*
* @author gaede
- * @version $Id: lcio.h,v 1.31 2008/05/30 14:05:16 gaede Exp $
+ * @version $Id: lcio.h,v 1.32 2008/06/04 17:37:15 engels Exp $
* @see LCEvent
*/
#include "EVENT/LCIO.h"
@@ -15,7 +15,7 @@
#include "IMPL/LCIOExceptionHandler.h"
-/** \mainpage <a href="http://lcio.desy.de">LCIO</a> (v01-09-01)
+/** \mainpage <a href="http://lcio.desy.de">LCIO</a> (v01-10-00)
* A persistency framework for linear collider simulation studies.
* \section Overview
* This is the API documentation for the C++ version of LCIO. For general documetation on
lcio/src/cpp/include/CPPFORT
diff -u -r1.4 -r1.5
--- lccah.h 15 Apr 2005 08:37:34 -0000 1.4
+++ lccah.h 4 Jun 2008 17:37:16 -0000 1.5
@@ -11,24 +11,26 @@
// trailing underscores on Linux
PTRTYPE lccahcreate() ;
-int lccahdelete( PTRTYPE simcalhit ) ;
-int lccahid( PTRTYPE simcalhit ) ;
+int lccahdelete( PTRTYPE calhit ) ;
+int lccahid( PTRTYPE calhit ) ;
-int lccahgetcellid0( PTRTYPE simcalhit ) ;
-int lccahgetcellid1( PTRTYPE simcalhit ) ;
-float lccahgetenergy( PTRTYPE simcalhit ) ;
-float lccahgettime( PTRTYPE simcalhit ) ;
-int lccahgetposition( PTRTYPE simcalhit, float * ) ;
-int lccahgettype( PTRTYPE simcalhit ) ;
-PTRTYPE lccahgetrawhit( PTRTYPE simcalhit ) ;
-
-int lccahsetcellid0( PTRTYPE simcalhit, int id0) ;
-int lccahsetcellid1( PTRTYPE simcalhit, int id1) ;
-int lccahsetenergy( PTRTYPE simcalhit, float en) ;
-int lccahsettime( PTRTYPE simcalhit, float time) ;
-int lccahsetposition( PTRTYPE simcalhit, float pos[3]) ;
-int lccahsettype( PTRTYPE simcalhit, int type ) ;
-int lccahsetrawhit( PTRTYPE simcalhit, PTRTYPE rawHit ) ;
+int lccahgetcellid0( PTRTYPE calhit ) ;
+int lccahgetcellid1( PTRTYPE calhit ) ;
+float lccahgetenergy( PTRTYPE calhit ) ;
+float lccahgetenergyerr( PTRTYPE calhit ) ;
+float lccahgettime( PTRTYPE calhit ) ;
+int lccahgetposition( PTRTYPE calhit, float * ) ;
+int lccahgettype( PTRTYPE calhit ) ;
+PTRTYPE lccahgetrawhit( PTRTYPE calhit ) ;
+
+int lccahsetcellid0( PTRTYPE calhit, int id0) ;
+int lccahsetcellid1( PTRTYPE calhit, int id1) ;
+int lccahsetenergy( PTRTYPE calhit, float en) ;
+int lccahsetenergyerr( PTRTYPE calhit, float en) ;
+int lccahsettime( PTRTYPE calhit, float time) ;
+int lccahsetposition( PTRTYPE calhit, float pos[3]) ;
+int lccahsettype( PTRTYPE calhit, int type ) ;
+int lccahsetrawhit( PTRTYPE calhit, PTRTYPE rawHit ) ;
// now the fortran wrappers from cfortran.h
extern "C"{
lcio/src/cpp/include/IMPL
diff -u -r1.15 -r1.16
--- CalorimeterHitImpl.h 4 Aug 2006 16:52:46 -0000 1.15
+++ CalorimeterHitImpl.h 4 Jun 2008 17:37:16 -0000 1.16
@@ -13,7 +13,7 @@
/** Implementation of the real data CalorimeterHit.
*
* @author gaede
- * @version $Id: CalorimeterHitImpl.h,v 1.15 2006/08/04 16:52:46 gaede Exp $
+ * @version $Id: CalorimeterHitImpl.h,v 1.16 2008/06/04 17:37:16 engels Exp $
*/
class CalorimeterHitImpl : public EVENT::CalorimeterHit , public AccessChecked {
@@ -47,6 +47,11 @@
*/
virtual float getEnergy() const ;
+ /** Returns the error of the hit energy. Optional, check/set
+ * flag(LCIO::RCHBIT_ENERGY_ERROR)==1.
+ */
+ virtual float getEnergyError() const ;
+
/** Returns the time of the hit in [ns]. Optional, check/set
* flag(LCIO::RCHBIT_TIME)==1.
*/
@@ -86,6 +91,11 @@
*/
void setEnergy(float en) ;
+ /** Sets the error of the hit energy.
+ * Not stored if flag RCHBIT_ENERGY_ERROR isn't set
+ */
+ void setEnergyError(float enerr) ;
+
/** Sets the time.
*/
void setTime(float t) ;
@@ -103,6 +113,7 @@
int _cellID0 ;
int _cellID1 ;
float _energy ;
+ float _energyError ;
float _time ;
float _position[3] ;
int _type ;
lcio/src/cpp/src/CPPFORT
diff -u -r1.3 -r1.4
--- lccah.cc 23 Sep 2004 17:07:39 -0000 1.3
+++ lccah.cc 4 Jun 2008 17:37:16 -0000 1.4
@@ -10,79 +10,88 @@
CalorimeterHitImpl* hit = new CalorimeterHitImpl ;
return C2F_POINTER( LCObject*, hit ) ;
}
-int lccahdelete( PTRTYPE simcalhit ) {
- CalorimeterHitImpl* hit = f2c_pointer<CalorimeterHitImpl,LCObject>( simcalhit ) ;
+int lccahdelete( PTRTYPE calhit ) {
+ CalorimeterHitImpl* hit = f2c_pointer<CalorimeterHitImpl,LCObject>( calhit ) ;
delete hit ;
return LCIO::SUCCESS ;
}
-int lccahid( PTRTYPE simcalhit ) {
- CalorimeterHitImpl* hit = f2c_pointer<CalorimeterHitImpl,LCObject>( simcalhit ) ;
+int lccahid( PTRTYPE calhit ) {
+ CalorimeterHitImpl* hit = f2c_pointer<CalorimeterHitImpl,LCObject>( calhit ) ;
return hit->id() ;
}
-int lccahgetcellid0( PTRTYPE simcalhit ) {
- CalorimeterHitImpl* hit = f2c_pointer<CalorimeterHitImpl,LCObject>( simcalhit ) ;
+int lccahgetcellid0( PTRTYPE calhit ) {
+ CalorimeterHitImpl* hit = f2c_pointer<CalorimeterHitImpl,LCObject>( calhit ) ;
return hit->getCellID0() ;
}
-int lccahgetcellid1( PTRTYPE simcalhit ) {
- CalorimeterHitImpl* hit = f2c_pointer<CalorimeterHitImpl,LCObject>( simcalhit ) ;
+int lccahgetcellid1( PTRTYPE calhit ) {
+ CalorimeterHitImpl* hit = f2c_pointer<CalorimeterHitImpl,LCObject>( calhit ) ;
return hit->getCellID1() ;
}
-float lccahgetenergy( PTRTYPE simcalhit ) {
- CalorimeterHitImpl* hit = f2c_pointer<CalorimeterHitImpl,LCObject>( simcalhit ) ;
+float lccahgetenergy( PTRTYPE calhit ) {
+ CalorimeterHitImpl* hit = f2c_pointer<CalorimeterHitImpl,LCObject>( calhit ) ;
return hit->getEnergy() ;
}
-float lccahgettime( PTRTYPE simcalhit ) {
- CalorimeterHitImpl* hit = f2c_pointer<CalorimeterHitImpl,LCObject>( simcalhit ) ;
+float lccahgetenergyerr( PTRTYPE calhit ) {
+ CalorimeterHitImpl* hit = f2c_pointer<CalorimeterHitImpl,LCObject>( calhit ) ;
+ return hit->getEnergyError() ;
+}
+float lccahgettime( PTRTYPE calhit ) {
+ CalorimeterHitImpl* hit = f2c_pointer<CalorimeterHitImpl,LCObject>( calhit ) ;
return hit->getTime() ;
}
-int lccahgetposition( PTRTYPE simcalhit, float *pos) {
- CalorimeterHitImpl* hit = f2c_pointer<CalorimeterHitImpl,LCObject>( simcalhit ) ;
+int lccahgetposition( PTRTYPE calhit, float *pos) {
+ CalorimeterHitImpl* hit = f2c_pointer<CalorimeterHitImpl,LCObject>( calhit ) ;
for(int i=0;i<3; *pos++ = hit->getPosition()[i++] ) ;
return LCIO::SUCCESS ;
}
-int lccahgettype( PTRTYPE simcalhit ) {
- CalorimeterHitImpl* hit = f2c_pointer<CalorimeterHitImpl,LCObject>( simcalhit ) ;
+int lccahgettype( PTRTYPE calhit ) {
+ CalorimeterHitImpl* hit = f2c_pointer<CalorimeterHitImpl,LCObject>( calhit ) ;
return hit->getType() ;
}
-PTRTYPE lccahgetrawhit( PTRTYPE simcalhit ) {
- CalorimeterHitImpl* hit = f2c_pointer<CalorimeterHitImpl,LCObject>( simcalhit ) ;
+PTRTYPE lccahgetrawhit( PTRTYPE calhit ) {
+ CalorimeterHitImpl* hit = f2c_pointer<CalorimeterHitImpl,LCObject>( calhit ) ;
return C2F_POINTER( LCObject*, hit->getRawHit() ) ;
}
-int lccahsetcellid0( PTRTYPE simcalhit, int id0) {
- CalorimeterHitImpl* hit = f2c_pointer<CalorimeterHitImpl,LCObject>( simcalhit ) ;
+int lccahsetcellid0( PTRTYPE calhit, int id0) {
+ CalorimeterHitImpl* hit = f2c_pointer<CalorimeterHitImpl,LCObject>( calhit ) ;
hit->setCellID0( id0 ) ;
return LCIO::SUCCESS ;
}
-int lccahsetcellid1( PTRTYPE simcalhit, int id1) {
- CalorimeterHitImpl* hit = f2c_pointer<CalorimeterHitImpl,LCObject>( simcalhit ) ;
+int lccahsetcellid1( PTRTYPE calhit, int id1) {
+ CalorimeterHitImpl* hit = f2c_pointer<CalorimeterHitImpl,LCObject>( calhit ) ;
hit->setCellID1( id1 ) ;
return LCIO::SUCCESS ;
}
-int lccahsetenergy( PTRTYPE simcalhit, float en) {
- CalorimeterHitImpl* hit = f2c_pointer<CalorimeterHitImpl,LCObject>( simcalhit ) ;
+int lccahsetenergy( PTRTYPE calhit, float en) {
+ CalorimeterHitImpl* hit = f2c_pointer<CalorimeterHitImpl,LCObject>( calhit ) ;
hit->setEnergy( en ) ;
return LCIO::SUCCESS ;
}
-int lccahsettime( PTRTYPE simcalhit, float time) {
- CalorimeterHitImpl* hit = f2c_pointer<CalorimeterHitImpl,LCObject>( simcalhit ) ;
+int lccahsetenergyerr( PTRTYPE calhit, float enerr) {
+ CalorimeterHitImpl* hit = f2c_pointer<CalorimeterHitImpl,LCObject>( calhit ) ;
+ hit->setEnergyError( enerr ) ;
+ return LCIO::SUCCESS ;
+}
+int lccahsettime( PTRTYPE calhit, float time) {
+ CalorimeterHitImpl* hit = f2c_pointer<CalorimeterHitImpl,LCObject>( calhit ) ;
hit->setTime( time ) ;
return LCIO::SUCCESS ;
}
-int lccahsetposition( PTRTYPE simcalhit, float pos[3]) {
- CalorimeterHitImpl* hit = f2c_pointer<CalorimeterHitImpl,LCObject>( simcalhit ) ;
+int lccahsetposition( PTRTYPE calhit, float pos[3]) {
+ CalorimeterHitImpl* hit = f2c_pointer<CalorimeterHitImpl,LCObject>( calhit ) ;
hit->setPosition( pos ) ;
return LCIO::SUCCESS ;
}
-int lccahsettype( PTRTYPE simcalhit, int type) {
- CalorimeterHitImpl* hit = f2c_pointer<CalorimeterHitImpl,LCObject>( simcalhit ) ;
+int lccahsettype( PTRTYPE calhit, int type) {
+ CalorimeterHitImpl* hit = f2c_pointer<CalorimeterHitImpl,LCObject>( calhit ) ;
hit->setType( type ) ;
return LCIO::SUCCESS ;
}
-int lccahsetrawhit(PTRTYPE simcalhit, PTRTYPE rawHit) {
- CalorimeterHitImpl* hit = f2c_pointer<CalorimeterHitImpl,LCObject>( simcalhit ) ;
+int lccahsetrawhit(PTRTYPE calhit, PTRTYPE rawHit) {
+ CalorimeterHitImpl* hit = f2c_pointer<CalorimeterHitImpl,LCObject>( calhit ) ;
hit->setRawHit( f2c_pointer<LCObject,LCObject>( rawHit ) ) ;
return LCIO::SUCCESS ;
}
lcio/src/cpp/src/IMPL
diff -u -r1.10 -r1.11
--- CalorimeterHitImpl.cc 15 Apr 2005 08:37:46 -0000 1.10
+++ CalorimeterHitImpl.cc 4 Jun 2008 17:37:16 -0000 1.11
@@ -6,6 +6,7 @@
_cellID0(0),
_cellID1(0),
_energy(0.),
+ _energyError(0.),
_time(0.),
_type(0),
_rawHit(0) {
@@ -29,6 +30,10 @@
float CalorimeterHitImpl::getEnergy() const {
return _energy ;
}
+
+ float CalorimeterHitImpl::getEnergyError() const {
+ return _energyError ;
+ }
float CalorimeterHitImpl::getTime() const {
return _time ;
@@ -60,6 +65,11 @@
_energy = en ;
}
+ void CalorimeterHitImpl::setEnergyError(float enerr){
+ checkAccess("CalorimeterHitImpl::setEnergyError") ;
+ _energyError = enerr ;
+ }
+
void CalorimeterHitImpl::setTime(float t){
checkAccess("CalorimeterHitImpl::setTime") ;
_time = t ;
lcio/src/cpp/src/SIO
diff -u -r1.15 -r1.16
--- SIOCalHitHandler.cc 15 Apr 2005 08:37:49 -0000 1.15
+++ SIOCalHitHandler.cc 4 Jun 2008 17:37:16 -0000 1.16
@@ -42,6 +42,10 @@
}
SIO_DATA( stream , &(hit->_energy) , 1 ) ;
+ if( _vers > SIO_VERSION_ENCODE( 1, 9 ) && lcFlag.bitSet( LCIO::RCHBIT_ENERGY_ERROR )){
+ SIO_DATA( stream , &(hit->_energyError) , 1 ) ;
+ }
+
if( _vers > SIO_VERSION_ENCODE( 1, 2) && lcFlag.bitSet( LCIO::RCHBIT_TIME ) ){
SIO_DATA( stream , &(hit->_time) , 1 ) ;
@@ -89,6 +93,9 @@
LCSIO_WRITE( stream, hit->getCellID1() ) ;
}
LCSIO_WRITE( stream, hit->getEnergy() ) ;
+ if( lcFlag.bitSet( LCIO::RCHBIT_ENERGY_ERROR ) ){
+ LCSIO_WRITE( stream, hit->getEnergyError() ) ;
+ }
if( lcFlag.bitSet( LCIO::RCHBIT_TIME ) ){
LCSIO_WRITE( stream , hit->getTime() ) ;
lcio/src/cpp/src/UTIL
diff -u -r1.57 -r1.58
--- LCTOOLS.cc 3 Jun 2008 13:19:53 -0000 1.57
+++ LCTOOLS.cc 4 Jun 2008 17:37:16 -0000 1.58
@@ -993,6 +993,7 @@
cout << " LCIO::RCHBIT_ID1 : " << flag.bitSet( LCIO::RCHBIT_ID1 ) << endl ;
cout << " LCIO::RCHBIT_TIME : " << flag.bitSet( LCIO::RCHBIT_TIME ) << endl ;
cout << " LCIO::RCHBIT_NO_PTR : " << flag.bitSet( LCIO::RCHBIT_NO_PTR ) << endl ;
+ cout << " LCIO::RCHBIT_ENERGY_ERROR : " << flag.bitSet( LCIO::RCHBIT_ENERGY_ERROR ) << endl ;
int nHits = col->getNumberOfElements() ;
int nPrint = nHits > MAX_HITS ? MAX_HITS : nHits ;
@@ -1003,7 +1004,7 @@
std::cout << endl
- << " [ id ] | cellId0 | cellId1 | energy | position (x,y,z) |"
+ << " [ id ] | cellId0 | cellId1 | energy | energyerr | position (x,y,z) |"
<< endl ;
for( int i=0 ; i< nPrint ; i++ ){
@@ -1014,25 +1015,28 @@
int id0 = hit->getCellID0() ;
int id1 = hit->getCellID1() ;
- if( flag.bitSet( LCIO::CHBIT_LONG ) ){
- printf( " [%8.8x] | %8.8x | %8.8x |"
- " %5.3e | (%5.3e,%5.3e,%5.3e)|\n" ,
+ printf( " [%8.8x] | %8.8x | %8.8x | %5.3e | " ,
hit->id(),
id0,
id1,
- hit->getEnergy() ,
+ hit->getEnergy()
+ ) ;
+
+ if( flag.bitSet( LCIO::RCHBIT_ENERGY_ERROR ) ){
+ printf( "%5.3e | ", hit->getEnergyError() );
+ }
+ else{
+ printf( " - NA - | " );
+ }
+
+ if( flag.bitSet( LCIO::CHBIT_LONG ) ){
+ printf( "(%5.3e,%5.3e,%5.3e)|\n" ,
hit->getPosition()[0] ,
hit->getPosition()[1] ,
hit->getPosition()[2]
) ;
} else{
- printf( " [%8.8x] | %8.8x | %8.8x |"
- " %5.3e | no position available \n" ,
- hit->id(),
- id0,
- id1,
- hit->getEnergy()
- ) ;
+ printf( " no position available \n") ;
}
std::cout << " id-fields: (" << idDecoder( hit ).valueString() << ")" << std::endl ;
lcio/src/f77
diff -u -r1.38 -r1.39
--- lciof77api.inc 21 Sep 2006 06:10:47 -0000 1.38
+++ lciof77api.inc 4 Jun 2008 17:37:16 -0000 1.39
@@ -12,7 +12,7 @@
* H. Vogt
* 05/06/2004 (reconstruction part added)
*
-* $Id: lciof77api.inc,v 1.38 2006/09/21 06:10:47 gaede Exp $
+* $Id: lciof77api.inc,v 1.39 2008/06/04 17:37:16 engels Exp $
***************************************************
#include "lciof77pointer.inc"
@@ -158,9 +158,10 @@
c-----the CalorimeterHit interface
PTRTYPE lccahcreate
integer lccahid, lccahdelete, lccahgetcellid0, lccahgetcellid1
- real lccahgetenergy, lccahgettime
+ real lccahgetenergy, lccahgetenergyerr, lccahgettime
integer lccahgetposition,lccahgettype,lccahgetrawhit
- integer lccahsetcellid0, lccahsetcellid1, lccahsetenergy
+ integer lccahsetcellid0, lccahsetcellid1
+ integer lccahsetenergy, lccahsetenergyerr
integer lccahsetposition, lccahsettime,lccahsettype,lccahsetrawhit
c-----the Cluster interface
@@ -264,6 +265,7 @@
integer LCIO_RCHBIT_ID1
integer LCIO_RCHBIT_NO_PTR
integer LCIO_RCHBIT_TIME
+ integer LCIO_RCHBIT_ENERGY_ERROR
integer LCIO_THBIT_BARREL
integer LCIO_THBIT_MOMENTUM
integer LCIO_TRBIT_HITS
@@ -282,7 +284,8 @@
parameter (LCIO_CHBIT_LONG=31, LCIO_CHBIT_BARREL=30,
& LCIO_CHBIT_PDG=28, LCIO_CHBIT_ID1=29)
parameter (LCIO_RCHBIT_LONG=31, LCIO_RCHBIT_BARREL=30,
- & LCIO_RCHBIT_ID1=29, LCIO_RCHBIT_NO_PTR=28)
+ & LCIO_RCHBIT_ID1=29, LCIO_RCHBIT_NO_PTR=28,
+ & LCIO_RCHBIT_TIME=27, LCIO_RCHBIT_ENERGY_ERROR=26)
parameter (LCIO_THBIT_BARREL=31)
parameter (LCIO_THBIT_MOMENTUM=30)
parameter (LCIO_TRBIT_HITS=31)
lcio/src/java/hep/lcio/implementation/event
diff -u -r1.9 -r1.10
--- ICalorimeterHit.java 24 Sep 2004 10:39:28 -0000 1.9
+++ ICalorimeterHit.java 4 Jun 2008 17:37:16 -0000 1.10
@@ -6,13 +6,14 @@
/**
* A default implementation of CalorimeterHit
* @author Tony Johnson
- * @version $Id: ICalorimeterHit.java,v 1.9 2004/09/24 10:39:28 tonyj Exp $
+ * @version $Id: ICalorimeterHit.java,v 1.10 2008/06/04 17:37:16 engels Exp $
*/
public class ICalorimeterHit extends ILCObject implements CalorimeterHit
{
protected float[] position = new float[3];
protected float time;
protected float energy;
+ protected float energyError;
protected int cellId0;
protected int cellId1;
protected int type;
@@ -50,6 +51,11 @@
{
return energy;
}
+
+ public float getEnergyError()
+ {
+ return energyError;
+ }
public void setPosition(float[] pos)
{
lcio/src/java/hep/lcio/implementation/sio
diff -u -r1.19 -r1.20
--- SIOCalorimeterHit.java 7 Nov 2007 20:46:22 -0000 1.19
+++ SIOCalorimeterHit.java 4 Jun 2008 17:37:16 -0000 1.20
@@ -15,7 +15,7 @@
/**
*
* @author Tony Johnson
- * @version $Id: SIOCalorimeterHit.java,v 1.19 2007/11/07 20:46:22 jeremy Exp $
+ * @version $Id: SIOCalorimeterHit.java,v 1.20 2008/06/04 17:37:16 engels Exp $
*/
class SIOCalorimeterHit extends ICalorimeterHit
{
@@ -27,6 +27,9 @@
if ((flags & (1 << LCIO.RCHBIT_ID1)) != 0 || ( major == 0 && minor == 8) ) cellId1 = in.readInt();
else cellId1 = 0;
energy = in.readFloat();
+ if (1000*major+minor>1009 && (flags&(1<<LCIO.RCHBIT_ENERGY_ERROR)) != 0){
+ energyError = in.readFloat();
+ }
if (1000*major+minor>1002 && (flags&(1<<LCIO.RCHBIT_TIME)) != 0)
{
time = in.readFloat();
@@ -63,6 +66,7 @@
out.writeInt(hit.getCellID0());
if ((flags & (1 << LCIO.RCHBIT_ID1)) != 0) out.writeInt(hit.getCellID1());
out.writeFloat(hit.getEnergy());
+ if ((flags & (1 << LCIO.RCHBIT_ENERGY_ERROR)) != 0) out.writeFloat(hit.getEnergyError());
if ((flags & (1 << LCIO.RCHBIT_TIME)) != 0) out.writeFloat(hit.getTime());
if ((flags & (1 << LCIO.RCHBIT_LONG)) != 0)
{
@@ -84,6 +88,7 @@
out.writeInt(cellId0);
if ((flags & (1 << LCIO.RCHBIT_ID1)) != 0) out.writeInt(cellId1);
out.writeFloat(energy);
+ if ((flags & (1 << LCIO.RCHBIT_ENERGY_ERROR)) != 0) out.writeFloat(energyError);
if ((flags & (1 << LCIO.RCHBIT_TIME)) != 0) out.writeFloat(time);
if ((flags & (1 << LCIO.RCHBIT_LONG)) != 0)
lcio/src/java/hep/lcio/util
diff -u -r1.10 -r1.11
--- Printer.java 20 Nov 2007 23:41:44 -0000 1.10
+++ Printer.java 4 Jun 2008 17:37:16 -0000 1.11
@@ -409,7 +409,7 @@
{
void print(LCCollection coll, int nprint)
{
- ps.println(" [ id ] | [cellID0] | [cellID1] | energy | position (x,y,z) ");
+ ps.println(" [ id ] | [cellID0] | [cellID1] | energy | energyerr | position (x,y,z) ");
for (int i = 0; i < nprint; i++)
{
@@ -420,13 +420,24 @@
int flag = coll.getFlag();
+ ps.format(" [%08x] | [%08x] | [%08x] | %5.3e | ",
+ Integer.valueOf(hit.hashCode()),
+ Integer.valueOf(id0),
+ Integer.valueOf(id1),
+ Double.valueOf(hit.getEnergy())
+ );
+
+ if ((flag & (1 << LCIO.RCHBIT_ENERGY_ERROR)) != 0){
+ ps.format("%5.3e | ", Double.valueOf(hit.getEnergyError()));
+ }
+ else{
+ ps.format(" - NA - | ");
+ }
+
+
if ((flag & (1 << LCIO.CHBIT_LONG)) != 0)
{
- ps.format(" [%08x] | [%08x] | [%08x] | %5.3e | (%5.3e,%5.3e,%5.3e)\n",
- Integer.valueOf(hit.hashCode()),
- Integer.valueOf(id0),
- Integer.valueOf(id1),
- Double.valueOf(hit.getEnergy()),
+ ps.format("(%5.3e,%5.3e,%5.3e)\n",
Double.valueOf(hit.getPosition()[0]),
Double.valueOf(hit.getPosition()[1]),
Double.valueOf(hit.getPosition()[2])
@@ -434,11 +445,7 @@
}
else
{
- ps.format(" [%08x] | [%08x] | %5.3e | no position available \n",
- Integer.valueOf(id0),
- Integer.valueOf(id1),
- Double.valueOf(hit.getEnergy())
- );
+ ps.format(" no position available \n");
}
//ps.print(" id-fields: (" + idDecoder( hit ).valueString() << ")" << std::endl ;
lcio/src/latex/manual
diff -u -r1.45 -r1.46
--- manual.tex 8 Nov 2007 17:38:43 -0000 1.45
+++ manual.tex 4 Jun 2008 17:37:16 -0000 1.46
@@ -49,8 +49,8 @@
\begin{document}
\pdfgraphics
-%\title{LCIO [v01-08] - Users manual}
-\title{{\Huge\bf LCIO - Users manual} \\ v01-09}
+%\title{LCIO [v01-10] - Users manual}
+\title{{\Huge\bf LCIO - Users manual} \\ v01-10}
%\author{F. Gaede \\ DESY IT}
%\author{F. Gaede, H. Vogt \\ DESY IT, DESY Zeuthen}
lcio/src/python
diff -u -r1.8 -r1.9
--- lcio_swig.i 25 Oct 2006 23:35:09 -0000 1.8
+++ lcio_swig.i 4 Jun 2008 17:37:16 -0000 1.9
@@ -1,4 +1,4 @@
-// $Id: lcio_swig.i,v 1.8 2006/10/25 23:35:09 jeremy Exp $
+// $Id: lcio_swig.i,v 1.9 2008/06/04 17:37:16 engels Exp $
/*
* Process this file with Swig to make a Python wrapper for LCIO.
@@ -377,6 +377,7 @@
static const int RCHBIT_ID1;
static const int RCHBIT_NO_PTR;
static const int RCHBIT_TIME;
+ static const int RCHBIT_ENERGY_ERROR;
static const int TRAWBIT_ID1;
static const int THBIT_BARREL;
static const int THBIT_MOMENTUM;
CVSspam 0.2.8