Raw2SDigits() restored and improved.

[u/mrichter/AliRoot.git] / MUON / AliMUONVCluster.h

diff --git a/MUON/AliMUONVCluster.h b/MUON/AliMUONVCluster.h
index 1bf15817c0980117152168c75ed79a49d723dce0..0c05e68583e3b94bdbc23e965d7e54f5e8d03d66 100644 (file)
--- a/MUON/AliMUONVCluster.h
+++ b/MUON/AliMUONVCluster.h
@@ -23,7 +23,7 @@ class AliMUONVCluster : public TObject {
   
            /// Clear method (used by TClonesArray)
   virtual void Clear(Option_t*) = 0;
-  
+
            /// Set coordinates (cm)
   virtual void     SetXYZ(Double_t x, Double_t y, Double_t z) = 0;
            /// Return coordinate X (cm)
@@ -51,7 +51,7 @@ class AliMUONVCluster : public TObject {
   
            /// Build a single integer with id information
   static  UInt_t   BuildUniqueID(Int_t chamberId, Int_t detElemId, Int_t clusterIndex)
-                       {return ((chamberId << 28) | (detElemId << 17) | (clusterIndex));}
+                       {return (((chamberId & 0xF) << 28) | ((detElemId & 0x7FF) << 17) | (clusterIndex & 0x1FFFF));}
            /// Return chamber id (0..), part of the uniqueID
   static  Int_t    GetChamberId(UInt_t uniqueID)    {return (uniqueID & 0xF0000000) >> 28;}
            /// Return detection element id, part of the uniqueID
@@ -79,9 +79,6 @@ class AliMUONVCluster : public TObject {
   
   virtual void     Print(Option_t *option = "") const;
   
- protected:
-  static const Double_t fgkDefaultNonBendingReso; ///< default chamber resolution in the non-bending direction
-  static const Double_t fgkDefaultBendingReso; ///< default chamber resolution in the bending direction
   
   ClassDef(AliMUONVCluster, 1) // abstract base class for cluster
 };