Adding the track fit residuals as a consequence of the ExB distortions (Marian)

[u/mrichter/AliRoot.git] / TOF / AliTOFRawStream.cxx

diff --git a/TOF/AliTOFRawStream.cxx b/TOF/AliTOFRawStream.cxx
index bd45a08ac372bc97739974420f7582da2fca0c97..7648a59b017b9467894986570efbcd24d98dbcdd 100644 (file)
--- a/TOF/AliTOFRawStream.cxx
+++ b/TOF/AliTOFRawStream.cxx
@@ -100,6 +100,7 @@ Revision 0.01  2005/07/22 A. De Caro
 #include "AliTOFRawMap.h"
 #include "AliTOFRawStream.h"
 
+#include "AliTOFHitData.h"
 
 ClassImp(AliTOFRawStream)
 
@@ -107,7 +108,6 @@ ClassImp(AliTOFRawStream)
 //_____________________________________________________________________________
 AliTOFRawStream::AliTOFRawStream(AliRawReader* rawReader):
   fRawReader(rawReader),
-  //  fTOFrawData(new TClonesArray("AliTOFrawData",1000)),
   fTOFrawData(0x0),
   fDecoder(new AliTOFDecoder()),
   fDDL(-1),
@@ -156,7 +156,6 @@ AliTOFRawStream::AliTOFRawStream(AliRawReader* rawReader):
 //_____________________________________________________________________________
 AliTOFRawStream::AliTOFRawStream():
   fRawReader(0x0), 
-  //  fTOFrawData(new TClonesArray("AliTOFrawData",1000)),
   fTOFrawData(0x0),
   fDecoder(new AliTOFDecoder()),
   fDDL(-1),
@@ -202,7 +201,6 @@ AliTOFRawStream::AliTOFRawStream():
 AliTOFRawStream::AliTOFRawStream(const AliTOFRawStream& stream) :
   TObject(stream),
   fRawReader(0x0),
-  //  fTOFrawData(new TClonesArray("AliTOFrawData",1000)),
   fTOFrawData(0x0),
   fDecoder(new AliTOFDecoder()),
   fDDL(-1),
