kNLayers is now public

[u/mrichter/AliRoot.git] / ITS / AliITSv11Hybrid.h

diff --git a/ITS/AliITSv11Hybrid.h b/ITS/AliITSv11Hybrid.h
index 574ffb0174e280fe0abd07068846cd6ce24dd36e..b158173082b364537e110953f8b8e361475b08a8 100644 (file)
--- a/ITS/AliITSv11Hybrid.h
+++ b/ITS/AliITSv11Hybrid.h
@@ -3,10 +3,6 @@
 /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
  * See cxx source for full Copyright notice                               */
 
-// $Id$
-
-// $Log$
-
 //========================================================================
 //
 //            Geometry of the Inner Tracking System
@@ -17,16 +13,31 @@
 // Ludovic Gaudichet  (gaudichet@to.infn.it)
 //
 //========================================================================
+
+
+// $Id$
+
+// $Log$
+// Revision 1.4  2007/06/28 10:17:25  masera
+// Introduction of the new SSD geometry in simulation (AliITSv11Hybrid) and suppression of overlaps between old and new parts
+//
+// Revision 1.3  2007/05/08 16:57:42  masera
+// Updates concerning the geometry: versioning system, new V11hybrid version, bug fixes (B.Nilsend and L. Gaudichet
+//
+
  
 #include "AliITS.h"
 #include "AliITSInitGeometry.h"
 
+class  AliITSv11GeometrySPD;
 class  AliITSv11GeometrySDD;
+class  AliITSv11GeometrySSD;
 
 class AliITSv11Hybrid : public AliITS {
 
  public:
     AliITSv11Hybrid();
+    AliITSv11Hybrid(const char *title);
     AliITSv11Hybrid(const char *name, const char *title);
     virtual       ~AliITSv11Hybrid() ;
     virtual void   BuildGeometry();
@@ -110,8 +121,8 @@ class AliITSv11Hybrid : public AliITS {
 
  protected:
     void CreateOldGeometry();
-    void SetT2Lmatrix(const char *name, Double_t dAlpha, Double_t dxSign,
-                     Double_t yShift, Bool_t yFlip, Bool_t yRot180=kFALSE) const; // Set T2L matrix in TGeoPNEntries
+    void SetT2Lmatrix(const char *name, Double_t yShift,
+                     Bool_t yFlip, Bool_t yRot180=kFALSE) const; // Set T2L matrix in TGeoPNEntries
 
  private:
     AliITSv11Hybrid(const AliITSv11Hybrid &source); // copy constructor
@@ -136,9 +147,11 @@ class AliITSv11Hybrid : public AliITS {
     Int_t fIDMother;          //! ITS Mother Volume id.
 
     AliITSInitGeometry fInitGeom;   //! Get access to decoding and AliITSgeom init functins
+    AliITSv11GeometrySPD *fSPDgeom; //! SPD Geometry
     AliITSv11GeometrySDD *fSDDgeom; //! SDD Geometry
+    AliITSv11GeometrySSD *fSSDgeom; //! SSD Geometry
 
-    ClassDef(AliITSv11Hybrid,2)                          
+    ClassDef(AliITSv11Hybrid,0)                          
 };
  
 #endif