Print

Print


Commit in lcio on MAIN
CMakeLists.txt+2-21.50 -> 1.51
config/lcio.properties+3-31.67 -> 1.68
doc/index.html+1-11.12 -> 1.13
   /lcio.xml+23-231.63 -> 1.64
   /versions.readme+3-21.73 -> 1.74
sio/CMakeLists.txt+2-21.19 -> 1.20
src/aid/EVENT/LCIO.aid+4-41.67 -> 1.68
src/cpp/include/lcio.h+2-21.33 -> 1.34
src/latex/manual/manual.tex+7-71.47 -> 1.48
+47-46
9 modified files
---------------- version v01-11 ----------------------

lcio
CMakeLists.txt 1.50 -> 1.51
diff -u -r1.50 -r1.51
--- CMakeLists.txt	20 Nov 2008 17:02:01 -0000	1.50
+++ CMakeLists.txt	13 Dec 2008 13:13:49 -0000	1.51
@@ -20,8 +20,8 @@
 
 # project version
 SET( LCIO_MAJOR_VERSION 1 )
-SET( LCIO_MINOR_VERSION 10 )
-SET( LCIO_PATCH_LEVEL 3 )
+SET( LCIO_MINOR_VERSION 11 )
+SET( LCIO_PATCH_LEVEL 0 )
 
 # project options
 OPTION( BUILD_SHARED_LIBS "Set to OFF to build static libraries" ON )

lcio/config
lcio.properties 1.67 -> 1.68
diff -u -r1.67 -r1.68
--- lcio.properties	23 Oct 2008 19:16:42 -0000	1.67
+++ lcio.properties	13 Dec 2008 13:13:50 -0000	1.68
@@ -1,7 +1,7 @@
 # ANT property file for LCIO
 #
 # Author: Mark Donszelmann
-# Version: $Id: lcio.properties,v 1.67 2008/10/23 19:16:42 engels Exp $
+# Version: $Id: lcio.properties,v 1.68 2008/12/13 13:13:50 gaede Exp $
 #
 debug=true
 
@@ -11,7 +11,7 @@
 
 mainpackage=hep/lcio/event
 title=LCIO Linear Collider IO
-version=v01-10-02
+version=v01-11
 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-10-02
+dist.version=v01-11
 dist.dst=release
 dist.doc.dst=release
 dist.dir=dist

lcio/doc
index.html 1.12 -> 1.13
diff -u -r1.12 -r1.13
--- index.html	24 Oct 2008 07:27:59 -0000	1.12
+++ index.html	13 Dec 2008 13:13:50 -0000	1.13
@@ -4,7 +4,7 @@
 
 <body>
 <hr>
-<h1>Documentation for LCIO v01-10-02</h1>
+<h1>Documentation for LCIO v01-11</h1>
 
 
 <hr>

lcio/doc
lcio.xml 1.63 -> 1.64
diff -u -r1.63 -r1.64
--- lcio.xml	4 Jun 2008 20:13:38 -0000	1.63
+++ lcio.xml	13 Dec 2008 13:13:50 -0000	1.64
@@ -13,7 +13,7 @@
 -->
 <sio>
   <record name="LCRunHeader">
-     <block name="RunHeader" major="1" minor="10">
+     <block name="RunHeader" major="1" minor="11">
         <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="10">
+     <block name="EventHeader" major="1" minor="11">
         <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="10">
+      <block name="MCParticle" major="1" minor="11">
          <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="10">
+      <block name="SimTrackerHit" major="1" minor="11">
          <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="10">
+      <block name="SimCalorimeterHit" major="1" minor="11">
          <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="10">
+      <block name="LCFloatVec" major="1" minor="11">
          <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="10">
+      <block name="LCIntVec" major="1" minor="11">
          <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="10">
+      <block name="LCStrVec" major="1" minor="11">
          <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="10">
+      <block name="RawCalorimeterHit" major="1" minor="11">
          <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="10">
+      <block name="CalorimeterHit" major="1" minor="11">
          <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; Bit 26 = 1: energy error stored;
@@ -232,7 +232,7 @@
             </if>
          </repeat>
       </block>
-      <block name="TrackerHit" major="1" minor="10">
+      <block name="TrackerHit" major="1" minor="11">
          <data type="int" name="flags">Bits 0-15 user/detector specific</data>
          <include subroutine="namedParameters"/>
          <data type="int" name="n"></data>
@@ -256,7 +256,7 @@
             <data type="ptag" name="this"></data>
          </repeat>
       </block>
-      <block name="TPCHit" major="1" minor="10">
+      <block name="TPCHit" major="1" minor="11">
          <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>
@@ -282,7 +282,7 @@
             </if>
          </repeat>
       </block>
-      <block name="TrackerRawData" major="1" minor="10">
+      <block name="TrackerRawData" major="1" minor="11">
          <data type="int" name="flags">Bits 0-15 user/detector specific</data>
          <include subroutine="namedParameters"/>
          <data type="int" name="n"></data>
