X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=ITS%2FAliITSDetTypeSim.h;h=7247bf3ee60787f23d3b29ab68a9464f00d6d010;hb=d7c519b23ad6cfddfe76a6ae1d511de3fa9b09e5;hp=ab1e0de4bc5d8f109b2959a1e8ea8ea140dc13e6;hpb=e6b4e6b96d96cd36fdb666e1cd52151a388a4416;p=u%2Fmrichter%2FAliRoot.git

diff --git a/ITS/AliITSDetTypeSim.h b/ITS/AliITSDetTypeSim.h
index ab1e0de4bc5..7247bf3ee60 100644
--- a/ITS/AliITSDetTypeSim.h
+++ b/ITS/AliITSDetTypeSim.h
@@ -16,6 +16,7 @@ $Id$
 #include <TObjArray.h>
 #include <TClonesArray.h>
 #include "AliITSCalibration.h"
+#include "AliITSSimuParam.h"
 #include "AliITSDDLModuleMapSDD.h"
 #include "AliITSLoader.h"
 #include "AliITSgeom.h"
@@ -28,6 +29,10 @@ class AliITSpListItem;
 class AliITSsimulation;
 class AliITSsegmentation;
 class AliITSresponse;
+class AliITSCalibrationSSD;
+class AliITSGainSSDv2;
+class AliITSBadChannelsSSDv2;
+class AliITSNoiseSSDv2;
 
 class AliITSDetTypeSim : public TObject {
  public:
@@ -51,9 +56,18 @@ class AliITSDetTypeSim : public TObject {
 
     virtual void SetCalibrationModel(Int_t iMod,AliITSCalibration *resp);
     virtual AliITSCalibration* GetCalibrationModel(Int_t iMod);
-    virtual AliITSresponse* GetResponse(Int_t dettype) {
+    /* 
+   virtual AliITSresponse* GetResponse(Int_t dettype) {
 	return GetCalibrationModel(
 	    GetITSgeom()->GetStartDet(dettype))->GetResponse();}
+    */
+    virtual void SetSimuParam(AliITSSimuParam* spar){
+      if(fSimuPar) delete fSimuPar;
+      fSimuPar = new AliITSSimuParam(*spar);
+    }
+    virtual AliITSSimuParam* GetSimuParam() const {return fSimuPar;}
+
+    virtual Bool_t IsHLTmodeC() const {return fIsHLTmodeC;}
     virtual AliITSDDLModuleMapSDD* GetDDLModuleMapSDD()const { return fDDLMapSDD;}
     TObjArray* GetCalibrationArray() const {return fCalibration;}
     TObjArray* GetSegmentation() const {return fSegmentation;}
@@ -67,8 +81,8 @@ class AliITSDetTypeSim : public TObject {
     virtual void SetDefaultSimulation();
     virtual void SetRunNumber(Int_t rn=0){fRunNumber = rn;}
     virtual Int_t GetRunNumber() const {return fRunNumber;}
-    virtual void SetTreeAddressS(TTree* treeS, Char_t* name);
-    virtual void SetTreeAddressD(TTree* treeD, Char_t* name);
+    virtual void SetTreeAddressS(TTree* treeS, const Char_t* name);
+    virtual void SetTreeAddressD(TTree* treeD, const Char_t* name);
 
     virtual void SetDigits(TObjArray* digits) {fDigits=digits;}
     const TClonesArray* GetSDigits() const { return &fSDigits;}
@@ -79,16 +93,16 @@ class AliITSDetTypeSim : public TObject {
     virtual void ResetSDigits(){fNSDigits=0; fSDigits.Clear();}
     virtual void ResetDigits();
     virtual void ResetDigits(Int_t branch);
-    virtual void SDigitsToDigits(Option_t *opt,Char_t* name);
+    virtual void SDigitsToDigits(Option_t *opt, Char_t* name);
 
     virtual void AddSumDigit(AliITSpListItem &sdig);
-    virtual void AddRealDigit(Int_t branch, Int_t *digits);
     virtual void AddSimDigit(Int_t branch, AliITSdigit *d);
     virtual void AddSimDigit(Int_t branch,Float_t phys,Int_t* digits,
-			     Int_t* tracks,Int_t *hits,Float_t* trkcharges);
-    virtual void SetDigitClassName(Int_t i, Char_t* name) {
+			     Int_t* tracks,Int_t *hits,Float_t* trkcharges,
+			     Int_t sigexpanded=-1000);
+    virtual void SetDigitClassName(Int_t i, const Char_t* name) {
 	fDigClassName[i]=name;}
-    Char_t* GetDigitClassName(Int_t i) const {return fDigClassName[i];}
+    const Char_t* GetDigitClassName(Int_t i) const {return fDigClassName[i];}
     void StoreCalibration(Int_t firstRun, Int_t lastRun, AliCDBMetaData &md);
 
  protected:
@@ -97,6 +111,15 @@ class AliITSDetTypeSim : public TObject {
     
  private:
     void SetDefaultSegmentation(Int_t idet);  // creates def segm.
+
+    //conversion of the old SSD calibration objects tothe new ones
+    void ReadOldSSDNoise(TObjArray *array, 
+			 AliITSNoiseSSDv2 *noiseSSD);
+    void ReadOldSSDBadChannels(TObjArray *array, 
+			       AliITSBadChannelsSSDv2 *badChannelsSSD);
+    void ReadOldSSDGain(TObjArray *array, 
+			AliITSGainSSDv2 *gainSSD);
+
     static const Int_t fgkNdettypes;          // number of different det. types
     static const Int_t fgkDefaultNModulesSPD; // Total numbers of SPD modules by default
     static const Int_t fgkDefaultNModulesSDD; // Total numbers of SDD modules by default
@@ -106,6 +129,7 @@ class AliITSDetTypeSim : public TObject {
     TObjArray    *fSimulation;   //! [NDet]
     TObjArray    *fSegmentation; //! [NDet]
     TObjArray    *fCalibration;  //! [NMod]
+    AliITSCalibrationSSD* fSSDCalibration;  //! SSD calibration object
     TObjArray    *fPreProcess;   //! [] e.g. Fill fHitModule with hits
     TObjArray    *fPostProcess;  //! [] e.g. Wright Raw data
     Int_t         fNSDigits;     //! number of SDigits
@@ -113,14 +137,16 @@ class AliITSDetTypeSim : public TObject {
     Int_t*        fNDigits;      //! [NDet] number of Digits for det.
     Int_t         fRunNumber;    //! run number (to access DB)
     TObjArray     *fDigits;      //! [NMod][NDigits]
+    AliITSSimuParam *fSimuPar;   //! detector simulation parameters
     AliITSDDLModuleMapSDD *fDDLMapSDD; //! mapping DDL/module -> SDD module number
     TString       fHitClassName; //! String with Hit class name
     TString       fSDigClassName;//! String with SDigit class name.
-    Char_t*       fDigClassName[3]; //! String with digit class name.
+    const Char_t*       fDigClassName[3]; //! String with digit class name.
     AliITSLoader* fLoader;          //! loader  
     Bool_t        fFirstcall;       //! flag
+    Bool_t        fIsHLTmodeC;    //! flag for HLT mode C status (used by SDD)
     
-    ClassDef(AliITSDetTypeSim,6) // ITS Simulation structure
+    ClassDef(AliITSDetTypeSim,8) // ITS Simulation structure
  
 };