Commit in lcio/src/cpp on MAIN
include/UTIL/CellIDEncoder.h+7-71.3 -> 1.4
src/UTIL/CellIDEncoder.cc+28added 1.1
+35-7
1 added + 1 modified, total 2 files
fixed bug with multiple definitions for CellIDEncoder_cellID1Bit<> specializations

lcio/src/cpp/include/UTIL
CellIDEncoder.h 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- CellIDEncoder.h	2 Feb 2007 09:01:47 -0000	1.3
+++ CellIDEncoder.h	9 Feb 2007 11:37:01 -0000	1.4
@@ -30,22 +30,22 @@
   int CellIDEncoder_cellID1Bit()  { return -1 ; } 
 
   /** specialization that returns the proper bit for the second cellid */
-  template<> int CellIDEncoder_cellID1Bit<EVENT::SimCalorimeterHit>() {  return LCIO::CHBIT_ID1 ; }
+  template<> int CellIDEncoder_cellID1Bit<EVENT::SimCalorimeterHit>() ;
 
   /** specialization that returns the proper bit for the second cellid */
-  template<> int CellIDEncoder_cellID1Bit<EVENT::RawCalorimeterHit>() {  return LCIO::RCHBIT_ID1 ; }
+  template<> int CellIDEncoder_cellID1Bit<EVENT::RawCalorimeterHit>() ;
 
   /** specialization that returns the proper bit for the second cellid */
-  template<> int CellIDEncoder_cellID1Bit<EVENT::CalorimeterHit>() {  return LCIO::RCHBIT_ID1 ; }
+  template<> int CellIDEncoder_cellID1Bit<EVENT::CalorimeterHit>() 
 
   /** specialization that returns the proper bit for the second cellid */
-  template<> int CellIDEncoder_cellID1Bit<EVENT::TrackerData>() {  return LCIO::TRAWBIT_ID1 ; }
+  template<> int CellIDEncoder_cellID1Bit<EVENT::TrackerData>() ;
 
   /** specialization that returns the proper bit for the second cellid */
-  template<> int CellIDEncoder_cellID1Bit<EVENT::TrackerPulse>() {  return LCIO::TRAWBIT_ID1 ; }
+  template<> int CellIDEncoder_cellID1Bit<EVENT::TrackerPulse>() ;
 
   /** specialization that returns the proper bit for the second cellid */
-  template<> int CellIDEncoder_cellID1Bit<EVENT::TrackerRawData>() {  return LCIO::TRAWBIT_ID1 ; }
+  template<> int CellIDEncoder_cellID1Bit<EVENT::TrackerRawData>() ;
 
 
   /** Convenient class for encoding cellIDs for various hit objects.
@@ -63,7 +63,7 @@
    *  &nbsp;   } <br>
    * 
    *  @see BitField64
-   *  @version $Id: CellIDEncoder.h,v 1.3 2007/02/02 09:01:47 gaede Exp $
+   *  @version $Id: CellIDEncoder.h,v 1.4 2007/02/09 11:37:01 gaede Exp $
    */
   template <class T> 
   class CellIDEncoder : public BitField64 {

lcio/src/cpp/src/UTIL
CellIDEncoder.cc added at 1.1
diff -N CellIDEncoder.cc
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ CellIDEncoder.cc	9 Feb 2007 11:37:01 -0000	1.1
@@ -0,0 +1,28 @@
+#include "UTIL/CellIDEncoder.h"
+
+namespace UTIL{
+
+
+  /** Helper function that returns the bit for cellid1 through template specialization
+   *  or -1 if no cellid1 exists. 
+   */
+
+  /** specialization that returns the proper bit for the second cellid */
+  template<> int CellIDEncoder_cellID1Bit<EVENT::SimCalorimeterHit>() {  return LCIO::CHBIT_ID1 ; }
+
+  /** specialization that returns the proper bit for the second cellid */
+  template<> int CellIDEncoder_cellID1Bit<EVENT::RawCalorimeterHit>() {  return LCIO::RCHBIT_ID1 ; }
+
+  /** specialization that returns the proper bit for the second cellid */
+  template<> int CellIDEncoder_cellID1Bit<EVENT::CalorimeterHit>() {  return LCIO::RCHBIT_ID1 ; }
+
+  /** specialization that returns the proper bit for the second cellid */
+  template<> int CellIDEncoder_cellID1Bit<EVENT::TrackerData>() {  return LCIO::TRAWBIT_ID1 ; }
+
+  /** specialization that returns the proper bit for the second cellid */
+  template<> int CellIDEncoder_cellID1Bit<EVENT::TrackerPulse>() {  return LCIO::TRAWBIT_ID1 ; }
+
+  /** specialization that returns the proper bit for the second cellid */
+  template<> int CellIDEncoder_cellID1Bit<EVENT::TrackerRawData>() {  return LCIO::TRAWBIT_ID1 ; }
+  
+}
CVSspam 0.2.8