Include a reset of the digits arrays in order to process several events

diff --git a/TRD/AliTRDdigitizer.cxx b/TRD/AliTRDdigitizer.cxx
index 24490c6cd59badf89dadc9ec01f70f344168e70a..efff3f3f3fb075c71a774648fbd73b5930a83e6b 100644 (file)
--- a/TRD/AliTRDdigitizer.cxx
+++ b/TRD/AliTRDdigitizer.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.42  2002/12/13 13:31:44  cblume
+Add ADC offset and change default digitazation parameters
+
 Revision 1.41  2002/10/21 09:10:32  cblume
 Fix type conversion warnings
 
@@ -661,6 +664,9 @@ Bool_t AliTRDdigitizer::MakeDigits()
   AliTRDdataArrayI *digits  = 0;
   AliTRDdataArrayI *dictionary[kNDict];
 
+  // Reset the digits arrays
+  fDigitsManager->ResetArrays();
+
   // Create a default parameter class if none is defined
   if (!fPar) {
     fPar = new AliTRDparameter("TRDparameter","Standard TRD parameter");
@@ -1158,6 +1164,7 @@ Bool_t AliTRDdigitizer::MakeDigits()
 
     // Compress the arrays
     if (!fSimpleSim) {  
+
       digits->Compress(1,0);
       for (iDict = 0; iDict < kNDict; iDict++) {
         dictionary[iDict]->Compress(1,0);

diff --git a/TRD/AliTRDdigitsManager.cxx b/TRD/AliTRDdigitsManager.cxx
index 5aedb358336812eb1b11e5af7820ceb44885b3dc..0454a6d5bddd395f51ea28c9a7a0342a63446717 100644 (file)
--- a/TRD/AliTRDdigitsManager.cxx
+++ b/TRD/AliTRDdigitsManager.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.20  2002/10/22 15:53:08  alibrary
+Introducing Riostream.h
+
 Revision 1.19  2002/10/14 14:57:43  hristov
 Merging the VirtualMC branch to the main development branch (HEAD)
 
@@ -213,6 +216,27 @@ void AliTRDdigitsManager::CreateArrays()
                                                ,AliTRDgeometry::Ndet());
   }
 
+}
+//_____________________________________________________________________________
+void AliTRDdigitsManager::ResetArrays()
+{
+  //
+  // Reset the data arrays
+  //
+
+  if (fDigits) {
+    delete fDigits;
+  }
+  fDigits = new AliTRDsegmentArray("AliTRDdataArrayI",AliTRDgeometry::Ndet());
+
+  for (Int_t iDict = 0; iDict < kNDict; iDict++) {
+    if (fDictionary[iDict]) {  
+      delete fDictionary[iDict];
+    }
+    fDictionary[iDict] = new AliTRDsegmentArray("AliTRDdataArrayI"
+                                               ,AliTRDgeometry::Ndet());
+  }
+
 }
 
 //_____________________________________________________________________________

diff --git a/TRD/AliTRDdigitsManager.h b/TRD/AliTRDdigitsManager.h
index dbe6c94844f58be42f8811bc15fe49b3a672dc8c..5ecff21381f0aa0f67a0ff44ece5006fedd7a16b 100644 (file)
--- a/TRD/AliTRDdigitsManager.h
+++ b/TRD/AliTRDdigitsManager.h
@@ -31,6 +31,7 @@ class AliTRDdigitsManager : public TObject {
   AliTRDdigitsManager &operator=(const AliTRDdigitsManager &m);
 
   virtual void                CreateArrays();
+  virtual void                ResetArrays();
   virtual void                Copy(TObject &m);
   virtual Bool_t              Open(const Char_t *file);
   virtual Bool_t              MakeBranch(const Char_t *file = 0);

diff --git a/TRD/AliTRDsegmentArray.cxx b/TRD/AliTRDsegmentArray.cxx
index 81b3725e5ae8776e9697cf777802bfb385f15c91..5be1a3acfa7a7e2e0054bd2dc77acbbebfb0325e 100644 (file)
--- a/TRD/AliTRDsegmentArray.cxx
+++ b/TRD/AliTRDsegmentArray.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.8  2001/11/14 10:50:46  cblume
+Changes in digits IO. Add merging of summable digits
+
 Revision 1.7  2001/03/13 09:30:35  cblume
 Update of digitization. Moved digit branch definition to AliTRD
 
@@ -106,6 +109,9 @@ AliTRDsegmentArray::~AliTRDsegmentArray()
   //
   // AliTRDsegmentArray destructor
   //
+
+  Delete();
+
 }
 
 //_____________________________________________________________________________