Eff C++ warning removal

[u/mrichter/AliRoot.git] / MUON / MUONRawStreamTracker.C

diff --git a/MUON/MUONRawStreamTracker.C b/MUON/MUONRawStreamTracker.C
index c0f1a9062854efa6ee180c090b21c75dac972b4d..8e5d6623253ce4dc6f23e1cf1653b19acb3b4557 100644 (file)
--- a/MUON/MUONRawStreamTracker.C
+++ b/MUON/MUONRawStreamTracker.C
@@ -13,21 +13,38 @@
 * provided "as is" without express or implied warranty.                  *
 **************************************************************************/
 
-//
-// Macro for reading tracker raw data
-// Ch. Finck, Subatech Febuary
-//
-// Added example routines to show how to use the interface of the high
-// performance decoder AliMUONRawStreamTrackerHP.
-//   Artur Szostak <artursz@iafrica.com>
-//
+// $Id$
+
+/// \ingroup macros
+/// \file MUONRawStreamTracker.C
+/// \brief Macro for reading tracker raw data
+///
+/// \author Ch. Finck, Subatech Febuary
+///
+/// Added example routines to show how to use the interface of the high
+/// performance decoder AliMUONRawStreamTrackerHP.
+/// by  Artur Szostak <artursz@iafrica.com>
+///
+/// This macro is interfaced with AliRawReader for RAW
+///
+/// There are 2 ways of reading the data: 
+/// - one where each intermediate structure (block, dsp, buspatch) is looped over
+/// - and one, using an iterator, where we're directly accessing the pad informations 
+/// (charge).
+///
+/// The different stucture of the payload are readout and stored in TClonesArray
+/// with AliMUONRawStreamTracker class.
+/// The macro just simply reads again the TClonesArray contents.
+/// The parameters of each structure could be seen in the container classes
+/// AliMUONBlockHeader, AliMUONBlockHeader, AliMUONBusStruct.
+/// The class AliMUONDDLTracker manages the structure containers.
+/// The number of structures in the rawdata file could be set.
+
 
 #if !defined(__CINT__) || defined(__MAKECINT__)
 
 // RAW includes
-#include "AliRawReaderDate.h"
-#include "AliRawReaderFile.h"
-#include "AliRawReaderRoot.h"
+#include "AliRawReader.h"
 
 // MUON includes
 #include "AliMUONRawStreamTracker.h"
@@ -41,25 +58,6 @@
 
 #endif
 
