mchview version 0.93

[u/mrichter/AliRoot.git] / MUON / AliMUONTrackerCalibratedDataMaker.cxx

diff --git a/MUON/AliMUONTrackerCalibratedDataMaker.cxx b/MUON/AliMUONTrackerCalibratedDataMaker.cxx
index e35317286fe972324d00a0b99d0ec57ec85de4e2..e9a55d507916a3e74efe6bf41cbe680a3c1c563f 100644 (file)
--- a/MUON/AliMUONTrackerCalibratedDataMaker.cxx
+++ b/MUON/AliMUONTrackerCalibratedDataMaker.cxx
@@ -58,7 +58,6 @@ AliMUONTrackerCalibratedDataMaker::AliMUONTrackerCalibratedDataMaker(AliRawReade
   fRawReader(reader),
   fAccumulatedData(0x0),
   fOneEventData(new AliMUON2DMap(true)),
-  fIsOwner(kTRUE),
   fSource("unspecified"),
   fIsRunning(kFALSE),
   fDigitMaker(0x0),
@@ -66,12 +65,18 @@ AliMUONTrackerCalibratedDataMaker::AliMUONTrackerCalibratedDataMaker(AliRawReade
   fCalibrationData(0x0),
   fDigitStore(0x0), 
   fCDBPath(cdbpath),
-  fNumberOfEvents(0){
+  fNumberOfEvents(0)
+{
   /// Ctor
-  reader->NextEvent(); // to be sure to get run number available
-  
-  Int_t runNumber = reader->GetRunNumber();
-  
+
+    Int_t runNumber(0);
+    
+  if ( fRawReader ) 
+  {
+    reader->NextEvent(); // to be sure to get run number available
+    runNumber = reader->GetRunNumber();
+  }
+    
   ++fgkCounter;
   
   Bool_t calibrate = ( fCDBPath.Length() > 0 );
@@ -110,7 +115,7 @@ AliMUONTrackerCalibratedDataMaker::AliMUONTrackerCalibratedDataMaker(AliRawReade
     AliInfo(Form("Will histogram between %e and %e",xmin,xmax));
   }
   
-  reader->RewindEvents();
+  if  (fRawReader) fRawReader->RewindEvents();
 
   fDigitMaker = new AliMUONDigitMaker;
   fDigitMaker->SetMakeTriggerDigits(kFALSE);
@@ -154,7 +159,7 @@ AliMUONTrackerCalibratedDataMaker::~AliMUONTrackerCalibratedDataMaker()
 {
   /// dtor
   delete fOneEventData;
-  if ( fIsOwner ) delete fAccumulatedData;
+  delete fAccumulatedData;
   delete fRawReader;
   delete fDigitStore;
   delete fCalibrationData;
@@ -162,6 +167,15 @@ AliMUONTrackerCalibratedDataMaker::~AliMUONTrackerCalibratedDataMaker()
   delete fDigitCalibrator;
 }
 
+//_____________________________________________________________________________
+Long64_t 
+AliMUONTrackerCalibratedDataMaker::Merge(TCollection*)
+{
+  /// Merge
+  AliError("Not implemented yet");
+  return 0;
+}
+
 //_____________________________________________________________________________
 Bool_t 
 AliMUONTrackerCalibratedDataMaker::NextEvent()