Print

Print


Commit in lcio on v01-07-vtx
doc/lcio.xml+5-51.59.4.4 -> 1.59.4.5
src/aid/EVENT/ReconstructedParticle.aid+10-241.17.2.2 -> 1.17.2.3
             /Vertex.aid+3-21.2.2.4 -> 1.2.2.5
src/cpp/include/lcio.h+2-21.24.4.1 -> 1.24.4.2
+20-33
4 modified files
updated documentation

lcio/doc
lcio.xml 1.59.4.4 -> 1.59.4.5
diff -u -r1.59.4.4 -r1.59.4.5
--- lcio.xml	25 Aug 2006 07:48:17 -0000	1.59.4.4
+++ lcio.xml	25 Aug 2006 08:47:41 -0000	1.59.4.5
@@ -448,7 +448,7 @@
         </repeat>
 	<data type="pntr" name="associatedParticle">reconstructed particle associated to the vertex</data>
         <data type="ptag" name="this"></data>
-      </repeat>
+    </repeat>
     </block>
     <block name="ReconstructedParticle" major="1" minor="8">
       <data type="int" name="flag"></data>
@@ -486,10 +486,6 @@
             </repeat>
 	  </if>
 	</repeat>
-	<if condition="1000*major+minor&gt;1007">
-	  <data type="pntr" name="startVertex">start vertex associated to the particle</data>
-	  <!--data type="pntr" name="endVertex">end vertex associated to the particle</data-->
-	</if>
         <if condition="1000*major+minor&gt;1002">
           <data type="pntr" name="ParticleIDUsed"></data>
 	  <data type="float" name="goodnessOfPID">overall quality of the particle 
@@ -516,6 +512,10 @@
 	    <data type="float" name="weight">TODO: to be defined </data>
           </if>
 	</repeat>
+	<if condition="1000*major+minor&gt;1007">
+	  <data type="pntr" name="startVertex">start vertex associated to the particle</data>
+	  <!--data type="pntr" name="endVertex">end vertex associated to the particle</data-->
+	</if>
         <if condition="1000*major+minor&lt;1003">
 	  <data type="int" name="nmc"/>
 	  <repeat count="nmc">

lcio/src/aid/EVENT
ReconstructedParticle.aid 1.17.2.2 -> 1.17.2.3
diff -u -r1.17.2.2 -r1.17.2.3
--- ReconstructedParticle.aid	24 Aug 2006 16:22:38 -0000	1.17.2.2
+++ ReconstructedParticle.aid	25 Aug 2006 08:47:45 -0000	1.17.2.3
@@ -11,7 +11,7 @@
 /** The LCIO reconstructedParticle.
  * 
  * @author gaede
- * @version $Id: ReconstructedParticle.aid,v 1.17.2.2 2006/08/24 16:22:38 engels Exp $
+ * @version $Id: ReconstructedParticle.aid,v 1.17.2.3 2006/08/25 08:47:45 gaede Exp $
  */
 
 public interface ReconstructedParticle extends LCObject {
@@ -121,30 +121,16 @@
      */
     public const TrackVec& getTracks() const ; 
     
-//     /** The weights of track contributions to this particle
-//      */
-//     public const FloatVec& getTrackWeights() const ; 
-    
-
-//     /** The MCParticle assigned to this reconstructed particle.
-//      * @see MCParticle
-//      */
-//     public const MCParticleVec& getMCParticles() const ;
-
-
-//     /** The weights of the MCParticle assignment.
-//      */
-//     public const FloatVec& getMCParticleWeights() const ;
-
-      /** The start vertex associated to this particle
-      */
-      public Vertex * getStartVertex() const ;
-
-      /** The vertex where the particle decays
-       *  This method actually returns the start vertex from the first daughter particle found
-      */
-      public Vertex * getEndVertex() const ;
 
+    /** The start vertex associated to this particle
+     */
+    public Vertex * getStartVertex() const ;
+    
+    /** The vertex where the particle decays
+     *  This method actually returns the start vertex from the first daughter particle found
+     */
+    public Vertex * getEndVertex() const ;
+    
     // set methods
 
 //     /** Set the type of reconstructed particle, one of:<br>

lcio/src/aid/EVENT
Vertex.aid 1.2.2.4 -> 1.2.2.5
diff -u -r1.2.2.4 -r1.2.2.5
--- Vertex.aid	18 Aug 2006 13:39:14 -0000	1.2.2.4
+++ Vertex.aid	25 Aug 2006 08:47:46 -0000	1.2.2.5
@@ -8,13 +8,14 @@
 }
 @endif
 
-/** A Vertex class for LCIO, as proposed by Sonja Hillert for the LCFI working group.
+/** The Vertex class for LCIO. 
+ *  <p>UNDER DEVELOPMENT!</p>
  *  see: <a href="http://forum.linearcollider.org/index.php?t=tree&goto=473">here</a><br>
  *
  *  <p>UNDER DEVELOPMENT!</p>
  *  
  * @author gaede, engels
- * @version $Id: Vertex.aid,v 1.2.2.4 2006/08/18 13:39:14 engels Exp $
+ * @version $Id: Vertex.aid,v 1.2.2.5 2006/08/25 08:47:46 gaede Exp $
  */
 
 public interface Vertex extends LCObject {

lcio/src/cpp/include
lcio.h 1.24.4.1 -> 1.24.4.2
diff -u -r1.24.4.1 -r1.24.4.2
--- lcio.h	15 Aug 2006 15:56:47 -0000	1.24.4.1
+++ lcio.h	25 Aug 2006 08:47:46 -0000	1.24.4.2
@@ -7,7 +7,7 @@
  * documentation with doxygen. 
  * 
  * @author gaede
- * @version $Id: lcio.h,v 1.24.4.1 2006/08/15 15:56:47 engels Exp $ 
+ * @version $Id: lcio.h,v 1.24.4.2 2006/08/25 08:47:46 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-08) 
+/** \mainpage <a href="http://lcio.desy.de">LCIO</a> (v01-08-vtx test version for the new vertex class) 
  * 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 
CVSspam 0.2.8