-// Macro to read rawdata for tracker
-// Ch. Finck, Subatech, April. 2006
-//
-// This macro is interfaced with AliRawReader for RAW
-//
-// There are 2 ways of reading the data : one where each intermediate structure
-// (block, dsp, buspatch) is looped over, and one, using an iterator, where
-// we're directly accessing the pad informations (charge).
-//
-// The different stucture of the payload are readout and stored in TClonesArray
-// with AliMUONRawStreamTracker classe.
-// The macro just simpy read again the TClonesArray contents.
-// The parameter of each structure could be seen in the container classes
-// AliMUONBlockHeader, AliMUONBlockHeader, AliMUONBusStruct.
-// The class AliMUONDDLTracker manages the structure containers.
-// The number of structures in the rawdata file could be set.
-//
-// 
-
 void MUONRawStreamTrackerExpert(TString fileName = "./", Int_t maxEvent = 1000,  
                                 Int_t minDDL = 0, Int_t maxDDL = 19)
 {
@@ -69,16 +67,7 @@ void MUONRawStreamTrackerExpert(TString fileName = "./", Int_t maxEvent = 1000,
   TStopwatch timer;
   timer.Start(kTRUE);
   
-  AliRawReader* rawReader = 0x0;
-  
-  // check extention to choose the rawdata file format
-  if (fileName.EndsWith("/")) {
-    rawReader = new AliRawReaderFile(fileName); // DDL files
-  } else if (fileName.EndsWith(".root")) {
-    rawReader = new AliRawReaderRoot(fileName);
-  } else if (!fileName.IsNull()) {
-    rawReader = new AliRawReaderDate(fileName); // DATE file
-  }
+  AliRawReader* rawReader = AliRawReader::Create(fileName.Data());
   
   // raw stream
   AliMUONRawStreamTracker* rawStream  = new AliMUONRawStreamTracker(rawReader);    
@@ -174,16 +163,7 @@ void MUONRawStreamTrackerHPExpert(TString fileName = "./", Int_t maxEvent = 1000
   TStopwatch timer;
   timer.Start(kTRUE);
   
-  AliRawReader* rawReader = 0x0;
-  
-  // check extention to choose the rawdata file format
-  if (fileName.EndsWith("/")) {
-    rawReader = new AliRawReaderFile(fileName); // DDL files
-  } else if (fileName.EndsWith(".root")) {
-    rawReader = new AliRawReaderRoot(fileName);
-  } else if (!fileName.IsNull()) {
-    rawReader = new AliRawReaderDate(fileName); // DATE file
-  }
+  AliRawReader* rawReader = AliRawReader::Create(fileName.Data());
   
   // raw stream
   AliMUONRawStreamTrackerHP* rawStream  = new AliMUONRawStreamTrackerHP(rawReader);
@@ -265,16 +245,7 @@ void MUONRawStreamTrackerHPExpert2(TString fileName = "./", Int_t maxEvent = 100
   TStopwatch timer;
   timer.Start(kTRUE);
   
-  AliRawReader* rawReader = 0x0;
-  
-  // check extention to choose the rawdata file format
-  if (fileName.EndsWith("/")) {
-    rawReader = new AliRawReaderFile(fileName); // DDL files
-  } else if (fileName.EndsWith(".root")) {
-    rawReader = new AliRawReaderRoot(fileName);
-  } else if (!fileName.IsNull()) {
-    rawReader = new AliRawReaderDate(fileName); // DATE file
-  }
+  AliRawReader* rawReader = AliRawReader::Create(fileName.Data());
   
   // raw stream
   AliMUONRawStreamTrackerHP* rawStream  = new AliMUONRawStreamTrackerHP(rawReader);
@@ -356,16 +327,7 @@ void MUONRawStreamTrackerHPExpert3(TString fileName = "./", Int_t maxEvent = 100
   TStopwatch timer;
   timer.Start(kTRUE);
   
-  AliRawReader* rawReader = 0x0;
-  
-  // check extention to choose the rawdata file format
-  if (fileName.EndsWith("/")) {
-    rawReader = new AliRawReaderFile(fileName); // DDL files
-  } else if (fileName.EndsWith(".root")) {
-    rawReader = new AliRawReaderRoot(fileName);
-  } else if (!fileName.IsNull()) {
-    rawReader = new AliRawReaderDate(fileName); // DATE file
-  }
+  AliRawReader* rawReader = AliRawReader::Create(fileName.Data());
   
   // raw stream
   AliMUONRawStreamTrackerHP* rawStream  = new AliMUONRawStreamTrackerHP(rawReader);
@@ -450,16 +412,7 @@ void MUONRawStreamTrackerSimple(TString fileName = "./", Int_t maxEvent = 1000)
   TStopwatch timer;
   timer.Start(kTRUE);
   
-  AliRawReader* rawReader = 0x0;
-  
-  // check extention to choose the rawdata file format
-  if (fileName.EndsWith("/")) {
-    rawReader = new AliRawReaderFile(fileName); // DDL files
-  } else if (fileName.EndsWith(".root")) {
-    rawReader = new AliRawReaderRoot(fileName);
-  } else if (!fileName.IsNull()) {
-    rawReader = new AliRawReaderDate(fileName); // DATE file
-  }
+  AliRawReader* rawReader = AliRawReader::Create(fileName.Data());
   
   // raw stream
   AliMUONRawStreamTracker* rawStream  = new AliMUONRawStreamTracker(rawReader);    
@@ -500,16 +453,7 @@ void MUONRawStreamTrackerHPSimple(TString fileName = "./", Int_t maxEvent = 1000
   TStopwatch timer;
   timer.Start(kTRUE);
   
-  AliRawReader* rawReader = 0x0;
-  
-  // check extention to choose the rawdata file format
-  if (fileName.EndsWith("/")) {
-    rawReader = new AliRawReaderFile(fileName); // DDL files
-  } else if (fileName.EndsWith(".root")) {
-    rawReader = new AliRawReaderRoot(fileName);
-  } else if (!fileName.IsNull()) {
-    rawReader = new AliRawReaderDate(fileName); // DATE file
-  }
+  AliRawReader* rawReader = AliRawReader::Create(fileName.Data());
   
   // raw stream
   AliMUONRawStreamTrackerHP* rawStream  = new AliMUONRawStreamTrackerHP(rawReader);    
@@ -550,16 +494,7 @@ void MUONRawStreamTrackerHPSimple2(TString fileName = "./", Int_t maxEvent = 100
   TStopwatch timer;
   timer.Start(kTRUE);
   
-  AliRawReader* rawReader = 0x0;
-  
-  // check extention to choose the rawdata file format
-  if (fileName.EndsWith("/")) {
-    rawReader = new AliRawReaderFile(fileName); // DDL files
-  } else if (fileName.EndsWith(".root")) {
-    rawReader = new AliRawReaderRoot(fileName);
-  } else if (!fileName.IsNull()) {
-    rawReader = new AliRawReaderDate(fileName); // DATE file
-  }
+  AliRawReader* rawReader = AliRawReader::Create(fileName.Data());
   
   // raw stream
   AliMUONRawStreamTrackerHP* rawStream  = new AliMUONRawStreamTrackerHP(rawReader);