Commit in lcio on v01-07-vtx
doc/lcio.xml+1-11.59.4.2 -> 1.59.4.3
src/cpp/include/IMPL/ReconstructedParticleImpl.h+2-21.11.2.1 -> 1.11.2.2
src/cpp/src/EXAMPLE/recjob.cc+1-11.49.2.1 -> 1.49.2.2
src/cpp/src/IMPL/ReconstructedParticleImpl.cc+12-41.9.6.1 -> 1.9.6.2
src/cpp/src/SIO/SIOReconstructedParticleHandler.cc+3-31.11.6.2 -> 1.11.6.3
src/cpp/src/UTIL/LCTOOLS.cc+1-11.49.4.2 -> 1.49.4.3
+20-12
6 modified files
Removed endVertex variable from the ReconstructedParticle class.
the getEndVertex() method from this class actually returns the startVertex from the first daughter particle found.

lcio/doc
lcio.xml 1.59.4.2 -> 1.59.4.3
diff -u -r1.59.4.2 -r1.59.4.3
--- lcio.xml	18 Aug 2006 13:39:13 -0000	1.59.4.2
+++ lcio.xml	24 Aug 2006 16:15:35 -0000	1.59.4.3
@@ -486,7 +486,7 @@
 	</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>
+	  <!--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>

lcio/src/cpp/include/IMPL
ReconstructedParticleImpl.h 1.11.2.1 -> 1.11.2.2
diff -u -r1.11.2.1 -r1.11.2.2
--- ReconstructedParticleImpl.h	14 Aug 2006 16:10:02 -0000	1.11.2.1
+++ ReconstructedParticleImpl.h	24 Aug 2006 16:15:44 -0000	1.11.2.2
@@ -124,7 +124,7 @@
     void addTrack( EVENT::Track* track) ;
 //     void addMCParticle( EVENT::MCParticle* mcParticle , float weight = 1.0 ) ;
     void setStartVertex( EVENT::Vertex * sv ) ;
-    void setEndVertex( EVENT::Vertex * ev ) ;
+    //void setEndVertex( EVENT::Vertex * ev ) ;
 
   protected:
 
@@ -148,7 +148,7 @@
 //     EVENT::FloatVec _mcParticleWeights ;
 
     EVENT::Vertex* _sv ;
-    EVENT::Vertex* _ev ;
+    //EVENT::Vertex* _ev ;
     
 }; // class
 

lcio/src/cpp/src/EXAMPLE
recjob.cc 1.49.2.1 -> 1.49.2.2
diff -u -r1.49.2.1 -r1.49.2.2
--- recjob.cc	18 Aug 2006 13:39:15 -0000	1.49.2.1
+++ recjob.cc	24 Aug 2006 16:15:49 -0000	1.49.2.2
@@ -526,7 +526,7 @@
       //associate vertices
       part->setStartVertex( dynamic_cast<Vertex*>( vertexVec->getElementAt(i) )  ) ;
       VertexImpl* v = dynamic_cast<VertexImpl*>( vertexVec->getElementAt(i+1) ) ;
-      part->setEndVertex( v ) ;
+      //part->setEndVertex( v ) ;
       //associate particles to vertices
       v->setAssociatedParticle( dynamic_cast<ReconstructedParticle*>( part ) ) ;
       

lcio/src/cpp/src/IMPL
ReconstructedParticleImpl.cc 1.9.6.1 -> 1.9.6.2
diff -u -r1.9.6.1 -r1.9.6.2
--- ReconstructedParticleImpl.cc	14 Aug 2006 16:10:04 -0000	1.9.6.1
+++ ReconstructedParticleImpl.cc	24 Aug 2006 16:15:51 -0000	1.9.6.2
@@ -15,8 +15,8 @@
     _charge(0),
     _pidUsed(0),
     _goodnessOfPID(0),
-    _sv(0),
-    _ev(0)
+    _sv(0)
+    //_ev(0)
   {
     _cov.resize( NCOVARIANCE ) ;
     //     for(int i=0 ; i < NCOVARIANCE ; i++ ) { _cov.push_back( 0.0 ) ;  }
@@ -68,18 +68,26 @@
   EVENT::Vertex * ReconstructedParticleImpl::getStartVertex() const { return _sv  ; }
                                                                                                                                                              
   //TODO: Choose this alternative method?!: return _particles[0]->getStartVertex()?!?
-  EVENT::Vertex * ReconstructedParticleImpl::getEndVertex() const { return _ev  ; }
+  //EVENT::Vertex * ReconstructedParticleImpl::getEndVertex() const { return _ev  ; }
 
+  EVENT::Vertex * ReconstructedParticleImpl::getEndVertex() const {
+    if(getParticles().size()!=0){
+      return getParticles().at(0)->getStartVertex();
+    }
+    return NULL;
+  }
                                                                                                                                                           
   void ReconstructedParticleImpl::setStartVertex( EVENT::Vertex *sv ){
     checkAccess("ReconstructedParticleImpl::setStartVertex" );
     _sv = sv;
   }
-  
+
+  /*  
   void ReconstructedParticleImpl::setEndVertex( EVENT::Vertex *ev ){
     checkAccess("ReconstructedParticleImpl::setEndVertex" );
     _ev = ev;
   }
+*/
 
   void ReconstructedParticleImpl::setType(int type){
     checkAccess("ReconstructedParticleImpl::setType" );

lcio/src/cpp/src/SIO
SIOReconstructedParticleHandler.cc 1.11.6.2 -> 1.11.6.3
diff -u -r1.11.6.2 -r1.11.6.3
--- SIOReconstructedParticleHandler.cc	18 Aug 2006 13:39:16 -0000	1.11.6.2
+++ SIOReconstructedParticleHandler.cc	24 Aug 2006 16:15:52 -0000	1.11.6.3
@@ -115,7 +115,7 @@
 	
 	//read pointers to start/end vertices
 	SIO_PNTR( stream ,   &(recP->_sv) ) ;
-	SIO_PNTR( stream ,   &(recP->_ev) ) ;
+	//SIO_PNTR( stream ,   &(recP->_ev) ) ;
       }
       
       
@@ -325,8 +325,8 @@
     // write pointers to start/end vertices
     EVENT::Vertex* sv = recP->getStartVertex() ;
     SIO_PNTR( stream , &sv  ) ;
-    EVENT::Vertex* ev = recP->getEndVertex() ;
-    SIO_PNTR( stream , &ev  ) ;
+    //EVENT::Vertex* ev = recP->getEndVertex() ;
+    //SIO_PNTR( stream , &ev  ) ;
 
 
     // write a ptag in order to be able to point to recPs

lcio/src/cpp/src/UTIL
LCTOOLS.cc 1.49.4.2 -> 1.49.4.3
diff -u -r1.49.4.2 -r1.49.4.3
--- LCTOOLS.cc	24 Aug 2006 14:20:37 -0000	1.49.4.2
+++ LCTOOLS.cc	24 Aug 2006 16:15:52 -0000	1.49.4.3
@@ -1416,7 +1416,7 @@
 	     , recP->getReferencePoint()[2] 
 	     , pidUsed
 	     , recP->getStartVertex()->id()
-	     , recP->getEndVertex()->id()
+	     , (recP->getEndVertex()!=NULL?recP->getEndVertex()->id():0)
 	     ) ;
       cout << "    covariance( px,py,pz,E) : (" ;
       for(int l=0;l<10;l++){
CVSspam 0.2.8