lcio/doc
diff -u -r1.58 -r1.59
--- lcio.xml 7 Mar 2006 17:42:17 -0000 1.58
+++ lcio.xml 8 Mar 2006 09:57:26 -0000 1.59
@@ -13,7 +13,7 @@
-->
<sio>
<record name="LCRunHeader">
- <block name="RunHeader" major="1" minor="6">
+ <block name="RunHeader" major="1" minor="7">
<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="6">
+ <block name="EventHeader" major="1" minor="7">
<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="6">
+ <block name="MCParticle" major="1" minor="7">
<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="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>
+ <block name="SimTrackerHit" major="1" minor="7">
+ <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">
@@ -97,15 +97,17 @@
<data type="float" name="time"></data>
<data type="pntr" name="MCParticle"></data>
<if condition="(flags&(1<<30)) != 0">
- <data type="float[3]" name="momentum"></data>
- <data type="float" name="pathLength"></data>
+ <data type="float[3]" name="momentum"></data>
+ <if condition="1000*major+minor>1006">
+ <data type="float" name="pathLength"></data>
+ </if>
</if>
<if condition="1000*major+minor>1000">
<data type="ptag" name="this"></data>
</if>
</repeat>
</block>
- <block name="SimCalorimeterHit" major="1" minor="6">
+ <block name="SimCalorimeterHit" major="1" minor="7">
<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"/>
@@ -133,7 +135,7 @@
</if>
</repeat>
</block>
- <block name="LCFloatVec" major="1" minor="6">
+ <block name="LCFloatVec" major="1" minor="7">
<data type="int" name="flags">not yet used, Bits 0-15 user/detector specific</data>
<include subroutine="namedParameters"/>
<data type="int" name="nVectors"></data>
@@ -147,7 +149,7 @@
</if>
</repeat>
</block>
- <block name="LCIntVec" major="1" minor="6">
+ <block name="LCIntVec" major="1" minor="7">
<data type="int" name="flags">not yet used, Bits 0-15 user/detector specific</data>
<include subroutine="namedParameters"/>
<data type="int" name="nVectors"></data>
@@ -161,7 +163,7 @@
</if>
</repeat>
</block>
- <block name="LCStrVec" major="1" minor="6">
+ <block name="LCStrVec" major="1" minor="7">
<data type="int" name="flags">not yet used, Bits 0-15 user/detector specific</data>
<include subroutine="namedParameters"/>
<data type="int" name="nVectors"></data>
@@ -175,7 +177,7 @@
</if>
</repeat>
</block>
- <block name="RawCalorimeterHit" major="1" minor="6">
+ <block name="RawCalorimeterHit" major="1" minor="7">
<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>
@@ -195,7 +197,7 @@
</if>
</repeat>
</block>
- <block name="CalorimeterHit" major="1" minor="6">
+ <block name="CalorimeterHit" major="1" minor="7">
<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>
@@ -226,7 +228,7 @@
</if>
</repeat>
</block>
- <block name="TrackerHit" major="1" minor="6">
+ <block name="TrackerHit" major="1" minor="7">
<data type="int" name="flags">Bits 0-15 user/detector specific</data>
<include subroutine="namedParameters"/>
<data type="int" name="n"></data>
@@ -250,7 +252,7 @@
<data type="ptag" name="this"></data>
</repeat>
</block>
- <block name="TPCHit" major="1" minor="6">
+ <block name="TPCHit" major="1" minor="7">
<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>
@@ -276,7 +278,7 @@
</if>
</repeat>
</block>
- <block name="TrackerRawData" major="1" minor="6">
+ <block name="TrackerRawData" major="1" minor="7">
<data type="int" name="flags">Bits 0-15 user/detector specific</data>
<include subroutine="namedParameters"/>
<data type="int" name="n"></data>
@@ -294,7 +296,7 @@
<data type="ptag" name="this"></data>
</repeat>
</block>
- <block name="TrackerData" major="1" minor="6">
+ <block name="TrackerData" major="1" minor="7">
<data type="int" name="flags">Bits 0-15 user/detector specific</data>
<include subroutine="namedParameters"/>
<data type="int" name="n"></data>
@@ -312,7 +314,7 @@
<data type="ptag" name="this"></data>
</repeat>
</block>
- <block name="TrackerPulse" major="1" minor="6">
+ <block name="TrackerPulse" major="1" minor="7">
<data type="int" name="flags">Bits 0-15 user/detector specific</data>
<include subroutine="namedParameters"/>
<data type="int" name="n"></data>
@@ -328,7 +330,7 @@
<data type="ptag" name="this"></data>
</repeat>
</block>
- <block name="SiliconRawHit" major="1" minor="6">
+ <block name="SiliconRawHit" major="1" minor="7">
<data type="int" name="flags">Bits 0-15 user/detector specific</data>
<include subroutine="namedParameters"/>
<data type="int" name="n"></data>
@@ -340,7 +342,7 @@
<data type="ptag" name="this"></data>
</repeat>
</block>
- <block name="Track" major="1" minor="6">
+ <block name="Track" major="1" minor="7">
<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"/>
@@ -376,7 +378,7 @@
<data type="ptag" name="this"></data>
</repeat>
</block>
- <block name="Cluster" major="1" minor="6">
+ <block name="Cluster" major="1" minor="7">
<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"/>
@@ -430,7 +432,7 @@
<data type="ptag" name="this"></data>
</repeat>
</block>
- <block name="ReconstructedParticle" major="1" minor="6">
+ <block name="ReconstructedParticle" major="1" minor="7">
<data type="int" name="flag"></data>
<include subroutine="namedParameters"/>
<data type="int" name="nObject"/>
@@ -502,7 +504,7 @@
<data type="ptag" name="this"></data>
</repeat>
</block>
- <block name="LCGenericObject" major="1" minor="6">
+ <block name="LCGenericObject" major="1" minor="7">
<data type="int" name="flag"></data>
<include subroutine="namedParameters"/>
<if condition="(flag&(1<<31)) !=0">
@@ -529,7 +531,7 @@
<data type="ptag" name="this"></data>
</repeat>
</block>
- <block name="LCRelation" major="1" minor="6">
+ <block name="LCRelation" major="1" minor="7">
<data type="int" name="flag">Bit 31: 1[0] Weights are [not] stored</data>
<include subroutine="namedParameters"/>
<data type="int" name="nRelations"/>
@@ -542,7 +544,7 @@
</repeat>
</block>
<!-- generic block description for subset collections that hold references to exisitng objects -->
- <block name="References" major="1" minor="6">
+ <block name="References" major="1" minor="7">
<data type="int" name="flags"></data>
<include subroutine="namedParameters"/>
<data type="int" name="nReferences"></data>
lcio/src/latex/manual
diff -u -r1.35 -r1.36
--- manual.tex 10 Nov 2005 14:04:56 -0000 1.35
+++ manual.tex 8 Mar 2006 09:57:28 -0000 1.36
@@ -49,8 +49,8 @@
\begin{document}
\pdfgraphics
-%\title{LCIO [v01-06] - Users manual}
-\title{{\Huge\bf LCIO - Users manual} \\ v01-06}
+%\title{LCIO [v01-07] - Users manual}
+\title{{\Huge\bf LCIO - Users manual} \\ v01-07}
%\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-06 -r v01-06 lcio
+ cvs co -d v01-07 -r v01-07 lcio
\end{verbatim}
\subsection{Requirements}
@@ -116,7 +116,7 @@
\begin{itemize}
\item{ {\bf Linux (and bash):}
\begin{verbatim}
- export LCIO=/lcio/v01-06 <-- modify as appropriate
+ export LCIO=/lcio/v01-07 <-- 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-06 <-- modify as appropriate
+ set LCIO=c:/lcio/devel/v01-07 <-- 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-06 <-- modify as appropriate
+ export LCIO=/cygdrive/c/lcio/devel/v01-07 <-- modify as appropriate
export PATH=$LCIO/tools:$LCIO/bin:$PATH
export JDK_HOME=/cygdrive/c/j2sdk1.4.1_01 <-- modify as appropriate
\end{verbatim} %$
@@ -157,13 +157,13 @@
%A few variables have to be set, e.g. on windows:
%\begin{verbatim}
-% set LCIO=c:\tony\projects\v00-06\lcio <-- modify as appropriate
+% set LCIO=c:\tony\projects\v00-07\lcio <-- modify as appropriate
% set JDK_HOME=c:\java\j2sdk1.4.1 <-- modify as appropriate
% set PATH=%LCIO%\tools;%PATH%
%\end{verbatim}
%or using {\it bash}:
%\begin{verbatim}
-% cd v01-06
+% cd v01-07
% export LCIO=$PWD
% export JDK_HOME=/usr/lib/j2sdk <-- modify as appropriate
% export PATH=$LCIO/tools:$PATH