Major upgrades to the strip structure

[u/mrichter/AliRoot.git] / TRD / AliTRDdigitsManager.cxx

diff --git a/TRD/AliTRDdigitsManager.cxx b/TRD/AliTRDdigitsManager.cxx
index 606d2a9ed6a578c76a5cfef1ec84b82d8faef97e..6080f5f48c5037b98884b64d7e359b48c43d1445 100644 (file)
--- a/TRD/AliTRDdigitsManager.cxx
+++ b/TRD/AliTRDdigitsManager.cxx
@@ -15,6 +15,30 @@
 
 /*
 $Log$
+Revision 1.10  2001/01/26 19:56:57  hristov
+Major upgrade of AliRoot code
+
+Revision 1.9  2000/11/02 09:25:53  cblume
+Change also the dictionary to AliTRDdataArray
+
+Revision 1.8  2000/11/01 15:20:13  cblume
+Change AliTRDdataArrayI to AliTRDdataArray in MakeBranch()
+
+Revision 1.7  2000/11/01 14:53:20  cblume
+Merge with TRD-develop
+
+Revision 1.1.2.5  2000/10/17 02:27:34  cblume
+Get rid of global constants
+
+Revision 1.1.2.4  2000/10/15 23:40:01  cblume
+Remove AliTRDconst
+
+Revision 1.1.2.3  2000/10/06 16:49:46  cblume
+Made Getters const
+
+Revision 1.1.2.2  2000/10/04 16:34:58  cblume
+Replace include files by forward declarations
+
 Revision 1.5  2000/06/09 11:10:07  cblume
 Compiler warnings and coding conventions, next round
 
@@ -39,15 +63,27 @@ Add new class AliTRDdigitsManager
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
-#include <TTree.h>
+#include <iostream.h>
+ 
+#include <TROOT.h>
+#include <TTree.h>                                                              
+#include <TFile.h>
 
 #include "AliRun.h"
 
 #include "AliTRDdigitsManager.h"
-#include "AliTRDconst.h"
+#include "AliTRDsegmentArray.h"
+#include "AliTRDdataArrayI.h"
+#include "AliTRDdigit.h"
+#include "AliTRDgeometry.h"
 
 ClassImp(AliTRDdigitsManager)
 
+//_____________________________________________________________________________
+
+  // Number of track dictionary arrays
+  const Int_t AliTRDdigitsManager::fgkNDict = kNDict;
+
 //_____________________________________________________________________________
 AliTRDdigitsManager::AliTRDdigitsManager():TObject()
 {
@@ -57,10 +93,11 @@ AliTRDdigitsManager::AliTRDdigitsManager():TObject()
 
   fIsRaw = kFALSE;
 
-  fDigits = new AliTRDsegmentArray("AliTRDdataArrayI",kNdet);
+  fDigits = new AliTRDsegmentArray("AliTRDdataArrayI",AliTRDgeometry::Ndet());
 
   for (Int_t iDict = 0; iDict < kNDict; iDict++) {
-    fDictionary[iDict] = new AliTRDsegmentArray("AliTRDdataArrayI",kNdet);
+    fDictionary[iDict] = new AliTRDsegmentArray("AliTRDdataArrayI"
+                                               ,AliTRDgeometry::Ndet());
   }
 
 }
@@ -114,12 +151,12 @@ void AliTRDdigitsManager::SetRaw()
 
   fIsRaw = kTRUE;
 
-  fDigits->SetBit(kRawDigit);
+  fDigits->SetBit(AliTRDdigit::RawDigit());
   
 }
 
 //_____________________________________________________________________________
-Bool_t AliTRDdigitsManager::MakeBranch()
+Bool_t AliTRDdigitsManager::MakeBranch(char *file)
 {
   //
   // Creates the branches for the digits and the dictionary in the digits tree
@@ -129,15 +166,18 @@ Bool_t AliTRDdigitsManager::MakeBranch()
 
   Bool_t status = kTRUE;
 
+  //TFile *file = (TFile*)gROOT->GetListOfFiles()->FindObject("TRD.Digits.root");
+
   if (gAlice->TreeD()) {
 
     // Make the branch for the digits
     if (fDigits) {
-      const AliTRDdataArrayI *kDigits = 
-           (AliTRDdataArrayI *) fDigits->At(0);
+      const AliTRDdataArray *kDigits = 
+           (AliTRDdataArray *) fDigits->At(0);
       if (kDigits) {
-        gAlice->TreeD()->Branch("TRDdigits",kDigits->IsA()->GetName()
-                                           ,&kDigits,buffersize,1);
+          gAlice->MakeBranchInTree(gAlice->TreeD(), 
+                                   "TRDdigits", kDigits->IsA()->GetName(),
+                                   &kDigits,buffersize, 1,file) ;
         printf("AliTRDdigitsManager::MakeBranch -- ");
         printf("Making branch TRDdigits\n");
       }
@@ -151,15 +191,15 @@ Bool_t AliTRDdigitsManager::MakeBranch()
 
     // Make the branches for the dictionaries
     for (Int_t iDict = 0; iDict < kNDict; iDict++) {
-
       Char_t branchname[15];
       sprintf(branchname,"TRDdictionary%d",iDict);
       if (fDictionary[iDict]) {
-        const AliTRDdataArrayI *kDictionary = 
-             (AliTRDdataArrayI *) fDictionary[iDict]->At(0);
+        const AliTRDdataArray *kDictionary = 
+             (AliTRDdataArray *) fDictionary[iDict]->At(0);
         if (kDictionary) {
-          gAlice->TreeD()->Branch(branchname,kDictionary->IsA()->GetName()
-                                            ,&kDictionary,buffersize,1);
+            gAlice->MakeBranchInTree(gAlice->TreeD(), 
+                                     branchname,kDictionary->IsA()->GetName(),
+                                     &kDictionary,buffersize, 1,file) ;
           printf("AliTRDdigitsManager::MakeBranch -- ");
           printf("Making branch %s\n",branchname);
        }
@@ -198,7 +238,7 @@ Bool_t AliTRDdigitsManager::ReadDigits()
     status = fDictionary[iDict]->LoadArray(branchname);
   }  
 
-  if (fDigits->TestBit(kRawDigit)) {
+  if (fDigits->TestBit(AliTRDdigit::RawDigit())) {
     fIsRaw = kTRUE;
   }
   else {
@@ -218,6 +258,8 @@ Bool_t AliTRDdigitsManager::WriteDigits()
 
   // Create the branches
   if (!(gAlice->TreeD()->GetBranch("TRDdigits"))) { 
+    printf("AliTRDdigitsManager::WriteDigits -- ");
+    printf("Call MakeBranch\n");
     if (!MakeBranch()) return kFALSE;
   }
 
@@ -243,7 +285,7 @@ Bool_t AliTRDdigitsManager::WriteDigits()
 
 //_____________________________________________________________________________
 AliTRDdigit *AliTRDdigitsManager::GetDigit(Int_t row, Int_t col
-                                         , Int_t time, Int_t det)
+                                         , Int_t time, Int_t det) const
 {
   // 
   // Creates a single digit object 
@@ -266,7 +308,7 @@ AliTRDdigit *AliTRDdigitsManager::GetDigit(Int_t row, Int_t col
 //_____________________________________________________________________________
 Int_t AliTRDdigitsManager::GetTrack(Int_t track
                                   , Int_t row, Int_t col, Int_t time
-                                  , Int_t det)
+                                  , Int_t det) const
 {
   // 
   // Returns the MC-track numbers from the dictionary.
@@ -285,7 +327,7 @@ Int_t AliTRDdigitsManager::GetTrack(Int_t track
 }
 
 //_____________________________________________________________________________
-AliTRDdataArrayI *AliTRDdigitsManager::GetDigits(Int_t det) 
+AliTRDdataArrayI *AliTRDdigitsManager::GetDigits(Int_t det) const
 {
   //
   // Returns the digits array for one detector
@@ -296,7 +338,7 @@ AliTRDdataArrayI *AliTRDdigitsManager::GetDigits(Int_t det)
 }
 
 //_____________________________________________________________________________
-AliTRDdataArrayI *AliTRDdigitsManager::GetDictionary(Int_t det, Int_t i) 
+AliTRDdataArrayI *AliTRDdigitsManager::GetDictionary(Int_t det, Int_t i) const
 {
   //
   // Returns the dictionary for one detector
@@ -307,7 +349,7 @@ AliTRDdataArrayI *AliTRDdigitsManager::GetDictionary(Int_t det, Int_t i)
 }
 
 //_____________________________________________________________________________
-Int_t AliTRDdigitsManager::GetTrack(Int_t track, AliTRDdigit *Digit)
+Int_t AliTRDdigitsManager::GetTrack(Int_t track, AliTRDdigit *Digit) const
 {
   // 
   // Returns the MC-track numbers from the dictionary for a given digit