New histograms in case of multi isolation cut analysis - Catherin

[u/mrichter/AliRoot.git] / ACORDE / AliACORDERawStream.cxx

diff --git a/ACORDE/AliACORDERawStream.cxx b/ACORDE/AliACORDERawStream.cxx
index e6ead1e9947f532fac13628abe1494f052e81978..92ffc36210a6a0ffc3cfb2186da001d2308f20b7 100644 (file)
--- a/ACORDE/AliACORDERawStream.cxx
+++ b/ACORDE/AliACORDERawStream.cxx
@@ -40,6 +40,8 @@ AliACORDERawStream::AliACORDERawStream(AliRawReader* rawReader) :
   // Created:      04 Feb 2008  Mario Sitta\r
   //\r
 \r
+  fWord[0] = fWord[1] = fWord[2] = fWord[3] = 0;\r
+\r
   // Select the raw data corresponding to the ACORDE detector id\r
 //  fRawReader->Reset();\r
   AliDebug(1,Form("Selecting raw data for detector %d",AliDAQ::DetectorID("ACORDE")));\r
@@ -113,8 +115,8 @@ Bool_t AliACORDERawStream::Next()
 \r
   fDataSize = fRawReader->GetDataSize();\r
   if (fDataSize != 16) {\r
-    fRawReader->AddFatalErrorLog(kRawDataSizeErr,Form("size %d != 5488",fDataSize));\r
-    AliWarning(Form("Wrong ACORDE raw data size: %d, expected 5488 bytes!",fDataSize));\r
+    fRawReader->AddFatalErrorLog(kRawDataSizeErr,Form("size %d != 16",fDataSize));\r
+    AliWarning(Form("Wrong ACORDE raw data size: %d, expected 16 bytes!",fDataSize));\r
     return kFALSE;\r
   }\r
 \r
@@ -176,30 +178,6 @@ UInt_t AliACORDERawStream::GetNextWord()
   return word;\r
 }\r
 \r
-//_____________________________________________________________________________\r
-UShort_t AliACORDERawStream::GetNextShort()\r
-{\r
-  //\r
-  // Returns the next 16 bit word inside the raw data payload.\r
-  // The method is supposed to be endian (platform) independent.\r
-  //\r
-  // Input:\r
-  //\r
-  // Output:\r
-  //         word : a 16 bit word containing the data\r
-  //\r
-  // Created:      04 Feb 2008  Mario Sitta\r
-  //\r
-\r
-  if (!fData || fPosition < 0) AliFatal("Raw data payload buffer is not yet initialized !");\r
-\r
-  UShort_t word = 0;\r
-  word |= fData[fPosition++];\r
-  word |= fData[fPosition++] << 8;\r
-\r
-  return word;\r
-}\r
-\r
 //_____________________________________________________________________________\r
 \r
 Int_t AliACORDERawStream::GetNEvents(char* fileName) \r
@@ -219,6 +197,7 @@ Int_t AliACORDERawStream::GetNEvents(char* fileName)
        if (!rCount->NextEvent()) DyM=1;\r
        else fNEvents++;\r
        }\r
+       delete rCount;\r
        return fNEvents;\r
 }\r
 \r