Inherits now from AliDetector

diff --git a/TRD/AliTRDdigitizer.cxx b/TRD/AliTRDdigitizer.cxx
index db649083ed5f534ed29e5d5970a392e0f3292067..3f7966b56348e941cd2e7c9c62be1a490fc2ed81 100644 (file)
--- a/TRD/AliTRDdigitizer.cxx
+++ b/TRD/AliTRDdigitizer.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
 
 /*
 $Log$

+Revision 1.27  2001/11/14 10:50:45  cblume
+Changes in digits IO. Add merging of summable digits
+

 Revision 1.26  2001/11/06 17:19:41  cblume
 Add detailed geometry and simple simulator
 
 Revision 1.26  2001/11/06 17:19:41  cblume
 Add detailed geometry and simple simulator
 


@@ -152,9 +155,11 @@ Add new TRD classes
 #include <TFile.h>
 #include <TF1.h>
 #include <TList.h>
 #include <TFile.h>
 #include <TF1.h>
 #include <TList.h>

+#include <TTask.h>

 
 #include "AliRun.h"
 #include "AliMagF.h"
 
 #include "AliRun.h"
 #include "AliMagF.h"

+#include "AliRunDigitizer.h"

 
 #include "AliTRD.h"
 #include "AliTRDhit.h"
 
 #include "AliTRD.h"
 #include "AliTRDhit.h"


@@ -168,7 +173,7 @@ Add new TRD classes
 ClassImp(AliTRDdigitizer)
 
 //_____________________________________________________________________________
 ClassImp(AliTRDdigitizer)
 
 //_____________________________________________________________________________

-AliTRDdigitizer::AliTRDdigitizer():TNamed()
+AliTRDdigitizer::AliTRDdigitizer()

 {
   //
   // AliTRDdigitizer default constructor
 {
   //
   // AliTRDdigitizer default constructor


@@ -224,10 +229,40 @@ AliTRDdigitizer::AliTRDdigitizer():TNamed()
 
 //_____________________________________________________________________________
 AliTRDdigitizer::AliTRDdigitizer(const Text_t *name, const Text_t *title)
 
 //_____________________________________________________________________________
 AliTRDdigitizer::AliTRDdigitizer(const Text_t *name, const Text_t *title)

-                :TNamed(name,title)
+                :AliDigitizer(name,title)

 {
   //
 {
   //

-  // AliTRDdigitizer default constructor
+  // AliTRDdigitizer constructor
+  //
+
+  fInputFile          = NULL;
+
+  fDigitsManager      = NULL;
+  fSDigitsManager     = NULL;
+  fSDigitsManagerList = NULL;
+
+  fTRD                = NULL;
+  fGeo                = NULL;
+  fPRFsmp             = NULL;
+  fTRFsmp             = NULL;
+
+  fEvent              = 0;
+
+  fCompress           = kTRUE;
+  fVerbose            = 0;
+  fSDigits            = kFALSE;
+
+  Init();
+
+}
+
+//_____________________________________________________________________________
+AliTRDdigitizer::AliTRDdigitizer(AliRunDigitizer *manager
+                                , const Text_t *name, const Text_t *title)
+                :AliDigitizer(manager,name,title)
+{
+  //
+  // AliTRDdigitizer constructor

   //
 
   fInputFile          = NULL;
   //
 
   fInputFile          = NULL;


@@ -452,7 +487,7 @@ Float_t AliTRDdigitizer::TimeResponse(Float_t time)
 }
 
 //_____________________________________________________________________________
 }
 
 //_____________________________________________________________________________

-void AliTRDdigitizer::Init()
+Bool_t AliTRDdigitizer::Init()

 {
   //
   // Initializes the digitization procedure with standard values
 {
   //
   // Initializes the digitization procedure with standard values


@@ -494,10 +529,12 @@ void AliTRDdigitizer::Init()
   // The time coupling factor (same number as for the TPC)
   fTimeCoupling   = 0.4;
 
   // The time coupling factor (same number as for the TPC)
   fTimeCoupling   = 0.4;
 

+  return kTRUE;
+

 }
 
 //_____________________________________________________________________________
 }
 
 //_____________________________________________________________________________

-void AliTRDdigitizer::ReInit()
+Bool_t AliTRDdigitizer::ReInit()

 {
   //
   // Reinitializes the digitization procedure after a change in the parameter
 {
   //
   // Reinitializes the digitization procedure after a change in the parameter


@@ -506,7 +543,7 @@ void AliTRDdigitizer::ReInit()
   if (!fGeo) {
     printf("AliTRDdigitizer::ReInit -- ");
     printf("No geometry defined. Run InitDetector() first\n");
   if (!fGeo) {
     printf("AliTRDdigitizer::ReInit -- ");
     printf("No geometry defined. Run InitDetector() first\n");

-    exit(1);
+    return kFALSE;

   }
 
   // Calculate the time bin width in ns
   }
 
   // Calculate the time bin width in ns


@@ -536,6 +573,8 @@ void AliTRDdigitizer::ReInit()
     fLorentzFactor = 1.0;
   }
 
     fLorentzFactor = 1.0;
   }
 

+  return kTRUE;
+

 }
 
 //_____________________________________________________________________________
 }
 
 //_____________________________________________________________________________


@@ -809,9 +848,7 @@ Bool_t AliTRDdigitizer::InitDetector()
   // The list for the input s-digits manager to be merged
   fSDigitsManagerList = new TList();
 
   // The list for the input s-digits manager to be merged
   fSDigitsManagerList = new TList();
 

-  ReInit();
-
-  return kTRUE;
+  return ReInit();

 
 }
 
 
 }
 

diff --git a/TRD/AliTRDdigitizer.h b/TRD/AliTRDdigitizer.h
index 6889a629681e6313a2cfd3331e6165d591bbe4d6..746e84fdcaff2dbb3eb93d92cd37b2147d090a64 100644 (file)
--- a/TRD/AliTRDdigitizer.h
+++ b/TRD/AliTRDdigitizer.h
@@ -5,11 +5,13 @@
 
 /* $Id$ */
 
 
 /* $Id$ */
 

