Print

Print
Commit in lcio on v01-07-vtx
config/lcio.properties+3-31.55 -> 1.55.2.1
doc/index.html+1-11.5 -> 1.5.4.1
   /lcio.xml+22-221.59 -> 1.59.4.1
src/aid/EVENT/LCIO.aid+3-31.53.4.1 -> 1.53.4.2
src/cpp/include/lcio.h+2-21.24 -> 1.24.4.1
src/cpp/src/SIO/SIOReconstructedParticleHandler.cc+151.11 -> 1.11.6.1
src/latex/manual/manual.tex+7-71.38 -> 1.38.4.1
+53-38
7 modified files
added reconstructed particle IO functionality for vertices
changed LCIO to version 01-08
doc/lcio.xml is not complete yet!!! vertex block and reconstructed particle data format for vertices still missing
lcio/config
lcio.properties 1.55 -> 1.55.2.1
diff -u -r1.55 -r1.55.2.1
--- lcio.properties	28 Jun 2006 23:25:17 -0000	1.55
+++ lcio.properties	15 Aug 2006 15:56:45 -0000	1.55.2.1
@@ -1,7 +1,7 @@

 # ANT property file for LCIO
 #
 # Author: Mark Donszelmann

-# Version: $Id: lcio.properties,v 1.55 2006/06/28 23:25:17 jeremy Exp $

+# Version: $Id: lcio.properties,v 1.55.2.1 2006/08/15 15:56:45 engels Exp $

 #
 debug=true
 

@@ -11,7 +11,7 @@

 
 mainpackage=hep/lcio/event
 title=LCIO Linear Collider IO

-version=v01-07

+version=v01-08

 copyright=Copyright &\#169; 2002-2003 LCIO Team, All Rights Reserved.
 name=lcio-event
 packages=hep.lcio.event.*

@@ -136,7 +136,7 @@

 #
 # General definitions for project wide targets
 #

-dist.version=v01-07

+dist.version=v01-08

 dist.dst=release
 dist.doc.dst=release
 dist.dir=dist
lcio/doc
index.html 1.5 -> 1.5.4.1
diff -u -r1.5 -r1.5.4.1
--- index.html	8 Mar 2006 09:57:26 -0000	1.5
+++ index.html	15 Aug 2006 15:56:46 -0000	1.5.4.1
@@ -4,7 +4,7 @@

 
 <body>
 <hr>

-<h1>Documentation for LCIO v01-07</h1>

+<h1>Documentation for LCIO v01-088888888</h1>

 
 
 <hr>
lcio/doc
lcio.xml 1.59 -> 1.59.4.1
diff -u -r1.59 -r1.59.4.1
--- lcio.xml	8 Mar 2006 09:57:26 -0000	1.59
+++ lcio.xml	15 Aug 2006 15:56:46 -0000	1.59.4.1
@@ -13,7 +13,7 @@

 -->
 <sio>
   <record name="LCRunHeader">

-     <block name="RunHeader" major="1" minor="7">

+     <block name="RunHeader" major="1" minor="8">

         <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="7">

+     <block name="EventHeader" major="1" minor="8">

         <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="7">

+      <block name="MCParticle" major="1" minor="8">

          <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="7">

+      <block name="SimTrackerHit" major="1" minor="8">

          <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="7">

+      <block name="SimCalorimeterHit" major="1" minor="8">

          <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="7">

+      <block name="LCFloatVec" major="1" minor="8">

          <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="7">

+      <block name="LCIntVec" major="1" minor="8">

          <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="7">

+      <block name="LCStrVec" major="1" minor="8">

          <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="7">

+      <block name="RawCalorimeterHit" major="1" minor="8">

          <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="7">

+      <block name="CalorimeterHit" major="1" minor="8">

          <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>

@@ -228,7 +228,7 @@

             </if>
          </repeat>
       </block>

-      <block name="TrackerHit" major="1" minor="7">

+      <block name="TrackerHit" major="1" minor="8">

          <data type="int" name="flags">Bits 0-15 user/detector specific</data>
          <include subroutine="namedParameters"/>
          <data type="int" name="n"></data>

@@ -252,7 +252,7 @@

             <data type="ptag" name="this"></data>
          </repeat>
       </block>

-      <block name="TPCHit" major="1" minor="7">

+      <block name="TPCHit" major="1" minor="8">

          <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 +278,7 @@

             </if>
          </repeat>
       </block>

-      <block name="TrackerRawData" major="1" minor="7">

+      <block name="TrackerRawData" major="1" minor="8">

          <data type="int" name="flags">Bits 0-15 user/detector specific</data>
          <include subroutine="namedParameters"/>
          <data type="int" name="n"></data>

