Print

Print


Commit in lcio on MAIN
config/lcio.properties+3-31.49 -> 1.50
doc/index.html+2-21.3 -> 1.4
   /lcio.xml+23-231.56 -> 1.57
   /versions.readme+31.44 -> 1.45
src/aid/EVENT/LCIO.aid+3-31.48 -> 1.49
src/cpp/include/lcio.h+2-21.22 -> 1.23
src/latex/manual/manual.tex+7-71.34 -> 1.35
+43-40
7 modified files
updated version number to v01-06

lcio/config
lcio.properties 1.49 -> 1.50
diff -u -r1.49 -r1.50
--- lcio.properties	1 Jun 2005 15:33:11 -0000	1.49
+++ lcio.properties	10 Nov 2005 14:04:54 -0000	1.50
@@ -1,7 +1,7 @@
 # ANT property file for LCIO
 #
 # Author: Mark Donszelmann
-# Version: $Id: lcio.properties,v 1.49 2005/06/01 15:33:11 gaede Exp $
+# Version: $Id: lcio.properties,v 1.50 2005/11/10 14:04:54 gaede Exp $
 #
 jars=java
 wars=
@@ -9,7 +9,7 @@
 
 mainpackage=hep/lcio/event
 title=LCIO Linear Collider IO
-version=v01-05
+version=v01-06
 copyright=Copyright &\#169; 2002-2003 LCIO Team, All Rights Reserved.
 name=lcio-event
 packages=hep.lcio.event.*
@@ -124,7 +124,7 @@
 #
 # General definitions for project wide targets
 #
-dist.version=v01-05
+dist.version=v01-06
 dist.dst=release
 dist.doc.dst=release
 dist.dir=dist

lcio/doc
index.html 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- index.html	31 May 2005 08:15:05 -0000	1.3
+++ index.html	10 Nov 2005 14:04:54 -0000	1.4
@@ -4,7 +4,7 @@
 
 <body>
 <hr>
-<h1>Documentation for LCIO v01-05</h1>
+<h1>Documentation for LCIO v01-06</h1>
 
 
 <hr>
@@ -23,6 +23,6 @@
 
 <address></address>
 <!-- hhmts start -->
-Last modified: Thu Sep 23 14:51:51 2004
+Last modified: Thu Nov 10 14:59:43 2005
 <!-- hhmts end -->
 </body> </html>

lcio/doc
lcio.xml 1.56 -> 1.57
diff -u -r1.56 -r1.57
--- lcio.xml	19 Sep 2005 15:40:25 -0000	1.56
+++ lcio.xml	10 Nov 2005 14:04:55 -0000	1.57
@@ -13,7 +13,7 @@
 -->
 <sio>
   <record name="LCRunHeader">
-     <block name="RunHeader" major="1" minor="5">
+     <block name="RunHeader" major="1" minor="6">
         <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="5">
+     <block name="EventHeader" major="1" minor="6">
         <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="5">
+      <block name="MCParticle" major="1" minor="6">
          <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,8 +86,8 @@
             </if>
          </repeat>
       </block>
-      <block name="SimTrackerHit" major="1" minor="5">
-         <data type="int" name="flags">Bit 31 Barrel = 0, Endcap = 1, Bits 0-15 user/detector specific</data>
+      <block name="SimTrackerHit" major="1" minor="6">
+         <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>
          <repeat count="n">
@@ -104,7 +104,7 @@
            </if>
          </repeat>
       </block>
-      <block name="SimCalorimeterHit" major="1" minor="5">
+      <block name="SimCalorimeterHit" major="1" minor="6">
          <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"/>
@@ -132,7 +132,7 @@
            </if>
          </repeat>
       </block>
-      <block name="LCFloatVec" major="1" minor="5">
+      <block name="LCFloatVec" major="1" minor="6">
          <data type="int" name="flags">not yet used, Bits 0-15 user/detector specific</data>
          <include subroutine="namedParameters"/>
          <data type="int" name="nVectors"></data>
@@ -146,7 +146,7 @@
            </if>
          </repeat>
       </block>
-      <block name="LCIntVec" major="1" minor="5">
+      <block name="LCIntVec" major="1" minor="6">
          <data type="int" name="flags">not yet used, Bits 0-15 user/detector specific</data>
          <include subroutine="namedParameters"/>
          <data type="int" name="nVectors"></data>
@@ -160,7 +160,7 @@
            </if>
          </repeat>
       </block>
-      <block name="LCStrVec" major="1" minor="5">
+      <block name="LCStrVec" major="1" minor="6">
          <data type="int" name="flags">not yet used, Bits 0-15 user/detector specific</data>
          <include subroutine="namedParameters"/>
          <data type="int" name="nVectors"></data>
