Removing obsolete macros

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

diff --git a/ITS/AliITSgeomSDD.h b/ITS/AliITSgeomSDD.h
index 5665644337d1ce4c5d114ed77f91106a4d0d4f5e..076b57e50a6e50bf79165f0038b22055cf35b288 100644 (file)
--- a/ITS/AliITSgeomSDD.h
+++ b/ITS/AliITSgeomSDD.h
@@ -4,11 +4,18 @@
  * See cxx source for full Copyright notice                               */
 
 /* $Id$ */
+
+
+////////////////////////////////////////////////////////////////////////
+// This class is for the Silicon Drift Detector, SDD, specific geometry.
+// It is being replaced by AliITSsegmentationSDD class. This file also
+// constains classes derived from AliITSgeomSDD which do nothing but
+// initilize this one with predefined values.
+////////////////////////////////////////////////////////////////////////
+
 #include <TObject.h>
 #include <TBRIK.h>
 
-class ostream;
-class istream;
 class TShape;
 
 class AliITSgeomSDD: public TObject {
@@ -20,19 +27,22 @@ class AliITSgeomSDD: public TObject {
     AliITSgeomSDD(AliITSgeomSDD &source);
     AliITSgeomSDD& operator=(AliITSgeomSDD &source);
     virtual ~AliITSgeomSDD();
+    void ResetSDD(const Float_t *box,Float_t per,Float_t vel,
+                 Float_t axL,Float_t axR,
+                 Int_t nA0,Float_t *le0,Int_t nA1,Float_t *le1);
     virtual TShape *GetShape() const {return fShapeSDD;}
-    virtual Float_t GetDx() { // Get TBRIK Dx
+    virtual Float_t GetDx() const { // Get TBRIK Dx
        if(fShapeSDD!=0) return fShapeSDD->GetDx();
        else return 0.0;}
-    virtual Float_t GetDy() {// Get TBRIK Dy
+    virtual Float_t GetDy() const {// Get TBRIK Dy
        if(fShapeSDD!=0) return fShapeSDD->GetDy();
        else return 0.0;}
-    virtual Float_t GetDz() {// Get TBRIK Dz
+    virtual Float_t GetDz() const {// Get TBRIK Dz
        if(fShapeSDD!=0) return fShapeSDD->GetDz();
        else return 0.0;}
-    virtual Float_t GetAnodeX(Int_t a,Int_t s){ // returns X position of anode
+    virtual Float_t GetAnodeX(Int_t a,Int_t s) const { // returns X position of anode
        if(s==0) return fAnodeXL; else return fAnodeXR;}
-    virtual Float_t GetAnodeZ(Int_t a,Int_t s){ // returns X position of anode
+    virtual Float_t GetAnodeZ(Int_t a,Int_t s)const { // returns X position of anode
        if(s==0) return 0.5*(fAnodeLowEdgeL[a]+fAnodeLowEdgeL[a+1]);
        else return 0.5*(fAnodeLowEdgeR[a]+fAnodeLowEdgeR[a+1]);}
     virtual void SetNAnodesL(Int_t s)
@@ -48,7 +58,7 @@ class AliITSgeomSDD: public TObject {
                         {fShapeSDD = new TBRIK(name,title,mat,dx,dy,dz);}
     virtual void Local2Det(Float_t xl,Float_t zl,Int_t &a,Int_t &t,Int_t &s);
     virtual void Det2Local(Int_t a,Int_t t,Int_t s,Float_t &xl,Float_t &zl);
-    virtual void Print(ostream *os);  // Output streamer to standard out.
+    virtual void Print(ostream *os) const; // Output streamer to standard out.
     virtual void Read(istream *is);   // Input streamer to standard in.
     // or what other or different information that is needed.
 
@@ -85,19 +95,18 @@ istream &operator>>(istream &os,AliITSgeomSDD &source);
 
 //#include "AliITSgeomSDD.h"
 
-class ostream;
-class istream;
 
 class AliITSgeomSDD256 : public AliITSgeomSDD {
 
  public:
     AliITSgeomSDD256();
+    AliITSgeomSDD256(Int_t npar,const Float_t *par);
 
     // This clas now has version 0 so that it will not be written to a root
     // file. This is good since there are no longer any data members to this
     // class. It is only designed to make it easer to define this standard
     // SDD detector geometry.
-    ClassDef(AliITSgeomSDD256,0) // ITS SDD detector geometry class for 256 anodes per side
+    ClassDef(AliITSgeomSDD256,1) // ITS SDD detector geometry class for 256 anodes per side
 
 };
 // Input and output function for standard C++ input/output.
@@ -116,8 +125,6 @@ istream &operator>>(istream &os,AliITSgeomSDD256 &source);
 
 //#include "AliITSgeomSDD.h"
 
-class ostream;
-class istream;
 
 class AliITSgeomSDD300 : public AliITSgeomSDD {
 
@@ -128,7 +135,7 @@ class AliITSgeomSDD300 : public AliITSgeomSDD {
     // file. This is good since there are no longer any data members to this
     // class. It is only designed to make it easer to define this standard
     // SDD detector geometry.
-    ClassDef(AliITSgeomSDD300,0) // ITS SDD detector geometry class for 300 anodes per side
+    ClassDef(AliITSgeomSDD300,1) // ITS SDD detector geometry class for 300 anodes per side
 
 };
 // Input and output function for standard C++ input/output.