@@ -296,7 +296,7 @@

             <data type="ptag" name="this"></data>
          </repeat>
       </block>

-      <block name="TrackerData" major="1" minor="7">

+      <block name="TrackerData" major="1" minor="8">

          <data type="int" name="flags">Bits 0-15 user/detector specific</data>
          <include subroutine="namedParameters"/>
          <data type="int" name="n"></data>

@@ -314,7 +314,7 @@

             <data type="ptag" name="this"></data>
          </repeat>
       </block>

-      <block name="TrackerPulse" major="1" minor="7">

+      <block name="TrackerPulse" major="1" minor="8">

          <data type="int" name="flags">Bits 0-15 user/detector specific</data>
          <include subroutine="namedParameters"/>
          <data type="int" name="n"></data>

@@ -330,7 +330,7 @@

             <data type="ptag" name="this"></data>
          </repeat>
       </block>

-      <block name="SiliconRawHit" major="1" minor="7">

+      <block name="SiliconRawHit" major="1" minor="8">

          <data type="int" name="flags">Bits 0-15 user/detector specific</data>
          <include subroutine="namedParameters"/>
          <data type="int" name="n"></data>

@@ -342,7 +342,7 @@

             <data type="ptag" name="this"></data>
          </repeat>
       </block>

-    <block name="Track" major="1" minor="7">

+    <block name="Track" major="1" minor="8">

       <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 +378,7 @@

       <data type="ptag" name="this"></data>
       </repeat>
     </block>

-    <block name="Cluster" major="1" minor="7">

+    <block name="Cluster" major="1" minor="8">

       <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 +432,7 @@

         <data type="ptag" name="this"></data>
       </repeat>
     </block>

-    <block name="ReconstructedParticle" major="1" minor="7">

+    <block name="ReconstructedParticle" major="1" minor="8">

       <data type="int" name="flag"></data>
       <include subroutine="namedParameters"/>
       <data type="int" name="nObject"/>

@@ -504,7 +504,7 @@

         <data type="ptag" name="this"></data>
       </repeat>
     </block>

-    <block name="LCGenericObject" major="1" minor="7">

+    <block name="LCGenericObject" major="1" minor="8">

       <data type="int" name="flag"></data>
         <include subroutine="namedParameters"/>
         <if condition="(flag&amp;(1&lt;&lt;31)) !=0">

@@ -531,7 +531,7 @@

         <data type="ptag" name="this"></data>
       </repeat>
     </block>

-    <block name="LCRelation" major="1" minor="7">

+    <block name="LCRelation" major="1" minor="8">

        <data type="int" name="flag">Bit 31: 1[0] Weights are [not] stored</data>
        <include subroutine="namedParameters"/>
        <data type="int" name="nRelations"/>

@@ -544,7 +544,7 @@

        </repeat>
     </block>
       <!-- generic block description for subset collections that hold references to exisitng objects -->

-      <block name="References" major="1" minor="7">

+      <block name="References" major="1" minor="8">

          <data type="int" name="flags"></data>
          <include subroutine="namedParameters"/>
          <data type="int" name="nReferences"></data>
lcio/src/aid/EVENT
LCIO.aid 1.53.4.1 -> 1.53.4.2
diff -u -r1.53.4.1 -r1.53.4.2
--- LCIO.aid	15 Aug 2006 13:01:09 -0000	1.53.4.1
+++ LCIO.aid	15 Aug 2006 15:56:47 -0000	1.53.4.2
@@ -3,7 +3,7 @@

 @ifdef cpp
 @cpp{
 #define LCIO_MAJOR_VERSION 1

-#define LCIO_MINOR_VERSION 7

+#define LCIO_MINOR_VERSION 8

 #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.53.4.1 2006/08/15 13:01:09 engels Exp $

+ * @version $Id: LCIO.aid,v 1.53.4.2 2006/08/15 15:56:47 engels 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  = 7 ;

+  public static const int MINORVERSION  = 8 ;

 
   // bits in flag words
   // SimCalorimeterHit (CH)
lcio/src/cpp/include
lcio.h 1.24 -> 1.24.4.1
diff -u -r1.24 -r1.24.4.1
--- lcio.h	8 Mar 2006 09:57:27 -0000	1.24
+++ lcio.h	15 Aug 2006 15:56:47 -0000	1.24.4.1
@@ -7,7 +7,7 @@

  * documentation with doxygen. 
  * 
  * @author gaede

- * @version $Id: lcio.h,v 1.24 2006/03/08 09:57:27 gaede Exp $ 

+ * @version $Id: lcio.h,v 1.24.4.1 2006/08/15 15:56:47 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-07) 

