first steps to set the covariance matrix from the errors calculated in conformal...

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

diff --git a/ITS/AliITS.h b/ITS/AliITS.h
index 8028010143a080f0698d960f2b851323b958a17a..e8ab7397873a3e91cfcedc49aca6fc93ada49c7a 100644 (file)
--- a/ITS/AliITS.h
+++ b/ITS/AliITS.h
@@ -21,6 +21,7 @@ class TTree;
 class AliITSpListItem;
 class AliITSsimulation;
 class AliITSsegmentation;
+
 class AliITSCalibration;
 class AliITShit;
 class AliITSgeom;
@@ -35,10 +36,9 @@ class AliITS : public AliDetector {
  public:
     //================= Standard Classes ===============================
     AliITS();  // Default creator.
-    AliITS(const char *name, const char *title); // standard Creator
+    AliITS(const Char_t *title); // standard Creator
+    AliITS(const char *name, const char *title); // extended standard Creator
     virtual ~AliITS(); // destructor
-    AliITS(const AliITS &source); // copy constructor. Not to be used!
-    AliITS& operator=(const AliITS &source); // = operator. Not to be used!
     virtual Int_t IsVersion() const {return 1;}
     virtual Int_t DistancetoPrimitive(Int_t , Int_t )  {return 999;}
 
@@ -55,7 +55,6 @@ class AliITS : public AliDetector {
     // ITS geometry functions From Simulation
     AliITSgeom* GetITSgeom() const {return fDetTypeSim->GetITSgeom();}
     void   SetITSgeom(AliITSgeom *geom) {fDetTypeSim->SetITSgeom(geom);}
-    virtual void   WriteGeometry();
     // return pointer to the array of modules
     TObjArray *GetModules(){return fITSmodules;}
 
@@ -98,15 +97,13 @@ class AliITS : public AliDetector {
     //------------ sort hits by module for Digitisation ----------------
     virtual void FillModules(Int_t evnt,Int_t bgrev,Int_t nmodules,
                             Option_t *opt, const char *filename); 
-    virtual void InitModules(Int_t size,Int_t &nmodules);  
+    virtual Bool_t InitModules(Int_t size,Int_t &nmodules);  
     virtual void FillModules(TTree *treeH, Int_t mask = 0);
     virtual void ClearModules(){if(fITSmodules) fITSmodules->Delete();}
     virtual void AddHit(Int_t track, Int_t *vol, Float_t *hits);
    // Trigger
     virtual AliTriggerDetector* CreateTriggerDetector() const
        { return new AliITSTrigger(); }
-   
-    TClonesArray* GetSDigits() const { return fDetTypeSim->GetSDigits();}
 
     AliDigitizer* CreateDigitizer(AliRunDigitizer* manager) const;
     virtual void UpdateInternalGeometry();
@@ -128,10 +125,10 @@ class AliITS : public AliDetector {
     virtual void ResetDigits();
     virtual void ResetDigits(Int_t branch);
     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);
+                    Int_t* tracks,Int_t *hits,Float_t* trkcharges,
+                    Int_t sigexpanded=-1000);
     TObjArray* GetDigits()  const {return fDetTypeSim->GetDigits();}
     Int_t* GetNDigitArray() const {return fDetTypeSim->GetNDigitArray();}
     TClonesArray *DigitsAddress(Int_t id) {
@@ -144,7 +141,9 @@ class AliITS : public AliDetector {
 
     //===================== Raw Data IO ================================
     // Write digits into raw data format
-    virtual void Digits2Raw();
+    virtual void   Digits2Raw();
+    virtual Bool_t Raw2SDigits(AliRawReader*);
+    
 
  protected:
     static const Int_t fgkNTYPES=3; //number of detector types
@@ -156,7 +155,12 @@ class AliITS : public AliDetector {
     Int_t        *fIdSens;     //[fIdN] layer identifier
     TString      *fIdName;     //[fIdN] layer identifier
     TObjArray    *fITSmodules; //! Pointer to ITS modules
-    ClassDef(AliITS,6) // Base class for ITS
+    Bool_t        fTiming;     // flag to turn on/off timers.
+
+ private:
+    AliITS(const AliITS &source); // copy constructor. Not to be used!
+    AliITS& operator=(const AliITS &source); // = operator. Not to be used!
+    ClassDef(AliITS,7) // Base class for ITS
 
 };