@@ -355,15 +353,14 @@ AliTOFRawStream::~AliTOFRawStream()
 
 void AliTOFRawStream::LoadRawData(Int_t indexDDL)
 {
+  //
+  // To load raw data
+  //
+
+  fTOFrawData->Clear();
 
-  /*
-    for (Int_t indexDDL = 0;
-    indexDDL < AliDAQ::NumberOfDdls("TOF");
-    indexDDL++) {
-  */
+  TClonesArray &arrayTofRawData =  *fTOFrawData;
 
-  fTOFrawData = new TClonesArray("AliTOFrawData",1000); //potential memory leak
-    //fTOFrawData->Clear();
   fPackedDigits = 0;
 
   // create raw data map
@@ -377,13 +374,13 @@ void AliTOFRawStream::LoadRawData(Int_t indexDDL)
     
   Bool_t signal = kFALSE;
 
-  
+  AliTOFrawData *rawDigit = NULL;
 
   while(Next()) {
 
     signal = (fSector!=-1 && fPlate!=-1 && fStrip!=-1 && fPadZ!=-1 && fPadX!=-1);
     if (signal) {
-      //printf("  %2i  %1i  %2i  %1i  %2i  \n", fSector, fPlate, fStrip, fPadZ, fPadX);
+      AliDebug(2,Form("  %2i  %1i  %2i  %1i  %2i  \n", fSector, fPlate, fStrip, fPadZ, fPadX));
 
       slot[0] = fTRM;
       slot[1] = fTRMchain;
@@ -392,7 +389,7 @@ void AliTOFRawStream::LoadRawData(Int_t indexDDL)
 
       if (rawMap->TestHit(slot) != kEmpty) {
 
-       AliTOFrawData *rawDigit = static_cast<AliTOFrawData*>(rawMap->GetHit(slot));
+       rawDigit = static_cast<AliTOFrawData*>(rawMap->GetHit(slot));
 
        if (rawDigit->GetLeading()!=-1 && rawDigit->GetTrailing()==-1 &&
            fLeadingEdge==-1 && fTrailingEdge!=-1) {
@@ -402,24 +399,19 @@ void AliTOFRawStream::LoadRawData(Int_t indexDDL)
        else if ( ((rawDigit->GetTOF()!=-1 || rawDigit->GetLeading()!=-1 || rawDigit->GetTrailing()!=-1) &&
                   (fLeadingEdge!=-1 || fTrailingEdge!=-1 || fTime!=-1) )
 
-/*     else if ( ((rawDigit->GetTOF()!=-1 || rawDigit->GetLeading()!=-1 || rawDigit->GetTrailing()!=-1) &&
-                  (fTime!=-1 || fLeadingEdge!=-1 || fTrailingEdge!=-1))*/  /*||
-                 (rawDigit->GetLeading()==-1 && rawDigit->GetTrailing()!=-1 &&
-                 fLeadingEdge!=-1 && fTrailingEdge==-1) */)
+                 )
          {
 
-         TClonesArray &arrayTofRawData =  *fTOFrawData;
-         new (arrayTofRawData[fPackedDigits++]) AliTOFrawData(fTRM, fTRMchain, fTDC, fTDCchannel, fTime, fToT, fLeadingEdge, fTrailingEdge, fPSbit, fACQ, fErrorFlag);
+           new (arrayTofRawData[fPackedDigits++]) AliTOFrawData(fTRM, fTRMchain, fTDC, fTDCchannel, fTime, fToT, fLeadingEdge, fTrailingEdge, fPSbit, fACQ, fErrorFlag);
 
-       rawMap->SetHit(slot);
+           rawMap->SetHit(slot);
 
-       }
+         }
 
 
       }
       else {
 
-       TClonesArray &arrayTofRawData =  *fTOFrawData;
        new (arrayTofRawData[fPackedDigits++]) AliTOFrawData(fTRM, fTRMchain, fTDC, fTDCchannel, fTime, fToT, fLeadingEdge, fTrailingEdge, fPSbit, fACQ, fErrorFlag);
 
        rawMap->SetHit(slot);
@@ -430,34 +422,7 @@ void AliTOFRawStream::LoadRawData(Int_t indexDDL)
 
   } // closed -> while (Next())
 
-    /*
-      fDDL  = fRawReader->GetDDLID();
-
-      for (Int_t ii=0; ii<fTOFrawData->GetEntriesFast(); ii++) {
-
-      AliTOFrawData *dummy = (AliTOFrawData*)fTOFrawData->UncheckedAt(ii);
-
-      fTRM = dummy->GetTRM();
-      fTRMchain = dummy->GetTRMchain();
-      fTDC = dummy->GetTDC();
-      fTDCchannel = dummy->GetTDCchannel();
-
-      SetSector();
-      SetPlate();
-      SetStrip();
-      SetPadZ();
-      SetPadX();
-
-      printf("  %2i, %2i %1i, %2i, %1i  -->  %2i, %1i, %2i, %1i, %2i  \n",
-            fDDL, fTRM, fTRMchain, fTDC, fTDCchannel,
-            fSector, fPlate, fStrip, fPadZ, fPadX);
-
-            } // closed loop on TOF raw data TClonesArray
-    */
-
-    //} // closed loop on indexDDL
-
-
+  rawMap->Delete();
 
 }
 
@@ -1274,7 +1239,7 @@ AliTOFRawStream::LoadRawDataBuffers(Int_t indexDDL, Int_t verbose)
     Int_t   hitTimeBin = hitData->GetTimeBin();
     Int_t   hitTOTBin = hitData->GetTOTBin();
     
-    Int_t hitLeading = -1;
+    Int_t hitLeading = hitData->GetTimeBin();//-1; // adc
     Int_t hitTrailing = -1;
     Int_t hitError = -1;