Merge branch 'master' of https://git.cern.ch/reps/AliRoot

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

diff --git a/ITS/AliITSsimulation.h b/ITS/AliITSsimulation.h
index 85fd1da0be63ee98976e11b78a5f0d63eda1a126..bf7fc53fc4e182b54300a0b585c798a4ce32976c 100644 (file)
--- a/ITS/AliITSsimulation.h
+++ b/ITS/AliITSsimulation.h
@@ -21,7 +21,7 @@
 #include "AliITSDetTypeSim.h"
 #include "AliITSpList.h"
 
-class AliITSresponse;
+class AliITSCalibration;
 class AliITSsegmentation;
 class AliITSmodule;
 class TRandom;
@@ -41,7 +41,7 @@ class AliITSsimulation : public TObject {
     // copy constructor. See detector specific implementation.
     AliITSsimulation(const AliITSsimulation &source);
     // Assignment opporator. See detector specific implementation.
-    virtual AliITSsimulation& operator=(const AliITSsimulation &source);
+    AliITSsimulation& operator=(const AliITSsimulation &source);
     // Initialize simulation
     virtual void Init() {};
 
@@ -68,9 +68,9 @@ class AliITSsimulation : public TObject {
     virtual void CreateFastRecPoints(AliITSmodule *,Int_t,
                                     TRandom *,TClonesArray* /*recp*/) {;}
    // Return pointer to Response model
-    virtual AliITSresponse* GetResponseModel(Int_t mod = 0){return fDetType->GetResponseModel(mod);}
+    virtual AliITSCalibration* GetCalibrationModel(Int_t mod = 0){return fDetType->GetCalibrationModel(mod);}
    // set pointer to Response model
-    virtual void SetResponseModel(Int_t mod, AliITSresponse *res){fDetType->SetResponseModel(mod,res);}
+    virtual void SetCalibrationModel(Int_t mod, AliITSCalibration *res){fDetType->SetCalibrationModel(mod,res);}
     // Return pointer to Segmentation object
     virtual AliITSsegmentation* GetSegmentationModel(Int_t dt) = 0;
     // set pointer to Segmentation object
@@ -88,10 +88,9 @@ class AliITSsimulation : public TObject {
     void SetNoDebug(){fDebug=0;}
     // Returns the debug flag value
     Bool_t GetDebug(Int_t level=1)const {return fDebug>=level;}
+    void SetDetType(AliITSDetTypeSim* dettyp) {fDetType=dettyp;}
 
  protected:
-    //    AliITSresponse      *fResponse;       //! response
-    //    AliITSsegmentation  *fSegmentation;   //! segmentation 
     AliITSDetTypeSim    *fDetType;        //! Access resp and segm via this obj
     AliITSpList         *fpList;          //!
     Int_t                fModule;         //!