@@ -174,7 +174,7 @@
            </if>
          </repeat>
       </block>
-      <block name="RawCalorimeterHit" major="1" minor="5">
+      <block name="RawCalorimeterHit" major="1" minor="6">
          <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>
@@ -194,7 +194,7 @@
 	    </if>
          </repeat>
       </block>
-      <block name="CalorimeterHit" major="1" minor="5">
+      <block name="CalorimeterHit" major="1" minor="6">
          <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>
@@ -225,7 +225,7 @@
             </if>
          </repeat>
       </block>
-      <block name="TrackerHit" major="1" minor="5">
+      <block name="TrackerHit" major="1" minor="6">
          <data type="int" name="flags">Bits 0-15 user/detector specific</data>
          <include subroutine="namedParameters"/>
          <data type="int" name="n"></data>
@@ -249,7 +249,7 @@
             <data type="ptag" name="this"></data>
          </repeat>
       </block>
-      <block name="TPCHit" major="1" minor="5">
+      <block name="TPCHit" major="1" minor="6">
          <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>
@@ -275,7 +275,7 @@
             </if>
          </repeat>
       </block>
-      <block name="TrackerRawData" major="1" minor="5">
+      <block name="TrackerRawData" major="1" minor="6">
          <data type="int" name="flags">Bits 0-15 user/detector specific</data>
          <include subroutine="namedParameters"/>
          <data type="int" name="n"></data>
@@ -293,7 +293,7 @@
             <data type="ptag" name="this"></data>
          </repeat>
       </block>
-      <block name="TrackerData" major="1" minor="5">
+      <block name="TrackerData" major="1" minor="6">
          <data type="int" name="flags">Bits 0-15 user/detector specific</data>
          <include subroutine="namedParameters"/>
          <data type="int" name="n"></data>
@@ -311,7 +311,7 @@
             <data type="ptag" name="this"></data>
          </repeat>
       </block>
-      <block name="TrackerPulse" major="1" minor="5">
+      <block name="TrackerPulse" major="1" minor="6">
          <data type="int" name="flags">Bits 0-15 user/detector specific</data>
          <include subroutine="namedParameters"/>
          <data type="int" name="n"></data>
@@ -327,7 +327,7 @@
             <data type="ptag" name="this"></data>
          </repeat>
       </block>
-      <block name="SiliconRawHit" major="1" minor="5">
+      <block name="SiliconRawHit" major="1" minor="6">
          <data type="int" name="flags">Bits 0-15 user/detector specific</data>
          <include subroutine="namedParameters"/>
          <data type="int" name="n"></data>
@@ -339,7 +339,7 @@
             <data type="ptag" name="this"></data>
          </repeat>
       </block>
-    <block name="Track" major="1" minor="5">
+    <block name="Track" major="1" minor="6">
       <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"/>
@@ -375,7 +375,7 @@
       <data type="ptag" name="this"></data>
       </repeat>
     </block>
-    <block name="Cluster" major="1" minor="5">
+    <block name="Cluster" major="1" minor="6">
       <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"/>
@@ -429,7 +429,7 @@
         <data type="ptag" name="this"></data>
       </repeat>
     </block>
-    <block name="ReconstructedParticle" major="1" minor="5">
+    <block name="ReconstructedParticle" major="1" minor="6">
       <data type="int" name="flag"></data>
       <include subroutine="namedParameters"/>
       <data type="int" name="nObject"/>
@@ -501,7 +501,7 @@
         <data type="ptag" name="this"></data>
       </repeat>
     </block>
-    <block name="LCGenericObject" major="1" minor="5">
+    <block name="LCGenericObject" major="1" minor="6">
       <data type="int" name="flag"></data>
         <include subroutine="namedParameters"/>
         <if condition="(flag&amp;(1&lt;&lt;31)) !=0">
@@ -528,7 +528,7 @@
         <data type="ptag" name="this"></data>
       </repeat>
     </block>
-    <block name="LCRelation" major="1" minor="5">
+    <block name="LCRelation" major="1" minor="6">
        <data type="int" name="flag">Bit 31: 1[0] Weights are [not] stored</data>
        <include subroutine="namedParameters"/>
        <data type="int" name="nRelations"/>
@@ -541,7 +541,7 @@
        </repeat>
     </block>
       <!-- generic block description for subset collections that hold references to exisitng objects -->
-      <block name="References" major="1" minor="5">
+      <block name="References" major="1" minor="6">
          <data type="int" name="flags"></data>
          <include subroutine="namedParameters"/>
          <data type="int" name="nReferences"></data>

lcio/doc
versions.readme 1.44 -> 1.45
diff -u -r1.44 -r1.45
--- versions.readme	21 Oct 2005 13:53:18 -0000	1.44
+++ versions.readme	10 Nov 2005 14:04:55 -0000	1.45
@@ -2,6 +2,9 @@
  Describes the changes for the different versions/tags of LCIO
 ---------------------------------------------------------------
 