@@ -300,7 +300,7 @@
             <data type="ptag" name="this"></data>
          </repeat>
       </block>
-      <block name="TrackerData" major="1" minor="10">
+      <block name="TrackerData" major="1" minor="11">
          <data type="int" name="flags">Bits 0-15 user/detector specific</data>
          <include subroutine="namedParameters"/>
          <data type="int" name="n"></data>
@@ -318,7 +318,7 @@
             <data type="ptag" name="this"></data>
          </repeat>
       </block>
-      <block name="TrackerPulse" major="1" minor="10">
+      <block name="TrackerPulse" major="1" minor="11">
          <data type="int" name="flags">Bits 0-15 user/detector specific</data>
          <include subroutine="namedParameters"/>
          <data type="int" name="n"></data>
@@ -334,7 +334,7 @@
             <data type="ptag" name="this"></data>
          </repeat>
       </block>
-      <block name="SiliconRawHit" major="1" minor="10">
+      <block name="SiliconRawHit" major="1" minor="11">
          <data type="int" name="flags">Bits 0-15 user/detector specific</data>
          <include subroutine="namedParameters"/>
          <data type="int" name="n"></data>
@@ -346,7 +346,7 @@
             <data type="ptag" name="this"></data>
          </repeat>
       </block>
-    <block name="Track" major="1" minor="10">
+    <block name="Track" major="1" minor="11">
       <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"/>
@@ -382,7 +382,7 @@
       <data type="ptag" name="this"></data>
       </repeat>
     </block>
-    <block name="Cluster" major="1" minor="10">
+    <block name="Cluster" major="1" minor="11">
       <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"/>
@@ -436,7 +436,7 @@
         <data type="ptag" name="this"></data>
       </repeat>
     </block>
-    <block name="Vertex" major="1" minor="10">
+    <block name="Vertex" major="1" minor="11">
       <data type="int" name="flag"></data>
       <include subroutine="namedParameters"/>
       <data type="int" name="nVertex"></data>
@@ -455,7 +455,7 @@
         <data type="ptag" name="this"></data>
     </repeat>
     </block>
-    <block name="ReconstructedParticle" major="1" minor="10">
+    <block name="ReconstructedParticle" major="1" minor="11">
       <data type="int" name="flag"></data>
       <include subroutine="namedParameters"/>
       <data type="int" name="nObject"/>
@@ -531,7 +531,7 @@
         <data type="ptag" name="this"></data>
       </repeat>
     </block>
-    <block name="LCGenericObject" major="1" minor="10">
+    <block name="LCGenericObject" major="1" minor="11">
       <data type="int" name="flag"></data>
         <include subroutine="namedParameters"/>
         <if condition="(flag&amp;(1&lt;&lt;31)) !=0">
@@ -558,7 +558,7 @@
         <data type="ptag" name="this"></data>
       </repeat>
     </block>
-    <block name="LCRelation" major="1" minor="10">
+    <block name="LCRelation" major="1" minor="11">
        <data type="int" name="flag">Bit 31: 1[0] Weights are [not] stored</data>
        <include subroutine="namedParameters"/>
        <data type="int" name="nRelations"/>
@@ -571,7 +571,7 @@
        </repeat>
     </block>
       <!-- generic block description for subset collections that hold references to existing objects -->
-      <block name="References" major="1" minor="10">
+      <block name="References" major="1" minor="11">
          <data type="int" name="flags"></data>
          <include subroutine="namedParameters"/>
          <data type="int" name="nReferences"></data>

lcio/doc
versions.readme 1.73 -> 1.74
diff -u -r1.73 -r1.74
--- versions.readme	10 Dec 2008 08:10:59 -0000	1.73
+++ versions.readme	13 Dec 2008 13:13:50 -0000	1.74
@@ -5,11 +5,12 @@
 =====================
  v01-11
 =====================
-  - direct (random) access made optional (C++):
+  - made direct (random) access mode in C++ optional:
     use  LCFactory::getInstance()->createLCReader(LCReader::directAccess) if
     direct access is need (default is off, i.e. 'no recreating of event map' 
     when opening a file )
-
+  - bug fixes and improvements in C++
+    (CMake build procedure, compatibility w/ gcc4.x, 32bit compatibility mode)
 
 =====================
 v01-10-03

lcio/sio
CMakeLists.txt 1.19 -> 1.20
diff -u -r1.19 -r1.20
--- CMakeLists.txt	27 Nov 2008 16:48:54 -0000	1.19
+++ CMakeLists.txt	13 Dec 2008 13:13:50 -0000	1.20
@@ -9,8 +9,8 @@
 
 # project version
 SET( SIO_MAJOR_VERSION 1 )
-SET( SIO_MINOR_VERSION 10 )
-SET( SIO_PATCH_LEVEL 3 )
+SET( SIO_MINOR_VERSION 11 )
+SET( SIO_PATCH_LEVEL 0 )
 
 # library *nix style versioning
 SET( SIO_SOVERSION "${SIO_MAJOR_VERSION}.${SIO_MINOR_VERSION}" )

