Print

Print


Commit in lcio/src on MAIN
aid/EVENT/CalorimeterHit.aid+2-11.14 -> 1.15
         /Cluster.aid+2-11.13 -> 1.14
         /LCObject.aid+11.8 -> 1.9
         /MCParticle.aid+2-11.25 -> 1.26
         /ParticleID.aid+2-11.9 -> 1.10
         /RawCalorimeterHit.aid+2-11.3 -> 1.4
         /ReconstructedParticle.aid+2-11.16 -> 1.17
         /Track.aid+2-11.13 -> 1.14
         /TrackerHit.aid+2-11.9 -> 1.10
         /Vertex.aid+2-11.1 -> 1.2
cpp/include/LCIOSTLTypes.h+51.6 -> 1.7
cpp/src/EXAMPLE/simjob.cc+71.52 -> 1.53
+31-9
12 modified files
commented typedefs for doxygen documentation

lcio/src/aid/EVENT
CalorimeterHit.aid 1.14 -> 1.15
diff -u -r1.14 -r1.15
--- CalorimeterHit.aid	24 Mar 2006 13:25:52 -0000	1.14
+++ CalorimeterHit.aid	3 Aug 2006 16:53:34 -0000	1.15
@@ -11,6 +11,7 @@
 @ifdef cpp
 @cpp{
 class CalorimeterHit ;
+/**Vector of (pointers to) CalorimeterHits.*/
 typedef std::vector<CalorimeterHit*> CalorimeterHitVec ;
 }
 @endif
@@ -23,7 +24,7 @@
  *  flag(LCIO::RCHBIT_NO_PTR)==1. 
  *  
  * @author gaede