-#include <TNamed.h>
+#include "AliDigitizer.h"

 
 class TFile;
 class TF1;
 
 
 class TFile;
 class TF1;
 

+class AliRunDigitizer;
+

 class AliTRD;
 class AliTRDdigitsManager;
 class AliTRDgeometry;
 class AliTRD;
 class AliTRDdigitsManager;
 class AliTRDgeometry;


@@ -18,24 +20,25 @@ class AliTRDgeometry;
 //  Produces digits from the hits information        //
 ///////////////////////////////////////////////////////
 
 //  Produces digits from the hits information        //
 ///////////////////////////////////////////////////////
 

-class AliTRDdigitizer : public TNamed {
+class AliTRDdigitizer : public AliDigitizer {

 
  public:
 
   AliTRDdigitizer();
   AliTRDdigitizer(const Text_t* name, const Text_t* title);
 
  public:
 
   AliTRDdigitizer();
   AliTRDdigitizer(const Text_t* name, const Text_t* title);

+  AliTRDdigitizer(AliRunDigitizer *manager, const Text_t* name, const Text_t* title);

   AliTRDdigitizer(const AliTRDdigitizer &d);
   virtual ~AliTRDdigitizer();
   AliTRDdigitizer &operator=(const AliTRDdigitizer &d);
 
   virtual void         Copy(TObject &d);
   AliTRDdigitizer(const AliTRDdigitizer &d);
   virtual ~AliTRDdigitizer();
   AliTRDdigitizer &operator=(const AliTRDdigitizer &d);
 
   virtual void         Copy(TObject &d);

-  virtual void         Init();
+  virtual Bool_t       Init();

   virtual Bool_t       InitDetector();
   virtual Bool_t       InitDetector();

-  virtual void         ReInit();
+  virtual Bool_t       ReInit();

   virtual Bool_t       Open(const Char_t *name, Int_t nEvent = 0);
   virtual Bool_t       MakeBranch(const Char_t *file = 0);
   virtual Bool_t       MakeDigits();
   virtual Bool_t       Open(const Char_t *name, Int_t nEvent = 0);
   virtual Bool_t       MakeBranch(const Char_t *file = 0);
   virtual Bool_t       MakeDigits();

-  virtual void         AddSDigitsManager(AliTRDdigitsManager *man);
+  virtual void         AddSDigitsManager(AliTRDdigitsManager *manager);

   virtual Bool_t       ConvertSDigits();
   virtual Bool_t       MergeSDigits();
   virtual Bool_t       SDigits2Digits();
   virtual Bool_t       ConvertSDigits();
   virtual Bool_t       MergeSDigits();
   virtual Bool_t       SDigits2Digits();