+======================
+  v01-06-pre
+=======================
 
    - added optional momentum[3] to SimTrackerHit (momentum of particle at position of hit)
  

lcio/src/aid/EVENT
LCIO.aid 1.48 -> 1.49
diff -u -r1.48 -r1.49
--- LCIO.aid	19 Sep 2005 15:40:26 -0000	1.48
+++ LCIO.aid	10 Nov 2005 14:04:55 -0000	1.49
@@ -3,7 +3,7 @@
 @ifdef cpp
 @cpp{
 #define LCIO_MAJOR_VERSION 1
-#define LCIO_MINOR_VERSION 5
+#define LCIO_MINOR_VERSION 6
 #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.48 2005/09/19 15:40:26 gaede Exp $
+ * @version $Id: LCIO.aid,v 1.49 2005/11/10 14:04:55 gaede Exp $
  * @see LCObject
  * @see LCIO
  */
@@ -110,7 +110,7 @@
 @else
     // current version number of lcio
   public static const int MAJORVERSION  = 1 ; 
-  public static const int MINORVERSION  = 5 ; 
+  public static const int MINORVERSION  = 6 ; 
 
   // bits in flag words
   // SimCalorimeterHit (CH)

lcio/src/cpp/include
lcio.h 1.22 -> 1.23
diff -u -r1.22 -r1.23
--- lcio.h	31 May 2005 08:15:06 -0000	1.22
+++ lcio.h	10 Nov 2005 14:04:56 -0000	1.23
@@ -7,7 +7,7 @@
  * documentation with doxygen. 
  * 
  * @author gaede
- * @version $Id: lcio.h,v 1.22 2005/05/31 08:15:06 gaede Exp $ 
+ * @version $Id: lcio.h,v 1.23 2005/11/10 14:04:56 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-05) 
+/** \mainpage <a href="http://lcio.desy.de">LCIO</a> (v01-06) 
  * 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.34 -> 1.35
diff -u -r1.34 -r1.35
--- manual.tex	31 May 2005 09:35:05 -0000	1.34
+++ manual.tex	10 Nov 2005 14:04:56 -0000	1.35
@@ -49,8 +49,8 @@
 \begin{document}
 \pdfgraphics
 
-%\title{LCIO [v01-05] -  Users manual}
-\title{{\Huge\bf LCIO  -  Users manual} \\ v01-05}
+%\title{LCIO [v01-06] -  Users manual}
+\title{{\Huge\bf LCIO  -  Users manual} \\ v01-06}
 
 %\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-05 -r v01-05 lcio
+  cvs co -d v01-06 -r v01-06 lcio
 \end{verbatim}
 
 \subsection{Requirements}
@@ -116,7 +116,7 @@
 \begin{itemize}
 \item{ {\bf Linux (and bash):} 
 \begin{verbatim} 
-  export LCIO=/lcio/v01-05                <-- modify as appropriate
+  export LCIO=/lcio/v01-06                <-- modify as appropriate
   export PATH=$LCIO/tools:$LCIO/bin:$PATH
 
   export JDK_HOME=/usr/lib/j2sdk          <-- modify as appropriate
@@ -127,7 +127,7 @@
 \begin{verbatim}
   set PATH=c:/cygwin/bin;%PATH%            <-- modify as appropriate
 
-  set LCIO=c:/lcio/devel/v01-05            <-- modify as appropriate
+  set LCIO=c:/lcio/devel/v01-06            <-- modify as appropriate
   set JDK_HOME=c:/j2sdk1.4.1_01            <-- modify as appropriate 
 
   set PATH=%LCIO%/tools;%LCIO%/bin;%PATH%
@@ -136,7 +136,7 @@
 }
 \item{ {\bf Windows/Cygwin - Cygwin shell (bash):} 
 \begin{verbatim}
-  export LCIO=/cygdrive/c/lcio/devel/v01-05   <-- modify as appropriate
+  export LCIO=/cygdrive/c/lcio/devel/v01-06   <-- modify as appropriate
   export PATH=$LCIO/tools:$LCIO/bin:$PATH
   export JDK_HOME=/cygdrive/c/j2sdk1.4.1_01  <-- modify as appropriate
 \end{verbatim} %$
@@ -163,7 +163,7 @@
 %\end{verbatim}
 %or using {\it bash}:
 %\begin{verbatim}
-%  cd v01-05
+%  cd v01-06
 %  export LCIO=$PWD
 %  export JDK_HOME=/usr/lib/j2sdk          <-- modify as appropriate
 %  export PATH=$LCIO/tools:$PATH
CVSspam 0.2.8