Print

Print


Commit in lcio/src on MAIN
aid/EVENT/LCFloatVec.aid+1-11.6 -> 1.7
         /LCGenericObject.aid+2-21.6 -> 1.7
         /LCIntVec.aid+1-11.4 -> 1.5
         /LCStrVec.aid+1-11.2 -> 1.3
cpp/include/IMPL/AccessChecked.h+1-11.4 -> 1.5
                /CalorimeterHitImpl.h+2-21.14 -> 1.15
                /ClusterImpl.h+2-21.12 -> 1.13
                /LCGenericObjectImpl.h+2-21.4 -> 1.5
                /LCRelationImpl.h+1-11.6 -> 1.7
                /LCRunHeaderImpl.h+1-11.9 -> 1.10
                /MCParticleImpl.h+2-21.22 -> 1.23
                /ParticleIDImpl.h+2-21.9 -> 1.10
                /RawCalorimeterHitImpl.h+2-21.2 -> 1.3
                /ReconstructedParticleImpl.h+1-11.10 -> 1.11
                /SimCalorimeterHitImpl.h+1-11.15 -> 1.16
                /SimTrackerHitImpl.h+1-11.11 -> 1.12
                /TPCHitImpl.h+1-11.6 -> 1.7
                /TrackImpl.h+2-21.13 -> 1.14
                /TrackerDataImpl.h+2-21.1 -> 1.2
                /TrackerHitImpl.h+2-21.9 -> 1.10
                /TrackerPulseImpl.h+2-21.1 -> 1.2
                /TrackerRawDataImpl.h+2-21.1 -> 1.2
+34-34
22 modified files
maded id() const - bug fix LCIO-42

lcio/src/aid/EVENT
LCFloatVec.aid 1.6 -> 1.7
diff -u -r1.6 -r1.7
--- LCFloatVec.aid	24 Mar 2006 13:25:52 -0000	1.6
+++ LCFloatVec.aid	4 Aug 2006 16:52:44 -0000	1.7
@@ -22,7 +22,7 @@
     typedef LCFloatVec lcobject_type ;
 
     public:
-    int id() { return _acc.simpleUID() ; } 
+    int id() const { return _acc.simpleUID() ; } 
     protected:
       IMPL::AccessChecked _acc ;
 }

lcio/src/aid/EVENT
LCGenericObject.aid 1.6 -> 1.7
diff -u -r1.6 -r1.7
--- LCGenericObject.aid	24 Mar 2006 13:25:52 -0000	1.6
+++ LCGenericObject.aid	4 Aug 2006 16:52:44 -0000	1.7
@@ -12,7 +12,7 @@
  * from const std::string& to const std::string to  make the implementation easier
  * @endif
  * @author gaede 
- * @version $Id: LCGenericObject.aid,v 1.6 2006/03/24 13:25:52 gaede Exp $
+ * @version $Id: LCGenericObject.aid,v 1.7 2006/08/04 16:52:44 gaede Exp $
  */
 
 public interface LCGenericObject extends LCObject 
@@ -76,7 +76,7 @@
     @cpp{
 	/** Provide default implementation for id
 	 */
-	virtual int id() {  return 0 ; }  
+	virtual int id() const {  return 0 ; }  
     }
 
 }

lcio/src/aid/EVENT
LCIntVec.aid 1.4 -> 1.5
diff -u -r1.4 -r1.5
--- LCIntVec.aid	24 Mar 2006 13:25:52 -0000	1.4
+++ LCIntVec.aid	4 Aug 2006 16:52:45 -0000	1.5
@@ -21,7 +21,7 @@
     typedef LCIntVec lcobject_type ;
 
     public:
-    int id() { return _acc.simpleUID() ; } 
+    int id() const { return _acc.simpleUID() ; } 
     protected:
       IMPL::AccessChecked _acc ;
 }

lcio/src/aid/EVENT
LCStrVec.aid 1.2 -> 1.3
diff -u -r1.2 -r1.3
--- LCStrVec.aid	24 Mar 2006 13:25:52 -0000	1.2
+++ LCStrVec.aid	4 Aug 2006 16:52:45 -0000	1.3
@@ -21,7 +21,7 @@
     typedef LCStrVec lcobject_type ;
 
     public:
