X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=TRD%2FAliTRDdigitizer.h;h=8d5674d91c9af25af0974210927e858d0e30f2b2;hb=69e9c722736ebce215af5d46a2e094a4808cffa8;hp=3433e90f1be9c2dfe7df95741f6542667e6f6f83;hpb=8e64dd775e73995f7c08ad42dcb2bef21b4adc45;p=u%2Fmrichter%2FAliRoot.git

diff --git a/TRD/AliTRDdigitizer.h b/TRD/AliTRDdigitizer.h
index 3433e90f1be..8d5674d91c9 100644
--- a/TRD/AliTRDdigitizer.h
+++ b/TRD/AliTRDdigitizer.h
@@ -11,6 +11,7 @@ class TFile;
 class TF1;
 
 class AliRunDigitizer;
+class AliRunLoader;
 
 class AliTRD;
 class AliTRDdigitsManager;
@@ -37,7 +38,7 @@ class AliTRDdigitizer : public AliDigitizer {
   virtual Bool_t       InitDetector();
   virtual void         Exec(Option_t* option = 0);  
   virtual Bool_t       Open(const Char_t *file, Int_t nEvent = 0);
-  virtual Bool_t       MakeBranch(const Char_t *file = 0) const;
+  virtual Bool_t       MakeBranch(TTree* tree) const;
   virtual Bool_t       MakeDigits();
   virtual void         AddSDigitsManager(AliTRDdigitsManager *manager);
   virtual void         DeleteSDigitsManager();
@@ -46,7 +47,7 @@ class AliTRDdigitizer : public AliDigitizer {
   virtual Bool_t       SDigits2Digits();
   virtual Bool_t       WriteDigits() const;
 
-          void         InitOutput(TFile *file, Int_t iEvent);
+  void         InitOutput(Int_t iEvent);
  
   virtual void         SetCompress(Int_t c = 1)             { fCompress        = c;   };
   virtual void         SetDebug(Int_t v = 1)                { fDebug           = v;   };
@@ -57,6 +58,9 @@ class AliTRDdigitizer : public AliDigitizer {
   virtual void         SetGeometry(AliTRDgeometry *geo)     { fGeo             = geo; };
   virtual void         SetParameter(AliTRDparameter *par)   { fPar             = par; };
   virtual void         SetMergeSignalOnly(Bool_t m = kTRUE) { fMergeSignalOnly = m;   };
+  virtual void         SetSimple(Int_t v = 1)               { fSimpleSim       = v;
+                                                              fSimpleDet       = 12;
+                                                              fCompress        = kFALSE; };
 
   AliTRDdigitsManager *Digits()                       const { return fDigitsManager; };
 
@@ -64,10 +68,12 @@ class AliTRDdigitizer : public AliDigitizer {
           Bool_t       GetSDigits()                   const { return fSDigits;       };
           Float_t      GetSDigitsScale()              const { return fSDigitsScale;  };
   AliTRDparameter     *GetParameter()                 const { return fPar;           };
+          Bool_t       GetSimple()                    const { return fSimpleSim;     };
 
  protected:
 
-  TFile               *fInputFile;          //! ALIROOT-file
+  //TFile               *fInputFile;          //! ALIROOT-file
+  AliRunLoader        *fRunLoader;
   AliTRDdigitsManager *fDigitsManager;      //! Manager for the output digits
   AliTRDdigitsManager *fSDigitsManager;     //! Manager for the summed input s-digits
   TList               *fSDigitsManagerList; //! List of managers of input s-digits
@@ -81,7 +87,9 @@ class AliTRDdigitizer : public AliDigitizer {
   Bool_t               fSDigits;            //  Switch for the summable digits
   Float_t              fSDigitsScale;       //  Scale factor for the summable digits 
   Bool_t               fMergeSignalOnly;    //  Merge only detectors that contain a signal
-
+  Bool_t               fSimpleSim;          //  Switch for the simplified simulation
+  Int_t                fSimpleDet;          //  Detecttor number used in the simplified simulation
+ 
  private:
 
   virtual void         DeConvExp(Double_t *source, Double_t *target, Int_t n, Int_t nexp);