X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;ds=sidebyside;f=ITS%2FAliITSBeamTestDigitizer.h;h=e235a0a00f916bc6809e20fb280e46f3e4ee778a;hb=c3cd353ebe035f4cd58a4114af526befe5a8fa1d;hp=a8b269a360c79244925d7521470e3c67662b700a;hpb=5ba31760b3df11b728d346dd1e088dde8c649536;p=u%2Fmrichter%2FAliRoot.git

diff --git a/ITS/AliITSBeamTestDigitizer.h b/ITS/AliITSBeamTestDigitizer.h
index a8b269a360c..e235a0a00f9 100644
--- a/ITS/AliITSBeamTestDigitizer.h
+++ b/ITS/AliITSBeamTestDigitizer.h
@@ -23,7 +23,6 @@ class AliITSBeamTestDigSDD;
 class AliRawReaderDate;
 class AliRunLoader;
 class AliITSLoader;
-class AliITS;
 class AliITSEventHeader;
 class AliRawDataHeader;
 
@@ -34,10 +33,9 @@ class AliITSBeamTestDigitizer : public TTask {
  
   AliITSBeamTestDigitizer(); 
   AliITSBeamTestDigitizer(const Text_t* name,const Text_t* title, 
-			  Char_t* opt="Nov04");
+			  Char_t* opt="Nov04",const char* filename="galice.root");
   AliITSBeamTestDigitizer(const Text_t* name,const Text_t* title, 
-			  Int_t run,Char_t* opt="Nov04");
-  AliITSBeamTestDigitizer(const char* filename);
+			  Int_t run,Char_t* opt="Nov04",const char* filename="galice.root");
   AliITSBeamTestDigitizer(const AliITSBeamTestDigitizer& bt);
   AliITSBeamTestDigitizer& operator=(const AliITSBeamTestDigitizer &source);
 
@@ -54,18 +52,18 @@ class AliITSBeamTestDigitizer : public TTask {
   void SelectEvents(Int_t eventtype) {fDATEEvType=eventtype;}
   void SetBeamTestPeriod(BeamtestPeriod_t per=kNov04) {fPeriod=per;}
   void SetRunNumber(Int_t run) {fRunNumber=run;}
-
-  void SetBeamTestGeometry(AliITS* bt){fBt=bt;}
+  void SetOptDate(Bool_t opt=kFALSE) {fOptDate=opt;}
 
   void SetActive(const TString& subdet,Bool_t value);
 
   void ExecDigitization();
-  void Init();
+  void Init(const char* filename);
  
   Int_t GetRunNumber()  const {return fRunNumber;}
   Bool_t GetFlagInit()  const {return fFlagInit;}
+  Bool_t GetOptDate() const {return fOptDate;}
   BeamtestPeriod_t GetBeamTestPeriod() const {return fPeriod;}
-  AliITS* GetBeamTestGeometry() const {return fBt;}
+
 
  protected:
 
@@ -77,13 +75,13 @@ class AliITSBeamTestDigitizer : public TTask {
 
   Bool_t   fFlagHeader;             //flag for the hader 
   Bool_t   fFlagInit;               //flag for initialization
+  Bool_t   fOptDate;                //option for reading date format files
+                                    //(default: reads root files)                                    
 
   TString  fDigitsFileName;         //Digits file name
   TString  fRawdataFileName;        //Raw data file name
   BeamtestPeriod_t  fPeriod;                 //Beam test period
 
-  AliITS*     fBt;                  //! Local pointer to ITS geometry.
-  
   AliRunLoader* fRunLoader;         // Local pointer to run loader
   AliITSLoader* fLoader;            // Pointer to ITS loader
 
@@ -91,7 +89,7 @@ class AliITSBeamTestDigitizer : public TTask {
 
   static const TString fgkDefaultDigitsFileName; // default name for dig. file  
 
-  ClassDef(AliITSBeamTestDigitizer,1)  // An Alice SDD beam test digitization class 
+  ClassDef(AliITSBeamTestDigitizer,3)  // An Alice SDD beam test digitization class 
 
   };