-    int id() { return _acc.simpleUID() ; } 
+    int id() const { return _acc.simpleUID() ; } 
     protected:
       IMPL::AccessChecked _acc ;
 }

lcio/src/cpp/include/IMPL
AccessChecked.h 1.4 -> 1.5
diff -u -r1.4 -r1.5
--- AccessChecked.h	15 Apr 2005 08:37:37 -0000	1.4
+++ AccessChecked.h	4 Aug 2006 16:52:45 -0000	1.5
@@ -21,7 +21,7 @@
     
   public:
     AccessChecked() ;
-    virtual int simpleUID() { return _id ; }
+    virtual int simpleUID() const { return _id ; }
 
   protected:
     virtual void setReadOnly( bool readOnly ) ;

lcio/src/cpp/include/IMPL
CalorimeterHitImpl.h 1.14 -> 1.15
diff -u -r1.14 -r1.15
--- CalorimeterHitImpl.h	15 Apr 2005 08:37:37 -0000	1.14
+++ CalorimeterHitImpl.h	4 Aug 2006 16:52:46 -0000	1.15
@@ -13,7 +13,7 @@
 /** Implementation of the real data CalorimeterHit.
  * 
  * @author gaede
- * @version $Id: CalorimeterHitImpl.h,v 1.14 2005/04/15 08:37:37 gaede Exp $
+ * @version $Id: CalorimeterHitImpl.h,v 1.15 2006/08/04 16:52:46 gaede Exp $
  */
 
   class CalorimeterHitImpl : public EVENT::CalorimeterHit , public AccessChecked {
@@ -31,7 +31,7 @@
     /// Destructor.
     virtual ~CalorimeterHitImpl() ;
     
-    virtual int id() { return simpleUID() ; }
+    virtual int id() const { return simpleUID() ; }
 
     /**Returns the detector specific (geometrical) cell id.
      */

lcio/src/cpp/include/IMPL
ClusterImpl.h 1.12 -> 1.13
diff -u -r1.12 -r1.13
--- ClusterImpl.h	15 Apr 2005 08:37:37 -0000	1.12
+++ ClusterImpl.h	4 Aug 2006 16:52:46 -0000	1.13
@@ -19,7 +19,7 @@
  *
  * @see Cluster
  * @author gaede
- * @version $Id: ClusterImpl.h,v 1.12 2005/04/15 08:37:37 gaede Exp $
+ * @version $Id: ClusterImpl.h,v 1.13 2006/08/04 16:52:46 gaede Exp $
  */
   class ClusterImpl : public EVENT::Cluster, public AccessChecked {
     
@@ -32,7 +32,7 @@
     /// Destructor.
     virtual ~ClusterImpl() ; 
 
-    virtual int id() { return simpleUID() ; }
+    virtual int id() const { return simpleUID() ; }
 
     /** Flagword that defines the type of cluster. Bits 0-15 can be used to denote the subdetectors
      *  that have contributed hits to the cluster. The definition of the bits has to be done 

lcio/src/cpp/include/IMPL
LCGenericObjectImpl.h 1.4 -> 1.5
diff -u -r1.4 -r1.5
--- LCGenericObjectImpl.h	11 Feb 2005 15:29:51 -0000	1.4
+++ LCGenericObjectImpl.h	4 Aug 2006 16:52:46 -0000	1.5
@@ -12,7 +12,7 @@
  * user data.
  * 
  * @author gaede 
- * @version $Id: LCGenericObjectImpl.h,v 1.4 2005/02/11 15:29:51 gaede Exp $
+ * @version $Id: LCGenericObjectImpl.h,v 1.5 2006/08/04 16:52:46 gaede Exp $
  */
 
 class LCGenericObjectImpl : public EVENT::LCGenericObject, public AccessChecked {
@@ -30,7 +30,7 @@
   /// Destructor.
   virtual ~LCGenericObjectImpl() { /* nop */; }
   
-  virtual int id() { return simpleUID() ; }
+  virtual int id() const { return simpleUID() ; }
 
   /** Number of integer values stored in this object.
    */

lcio/src/cpp/include/IMPL
LCRelationImpl.h 1.6 -> 1.7
diff -u -r1.6 -r1.7
--- LCRelationImpl.h	15 Apr 2005 08:37:37 -0000	1.6
+++ LCRelationImpl.h	4 Aug 2006 16:52:46 -0000	1.7
@@ -28,7 +28,7 @@
 											  _weight(weight) {}
     ~LCRelationImpl(){}
 
-    int id() { return simpleUID() ; }
+    int id() const { return simpleUID() ; }
 
     EVENT::LCObject * getFrom() const { return _from ; }
     EVENT::LCObject * getTo() const { return _to ; } 

lcio/src/cpp/include/IMPL
LCRunHeaderImpl.h 1.9 -> 1.10
diff -u -r1.9 -r1.10
--- LCRunHeaderImpl.h	15 Apr 2005 08:37:37 -0000	1.9
+++ LCRunHeaderImpl.h	4 Aug 2006 16:52:46 -0000	1.10
@@ -24,7 +24,7 @@
     /// Destructor.
     virtual ~LCRunHeaderImpl() ; 
 
-    virtual int id() { return simpleUID() ; }
+    virtual int id() const { return simpleUID() ; }
 
     /** Returns the run number.
      */

lcio/src/cpp/include/IMPL
MCParticleImpl.h 1.22 -> 1.23
diff -u -r1.22 -r1.23
--- MCParticleImpl.h	29 Mar 2006 14:11:26 -0000	1.22
+++ MCParticleImpl.h	4 Aug 2006 16:52:46 -0000	1.23
@@ -19,7 +19,7 @@
   /** Implementation of MCParticle.
    * 
    * @author gaede
-   * @version $Id: MCParticleImpl.h,v 1.22 2006/03/29 14:11:26 gaede Exp $
+   * @version $Id: MCParticleImpl.h,v 1.23 2006/08/04 16:52:46 gaede Exp $
    */
   class MCParticleImpl : public EVENT::MCParticle, public AccessChecked {
     
@@ -33,7 +33,7 @@
     /// Destructor.
     virtual ~MCParticleImpl() ;
 
-    virtual int id() { return simpleUID() ; }
+    virtual int id() const { return simpleUID() ; }
 
     /** Returns the parents of this particle. 
      */

lcio/src/cpp/include/IMPL
ParticleIDImpl.h 1.9 -> 1.10
diff -u -r1.9 -r1.10
--- ParticleIDImpl.h	15 Apr 2005 08:37:37 -0000	1.9
+++ ParticleIDImpl.h	4 Aug 2006 16:52:46 -0000	1.10
@@ -23,7 +23,7 @@
  *
  * @see ParticleID
  * @author gaede
- * @version $Id: ParticleIDImpl.h,v 1.9 2005/04/15 08:37:37 gaede Exp $
+ * @version $Id: ParticleIDImpl.h,v 1.10 2006/08/04 16:52:46 gaede Exp $
  */
 
   class ParticleIDImpl : public EVENT::ParticleID, public AccessChecked {
@@ -37,7 +37,7 @@
     /// Destructor.
     virtual ~ParticleIDImpl() ; 
 
-    virtual int id() { return simpleUID() ; }
+    virtual int id() const { return simpleUID() ; }
 
     /** Type - userdefined.
      */

lcio/src/cpp/include/IMPL
RawCalorimeterHitImpl.h 1.2 -> 1.3
diff -u -r1.2 -r1.3
--- RawCalorimeterHitImpl.h	15 Apr 2005 08:37:37 -0000	1.2
+++ RawCalorimeterHitImpl.h	4 Aug 2006 16:52:46 -0000	1.3
@@ -13,7 +13,7 @@
 /** Implementation of the real data RawCalorimeterHit.
  * 
  * @author gaede
- * @version $Id: RawCalorimeterHitImpl.h,v 1.2 2005/04/15 08:37:37 gaede Exp $
+ * @version $Id: RawCalorimeterHitImpl.h,v 1.3 2006/08/04 16:52:46 gaede Exp $
  */
 
   class RawCalorimeterHitImpl : public EVENT::RawCalorimeterHit , public AccessChecked {
@@ -27,7 +27,7 @@
     /// Destructor.
     virtual ~RawCalorimeterHitImpl() ;
     
-    virtual int id() { return simpleUID() ; }
+    virtual int id() const { return simpleUID() ; }
 
     /** Returns the detector specific (geometrical) cell id.
      */

lcio/src/cpp/include/IMPL
ReconstructedParticleImpl.h 1.10 -> 1.11
diff -u -r1.10 -r1.11
--- ReconstructedParticleImpl.h	27 May 2005 07:55:54 -0000	1.10
+++ ReconstructedParticleImpl.h	4 Aug 2006 16:52:46 -0000	1.11
@@ -30,7 +30,7 @@
     /// Destructor.
     virtual ~ReconstructedParticleImpl() ; 
 
-    virtual int id() { return simpleUID() ; }
+    virtual int id() const { return simpleUID() ; }
 
 
     /** Type of reconstructed particle.

lcio/src/cpp/include/IMPL
SimCalorimeterHitImpl.h 1.15 -> 1.16
diff -u -r1.15 -r1.16
--- SimCalorimeterHitImpl.h	15 Apr 2005 08:37:38 -0000	1.15
+++ SimCalorimeterHitImpl.h	4 Aug 2006 16:52:46 -0000	1.16
@@ -41,7 +41,7 @@
     /// Destructor.
     virtual ~SimCalorimeterHitImpl() ;
     
-    virtual int id() { return simpleUID() ; }
+    virtual int id() const { return simpleUID() ; }
 
     /** Create a deep copy of itself.
      * Overwrites return type in LCObject::clone().

lcio/src/cpp/include/IMPL
SimTrackerHitImpl.h 1.11 -> 1.12
diff -u -r1.11 -r1.12
--- SimTrackerHitImpl.h	7 Mar 2006 17:42:18 -0000	1.11
+++ SimTrackerHitImpl.h	4 Aug 2006 16:52:46 -0000	1.12
@@ -28,7 +28,7 @@
     /// Destructor.
     virtual ~SimTrackerHitImpl() ; 
     
-    virtual int id() { return simpleUID() ; }
+    virtual int id() const { return simpleUID() ; }
 
     /**Returns the detector specific (geometrical) cell id.
      */

lcio/src/cpp/include/IMPL
TPCHitImpl.h 1.6 -> 1.7
diff -u -r1.6 -r1.7
--- TPCHitImpl.h	15 Apr 2005 08:37:38 -0000	1.6
+++ TPCHitImpl.h	4 Aug 2006 16:52:46 -0000	1.7
@@ -23,7 +23,7 @@
   /// Destructor.
   virtual ~TPCHitImpl() ;
   
-  virtual int id() { return simpleUID() ; }
+  virtual int id() const { return simpleUID() ; }
     
   /** Returns the detector specific cell id.
    */

lcio/src/cpp/include/IMPL
TrackImpl.h 1.13 -> 1.14
diff -u -r1.13 -r1.14
--- TrackImpl.h	3 Jun 2005 10:58:34 -0000	1.13
+++ TrackImpl.h	4 Aug 2006 16:52:46 -0000	1.14
@@ -21,7 +21,7 @@
  *
  * @see Track
  * @author gaede
- * @version $Id: TrackImpl.h,v 1.13 2005/06/03 10:58:34 gaede Exp $
+ * @version $Id: TrackImpl.h,v 1.14 2006/08/04 16:52:46 gaede Exp $
  */
 
   class TrackImpl : public EVENT::Track, public AccessChecked {
@@ -35,7 +35,7 @@
     /// Destructor.
     virtual ~TrackImpl() ; 
     
-    virtual int id() { return simpleUID() ; }
+    virtual int id() const { return simpleUID() ; }
 
 //     /** Type of track, i.e. the subdetector(s) used to derive the track paramters, e.g. "TPC", "COMB", etc.
 //      *  In order to save disc space working groups should try and define three to four letter acronyms for

lcio/src/cpp/include/IMPL
TrackerDataImpl.h 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- TrackerDataImpl.h	31 May 2005 07:43:23 -0000	1.1
+++ TrackerDataImpl.h	4 Aug 2006 16:52:46 -0000	1.2
@@ -9,7 +9,7 @@
 /** Default implementation of TrackerData.
  * 
  * @author gaede
- * @version $Id: TrackerDataImpl.h,v 1.1 2005/05/31 07:43:23 gaede Exp $
+ * @version $Id: TrackerDataImpl.h,v 1.2 2006/08/04 16:52:46 gaede Exp $
  */
 
 class TrackerDataImpl :  public EVENT::TrackerData , public AccessChecked {
@@ -23,7 +23,7 @@
   /// Destructor.
   virtual ~TrackerDataImpl() ;
   
-  virtual int id() { return simpleUID() ; }
+  virtual int id() const { return simpleUID() ; }
   
   /** Returns the first detector specific (geometrical) cell id.
    */

lcio/src/cpp/include/IMPL
TrackerHitImpl.h 1.9 -> 1.10
diff -u -r1.9 -r1.10
--- TrackerHitImpl.h	15 Apr 2005 08:37:38 -0000	1.9
+++ TrackerHitImpl.h	4 Aug 2006 16:52:46 -0000	1.10
@@ -15,7 +15,7 @@
 /** Implementation of the  generic tracker hit. 
  * 
  * @author gaede
- * @version $Id: TrackerHitImpl.h,v 1.9 2005/04/15 08:37:38 gaede Exp $
+ * @version $Id: TrackerHitImpl.h,v 1.10 2006/08/04 16:52:46 gaede Exp $
  */
 
   class TrackerHitImpl : public EVENT::TrackerHit , public AccessChecked {
@@ -28,7 +28,7 @@
     virtual ~TrackerHitImpl() ; 
 
 
-    virtual int id() { return simpleUID() ; }
+    virtual int id() const { return simpleUID() ; }
 
     /** The hit  position in [mm].	
      */

lcio/src/cpp/include/IMPL
TrackerPulseImpl.h 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- TrackerPulseImpl.h	31 May 2005 07:43:23 -0000	1.1
+++ TrackerPulseImpl.h	4 Aug 2006 16:52:47 -0000	1.2
@@ -9,7 +9,7 @@
 /** Default implementation of TrackerPulse.
  * 
  * @author gaede
- * @version $Id: TrackerPulseImpl.h,v 1.1 2005/05/31 07:43:23 gaede Exp $
+ * @version $Id: TrackerPulseImpl.h,v 1.2 2006/08/04 16:52:47 gaede Exp $
  */
 
   class TrackerPulseImpl :  public EVENT::TrackerPulse , public AccessChecked {
@@ -23,7 +23,7 @@
     /// Destructor.
     virtual ~TrackerPulseImpl() ;
     
-    virtual int id() { return simpleUID() ; }
+    virtual int id() const { return simpleUID() ; }
     
 
     /** Returns the first detector specific (geometrical) cell id.

lcio/src/cpp/include/IMPL
TrackerRawDataImpl.h 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- TrackerRawDataImpl.h	31 May 2005 07:43:23 -0000	1.1
+++ TrackerRawDataImpl.h	4 Aug 2006 16:52:47 -0000	1.2
@@ -9,7 +9,7 @@
 /** Default implementation of TrackerRawData.
  * 
  * @author gaede
- * @version $Id: TrackerRawDataImpl.h,v 1.1 2005/05/31 07:43:23 gaede Exp $
+ * @version $Id: TrackerRawDataImpl.h,v 1.2 2006/08/04 16:52:47 gaede Exp $
  */
 
 class TrackerRawDataImpl :  public EVENT::TrackerRawData , public AccessChecked {
@@ -23,7 +23,7 @@
   /// Destructor.
   virtual ~TrackerRawDataImpl() ;
   
-  virtual int id() { return simpleUID() ; }
+  virtual int id() const { return simpleUID() ; }
     
   /** Returns the first detector specific (geometrical) cell id.
    */
CVSspam 0.2.8