- * @version $Id: CalorimeterHit.aid,v 1.14 2006/03/24 13:25:52 gaede Exp $
+ * @version $Id: CalorimeterHit.aid,v 1.15 2006/08/03 16:53:34 gaede Exp $
  */
 
 public interface CalorimeterHit extends LCObject {

lcio/src/aid/EVENT
Cluster.aid 1.13 -> 1.14
diff -u -r1.13 -r1.14
--- Cluster.aid	24 Mar 2006 13:25:52 -0000	1.13
+++ Cluster.aid	3 Aug 2006 16:53:34 -0000	1.14
@@ -3,6 +3,7 @@
 @ifdef cpp
 @cpp{
 class Cluster ;
+/**Vector of (pointers to) Clusters.*/
 typedef std::vector<Cluster*> ClusterVec ;
 }
 @endif
@@ -10,7 +11,7 @@
 /** The LCIO cluster.
  * 
  * @author gaede
- * @version $Id: Cluster.aid,v 1.13 2006/03/24 13:25:52 gaede Exp $
+ * @version $Id: Cluster.aid,v 1.14 2006/08/03 16:53:34 gaede Exp $
  */
 
 

lcio/src/aid/EVENT
LCObject.aid 1.8 -> 1.9
diff -u -r1.8 -r1.9
--- LCObject.aid	13 Jul 2004 11:54:26 -0000	1.8
+++ LCObject.aid	3 Aug 2006 16:53:34 -0000	1.9
@@ -10,6 +10,7 @@
 @ifdef cpp
 @cpp{
 class LCObject ;
+/**Vector of (pointers to) LCObjects.*/
 typedef std::vector<LCObject*> LCObjectVec ;
 }
 @endif

lcio/src/aid/EVENT
MCParticle.aid 1.25 -> 1.26
diff -u -r1.25 -r1.26
--- MCParticle.aid	25 Apr 2006 07:08:03 -0000	1.25
+++ MCParticle.aid	3 Aug 2006 16:53:34 -0000	1.26
@@ -10,6 +10,7 @@
 @ifdef cpp
 @cpp{
 class MCParticle ;
+/**Vector of (pointers to) MCParticles.*/
 typedef std::vector<MCParticle*> MCParticleVec ;
 }
 @endif
@@ -17,7 +18,7 @@
 /** The LCIO Monte Carlo particle. 
  * 
  * @author gaede
- * @version $Id: MCParticle.aid,v 1.25 2006/04/25 07:08:03 gaede Exp $
+ * @version $Id: MCParticle.aid,v 1.26 2006/08/03 16:53:34 gaede Exp $
  */
 public interface MCParticle extends LCObject {
     

lcio/src/aid/EVENT
ParticleID.aid 1.9 -> 1.10
diff -u -r1.9 -r1.10
--- ParticleID.aid	24 Mar 2006 13:25:52 -0000	1.9
+++ ParticleID.aid	3 Aug 2006 16:53:35 -0000	1.10
@@ -3,6 +3,7 @@
 @ifdef cpp
 @cpp{
 class ParticleID ;
+/**Vector of (pointers to) ParticleIDs.*/
 typedef std::vector<ParticleID*> ParticleIDVec ;
 }
 @endif
@@ -12,7 +13,7 @@
  *  for different hypotheses on the particle type.
  * 
  * @author gaede
- * @version $Id: ParticleID.aid,v 1.9 2006/03/24 13:25:52 gaede Exp $
+ * @version $Id: ParticleID.aid,v 1.10 2006/08/03 16:53:35 gaede Exp $
  * @see ReconstructedParticle.getParticleIDs()
  * @see Cluster.getParticleIDs()
  */

lcio/src/aid/EVENT
RawCalorimeterHit.aid 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- RawCalorimeterHit.aid	24 Mar 2006 13:25:52 -0000	1.3
+++ RawCalorimeterHit.aid	3 Aug 2006 16:53:35 -0000	1.4
@@ -11,6 +11,7 @@
 @ifdef cpp
 @cpp{
 class RawCalorimeterHit ;
+/**Vector of (pointers to) RawCalorimeterHits.*/
 typedef std::vector<RawCalorimeterHit*> RawCalorimeterHitVec ;
 }
 @endif
@@ -23,7 +24,7 @@
  *  LCRelation object.</b>
  * 
  * @author gaede
- * @version $Id: RawCalorimeterHit.aid,v 1.3 2006/03/24 13:25:52 gaede Exp $
+ * @version $Id: RawCalorimeterHit.aid,v 1.4 2006/08/03 16:53:35 gaede Exp $
  */
 
 public interface RawCalorimeterHit extends LCObject {

lcio/src/aid/EVENT
ReconstructedParticle.aid 1.16 -> 1.17
diff -u -r1.16 -r1.17
--- ReconstructedParticle.aid	25 Apr 2006 07:08:03 -0000	1.16
+++ ReconstructedParticle.aid	3 Aug 2006 16:53:35 -0000	1.17
@@ -3,6 +3,7 @@
 @ifdef cpp
 @cpp{
 class ReconstructedParticle ;
+/**Vector of (pointers to) ReconstructedParticles.*/
 typedef std::vector<ReconstructedParticle*> ReconstructedParticleVec ;
 }
 @endif
@@ -10,7 +11,7 @@
 /** The LCIO reconstructedParticle.
  * 
  * @author gaede
- * @version $Id: ReconstructedParticle.aid,v 1.16 2006/04/25 07:08:03 gaede Exp $
+ * @version $Id: ReconstructedParticle.aid,v 1.17 2006/08/03 16:53:35 gaede Exp $
  */
 
 public interface ReconstructedParticle extends LCObject {

lcio/src/aid/EVENT
Track.aid 1.13 -> 1.14
diff -u -r1.13 -r1.14
--- Track.aid	24 Mar 2006 13:25:52 -0000	1.13
+++ Track.aid	3 Aug 2006 16:53:35 -0000	1.14
@@ -2,6 +2,7 @@
 @ifdef cpp
 @cpp{
 class Track ;
+/**Vector of (pointers to) Tracks.*/
 typedef std::vector<Track*> TrackVec ;
 }
 @endif
@@ -9,7 +10,7 @@
 /** The LCIO track.
  * 
  * @author gaede
- * @version $Id: Track.aid,v 1.13 2006/03/24 13:25:52 gaede Exp $
+ * @version $Id: Track.aid,v 1.14 2006/08/03 16:53:35 gaede Exp $
  */
 
 public interface Track extends LCObject {

lcio/src/aid/EVENT
TrackerHit.aid 1.9 -> 1.10
diff -u -r1.9 -r1.10
--- TrackerHit.aid	24 Mar 2006 13:25:53 -0000	1.9
+++ TrackerHit.aid	3 Aug 2006 16:53:35 -0000	1.10
@@ -3,6 +3,7 @@
 @ifdef cpp
 @cpp{
 class TrackerHit ;
+/**Vector of (pointers to) TrackerHits.*/
 typedef std::vector<TrackerHit*> TrackerHitVec ;
 }
 @endif
@@ -10,7 +11,7 @@
 /** A generic tracker hit to be used by pattern recognition.
  * 
  * @author gaede
- * @version $Id: TrackerHit.aid,v 1.9 2006/03/24 13:25:53 gaede Exp $
+ * @version $Id: TrackerHit.aid,v 1.10 2006/08/03 16:53:35 gaede Exp $
  */
 
 public interface TrackerHit extends LCObject {

lcio/src/aid/EVENT
Vertex.aid 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- Vertex.aid	24 May 2006 15:17:09 -0000	1.1
+++ Vertex.aid	3 Aug 2006 16:53:35 -0000	1.2
@@ -3,6 +3,7 @@
 @ifdef cpp
 @cpp{
 class Vertex ;
+/**Vector of (pointers to) Vertices.*/
 typedef std::vector<Vertex*> VertexVec ;
 }
 @endif
@@ -13,7 +14,7 @@
  *  <p>UNDER DEVELOPMENT!</p>
  *  
  * @author gaede
- * @version $Id: Vertex.aid,v 1.1 2006/05/24 15:17:09 gaede Exp $
+ * @version $Id: Vertex.aid,v 1.2 2006/08/03 16:53:35 gaede Exp $
  */
 
 public interface Vertex extends LCObject {

lcio/src/cpp/include
LCIOSTLTypes.h 1.6 -> 1.7
diff -u -r1.6 -r1.7
--- LCIOSTLTypes.h	3 May 2005 14:59:48 -0000	1.6
+++ LCIOSTLTypes.h	3 Aug 2006 16:53:36 -0000	1.7
@@ -12,10 +12,15 @@
 
 namespace EVENT
 {
+/**Vector of strings.*/
 typedef std::vector< std::string > StringVec ;
+/**Vector of floats.*/
 typedef std::vector< float  > FloatVec ;
+/**Vector of doubles.*/
 typedef std::vector< double  > DoubleVec ;
+/**Vector of ints.*/
 typedef std::vector< int > IntVec ;
+/**Vector of shorts.*/
 typedef std::vector< short > ShortVec ;
 
 }

lcio/src/cpp/src/EXAMPLE
simjob.cc 1.52 -> 1.53
diff -u -r1.52 -r1.53
--- simjob.cc	24 May 2006 15:16:30 -0000	1.52
+++ simjob.cc	3 Aug 2006 16:53:36 -0000	1.53
@@ -41,6 +41,8 @@
 static string FILEN = "simjob.slcio" ;
 
 
+//struct MyTrackLink : public LCObjectLinkTraits< SimTrackerHit, MyTrackLink > {} ;
+
 /** Simple test program to demonstrate writing of data with lcio.
  */
 
@@ -410,6 +412,11 @@
 	
 	for(int j=0;j<NHITS;j++){
 	  relNav.addRelation( tpcRawVec->getElementAt(j) , trkVec->getElementAt(j) , 0.42 ) ;
+	  
+//   	  tpcRawVec->getElementAt(j)->link<MyTrackLink>() = 
+//  	  (*tpcRawVec)[j]->link< MyTrackLink >()  =
+// 	    dynamic_cast<SimTrackerHit*>( (*trkVec)[j] );
+
 	}
 	evt->addCollection( relNav.createLCCollection() , "TPCRawFADCMCTruth" ) ;
 	
CVSspam 0.2.8