lcio/src/aid/EVENT
LCIO.aid 1.67 -> 1.68
diff -u -r1.67 -r1.68
--- LCIO.aid	7 Nov 2008 15:58:05 -0000	1.67
+++ LCIO.aid	13 Dec 2008 13:13:50 -0000	1.68
@@ -3,8 +3,8 @@
 @ifdef cpp
 @cpp{
 #define LCIO_MAJOR_VERSION 1
-#define LCIO_MINOR_VERSION 10
-#define LCIO_PATCH_LEVEL 3
+#define LCIO_MINOR_VERSION 11
+#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.67 2008/11/07 15:58:05 gaede Exp $
+ * @version $Id: LCIO.aid,v 1.68 2008/12/13 13:13:50 gaede Exp $
  * @see LCObject
  * @see LCIO
  */
@@ -116,7 +116,7 @@
 @else
     // current version number of lcio
   public static const int MAJORVERSION  = 1 ; 
-  public static const int MINORVERSION  = 10 ;
+  public static const int MINORVERSION  = 11 ;
 
 
   // bits in flag words

lcio/src/cpp/include
lcio.h 1.33 -> 1.34
diff -u -r1.33 -r1.34
--- lcio.h	23 Oct 2008 19:16:42 -0000	1.33
+++ lcio.h	13 Dec 2008 13:13:50 -0000	1.34
@@ -7,7 +7,7 @@
  * documentation with doxygen. 
  * 
  * @author gaede
- * @version $Id: lcio.h,v 1.33 2008/10/23 19:16:42 engels Exp $ 
+ * @version $Id: lcio.h,v 1.34 2008/12/13 13:13:50 gaede 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-10-02) 
+/** \mainpage <a href="http://lcio.desy.de">LCIO</a> (v01-11) 
  * 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/latex/manual
manual.tex 1.47 -> 1.48
diff -u -r1.47 -r1.48
--- manual.tex	23 Oct 2008 19:16:42 -0000	1.47
+++ manual.tex	13 Dec 2008 13:13:50 -0000	1.48
@@ -49,8 +49,8 @@
 \begin{document}
 \pdfgraphics
 
-%\title{LCIO [v01-10] -  Users manual}
-\title{{\Huge\bf LCIO  -  Users manual} \\ v01-10}
+%\title{LCIO [v01-11] -  Users manual}
+\title{{\Huge\bf LCIO  -  Users manual} \\ v01-11}
 
 %\author{F. Gaede \\  DESY IT}
 %\author{F. Gaede, H. Vogt \\  DESY IT, DESY Zeuthen}
@@ -101,7 +101,7 @@
 \begin{verbatim}
   mkdir lcio 
   cd lcio
-  cvs co -d v01-10-02 -r v01-10-02 lcio
+  cvs co -d v01-11 -r v01-11 lcio
 \end{verbatim}
 
 \subsection{Requirements}
@@ -120,7 +120,7 @@
 \subsection{Building LCIO} \label{build_lcio}
 
 There are two build tools that can be used to build LCIO: ant and CMake~\cite{ref_cmake}. 
-CMake~\cite{ref_cmake} has been introduced in version v01-10-02 to facilitate cross plattform support for 
+CMake~\cite{ref_cmake} has been introduced in version v01-11 to facilitate cross plattform support for 
 the C++ version. Building LCIO with CMake is the preferred way within the LDC ilcsoft framework, however
 the {\em classic} way of building LCIO with ant is still fully supported, in fact CMake also uses the ant commands for Java and 
 for generating the documentation.
@@ -157,7 +157,7 @@
 \begin{itemize}
 \item{ {\bf Linux (and bash):} 
 \begin{verbatim} 
-  export LCIO=/lcio/v01-10-02                <-- modify as appropriate
+  export LCIO=/lcio/v01-11                <-- modify as appropriate
   export PATH=$LCIO/tools:$LCIO/bin:$PATH
 
   export JDK_HOME=/usr/lib/j2sdk             <-- modify as appropriate
@@ -179,7 +179,7 @@
 }
 \item{ {\bf Windows/Cygwin - Cygwin shell (bash):} 
 \begin{verbatim}
-  export LCIO=/cygdrive/c/lcio/devel/v01-10-02   <-- modify as appropriate
+  export LCIO=/cygdrive/c/lcio/devel/v01-11   <-- modify as appropriate
   export PATH=$LCIO/tools:$LCIO/bin:$PATH
   export JDK_HOME=/cygdrive/c/j2sdk1.4.1_01      <-- modify as appropriate
 \end{verbatim} %$
@@ -206,7 +206,7 @@
 %\end{verbatim}
 %or using {\it bash}:
 %\begin{verbatim}
-%  cd v01-10-02
+%  cd v01-11
 %  export LCIO=$PWD
 %  export JDK_HOME=/usr/lib/j2sdk          <-- modify as appropriate
 %  export PATH=$LCIO/tools:$PATH
CVSspam 0.2.8