Re-structured digitizer

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

diff --git a/TRD/AliTRDtrigger.cxx b/TRD/AliTRDtrigger.cxx
index 06a4a17cc744f9df611740e9efd5367cf6845e29..730b6ace94738bf4571f129f6e93768de70165cd 100644 (file)
--- a/TRD/AliTRDtrigger.cxx
+++ b/TRD/AliTRDtrigger.cxx
@@ -33,8 +33,9 @@
 #include "AliLoader.h"
 
 #include "AliTRDdigitsManager.h"
-#include "AliTRDgeometry.h"
 #include "AliTRDdataArrayI.h"
+#include "AliTRDdataArrayS.h"
+#include "AliTRDgeometry.h"
 #include "AliTRDcalibDB.h"
 #include "AliTRDrawData.h"
 #include "AliTRDtrigger.h"
@@ -166,7 +167,7 @@ AliTRDtrigger::~AliTRDtrigger()
   delete fModule;
   delete fTrkTest;
   delete fMCM;
-  delete fTrk;
+  //  delete fTrk;
 
 }
 
@@ -196,6 +197,9 @@ void AliTRDtrigger::Copy(TObject &) const
 //_____________________________________________________________________________
 void AliTRDtrigger::Init()
 {
+  //
+  // Initialization
+  //
 
   fModule = new AliTRDmodule(); 
   fTracks->Clear();
@@ -427,20 +431,20 @@ Bool_t AliTRDtrigger::MakeTracklets(Bool_t makeTracks)
         Int_t nTimeTotal = AliTRDcalibDB::Instance()->GetNumberOfTimeBins();
 
         // Get the digits
-        fDigits = fDigitsManager->GetDigits(idet);
+        fDigits = (AliTRDdataArrayS *) fDigitsManager->GetDigits(idet);
        if (!fDigits) return kFALSE;
        // This is to take care of switched off super modules
         if (fDigits->GetNtime() == 0) {
           continue;
        }
         fDigits->Expand();
-        fTrack0 = fDigitsManager->GetDictionary(idet,0);
+        fTrack0 = (AliTRDdataArrayI *) fDigitsManager->GetDictionary(idet,0);
        if (!fTrack0) return kFALSE;
         fTrack0->Expand();
-        fTrack1 = fDigitsManager->GetDictionary(idet,1);
+        fTrack1 = (AliTRDdataArrayI *) fDigitsManager->GetDictionary(idet,1);
        if (!fTrack1) return kFALSE;
         fTrack1->Expand();
-        fTrack2 = fDigitsManager->GetDictionary(idet,2); 
+        fTrack2 = (AliTRDdataArrayI *) fDigitsManager->GetDictionary(idet,2); 
        if (!fTrack2) return kFALSE;
         fTrack2->Expand();