+/** \mainpage <a href="http://lcio.desy.de">LCIO</a> (v01-08) 

  * 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/src/SIO
SIOReconstructedParticleHandler.cc 1.11 -> 1.11.6.1
diff -u -r1.11 -r1.11.6.1
--- SIOReconstructedParticleHandler.cc	27 May 2005 07:55:55 -0000	1.11
+++ SIOReconstructedParticleHandler.cc	15 Aug 2006 15:56:47 -0000	1.11.6.1
@@ -111,6 +111,14 @@

 	SIO_PNTR( stream , &(recP->_clusters[i] ) ) ;
       }
       

+      if( _vers > SIO_VERSION_ENCODE( 1,8 )   ) {
+	
+	//read pointers to start/end vertices
+	SIO_PNTR( stream ,   &(recP->_sv) ) ;
+	SIO_PNTR( stream ,   &(recP->_ev) ) ;
+      }
+      
+      

     } else {   // old version (1.0-1.2 keep for a while - no official release !! )
 
       int typeFlag ;

@@ -314,6 +322,13 @@

 //       LCSIO_WRITE( stream, recP->getMCParticleWeights()[i]  ) ;
 //     }
 

+    // write pointers to start/end vertices
+    EVENT::Vertex* sv = recP->getStartVertex() ;
+    EVENT::Vertex* ev = recP->getEndVertex() ;
+    SIO_PNTR( stream , &sv  ) ;
+    SIO_PNTR( stream , &ev  ) ;
+
+

     // write a ptag in order to be able to point to recPs
     SIO_PTAG( stream , recP ) ;
lcio/src/latex/manual
manual.tex 1.38 -> 1.38.4.1
diff -u -r1.38 -r1.38.4.1
--- manual.tex	28 Mar 2006 17:19:27 -0000	1.38
+++ manual.tex	15 Aug 2006 15:56:48 -0000	1.38.4.1
@@ -49,8 +49,8 @@

 \begin{document}
 \pdfgraphics
 

-%\title{LCIO [v01-07] -  Users manual}
-\title{{\Huge\bf LCIO  -  Users manual} \\ v01-07}

+%\title{LCIO [v01-08] -  Users manual}
+\title{{\Huge\bf LCIO  -  Users manual} \\ v01-08}

 
 %\author{F. Gaede \\  DESY IT}
 %\author{F. Gaede, H. Vogt \\  DESY IT, DESY Zeuthen}

@@ -95,7 +95,7 @@

 \begin{verbatim}
   mkdir lcio 
   cd lcio

-  cvs co -d v01-07 -r v01-07 lcio

+  cvs co -d v01-08 -r v01-08 lcio

 \end{verbatim}
 
 \subsection{Requirements}

@@ -116,7 +116,7 @@

 \begin{itemize}
 \item{ {\bf Linux (and bash):} 
 \begin{verbatim} 

-  export LCIO=/lcio/v01-07                <-- modify as appropriate

+  export LCIO=/lcio/v01-08                <-- modify as appropriate

   export PATH=$LCIO/tools:$LCIO/bin:$PATH
 
   export JDK_HOME=/usr/lib/j2sdk          <-- modify as appropriate

@@ -129,7 +129,7 @@

 \begin{verbatim}
   set PATH=c:/cygwin/bin;%PATH%            <-- modify as appropriate
 

-  set LCIO=c:/lcio/devel/v01-07            <-- modify as appropriate

+  set LCIO=c:/lcio/devel/v01-08            <-- modify as appropriate

   set JDK_HOME=c:/j2sdk1.4.1_01            <-- modify as appropriate 
 
   set PATH=%LCIO%/tools;%LCIO%/bin;%PATH%

@@ -138,7 +138,7 @@

 }
 \item{ {\bf Windows/Cygwin - Cygwin shell (bash):} 
 \begin{verbatim}

-  export LCIO=/cygdrive/c/lcio/devel/v01-07   <-- modify as appropriate

+  export LCIO=/cygdrive/c/lcio/devel/v01-08   <-- modify as appropriate

   export PATH=$LCIO/tools:$LCIO/bin:$PATH
   export JDK_HOME=/cygdrive/c/j2sdk1.4.1_01  <-- modify as appropriate
 \end{verbatim} %$

@@ -165,7 +165,7 @@

 %\end{verbatim}
 %or using {\it bash}:
 %\begin{verbatim}

-%  cd v01-07

+%  cd v01-08

 %  export LCIO=$PWD
 %  export JDK_HOME=/usr/lib/j2sdk          <-- modify as appropriate
 %  export PATH=$LCIO/tools:$PATH
CVSspam 0.2.8