Net Particle updates (Jochen Thaeder <jochen@thaeder.de>)

[u/mrichter/AliRoot.git] / EVE / EveDet / AliEveTRDLoaderImp.cxx

diff --git a/EVE/EveDet/AliEveTRDLoaderImp.cxx b/EVE/EveDet/AliEveTRDLoaderImp.cxx
index a743d7e1b727c9f664827693eded1261541f1b2f..dfdf5711686fc6cbd11f767f3bc987613761316e 100644 (file)
--- a/EVE/EveDet/AliEveTRDLoaderImp.cxx
+++ b/EVE/EveDet/AliEveTRDLoaderImp.cxx
@@ -22,7 +22,7 @@
 #include "AliRun.h"
 #include "AliRunLoader.h"
 #include "AliTRDrawData.h"
-#include "AliTRDrawStreamBase.h"
+#include "AliTRDrawStream.h"
 #include "AliTRDdigitsManager.h"
 #include "AliRawReaderRoot.h"
 #include "AliRawReaderDate.h"
@@ -114,7 +114,7 @@ Bool_t      AliEveTRDLoaderSim::Open(const char *filename, const char *dir)
   if(!fRunLoader) return kFALSE;
 
   gAlice = fRunLoader->GetAliRun();
-  if(!gAlice) fRunLoader->LoadgAlice();
+  if(!gAlice && fRunLoader->LoadgAlice()) return kFALSE;
   if(!gAlice) return kFALSE;
  
   fFilename = filename;
@@ -224,14 +224,12 @@ Bool_t AliEveTRDLoaderRaw::LoadEvent()
   fRawRootReader->SelectEquipment(0, 1024, 1041);
   fRawRootReader->Select("TRD");
   
-  AliTRDrawStreamBase::SetRawStreamVersion(AliTRDrawStreamBase::kTRDfastStream);
 //   AliTRDrawStream::AllowCorruptedData();
 //   AliTRDrawStream::DisableStackNumberChecker();
 //   AliTRDrawStream::DisableStackLinkNumberChecker();
 
-  AliTRDrawStreamBase *pinput = 
-  AliTRDrawStreamBase::GetRawStream(fRawRootReader);
-  AliTRDrawStreamBase &input = *pinput;
+  AliTRDrawStream *pinput = new AliTRDrawStream(fRawRootReader);
+  AliTRDrawStream &input = *pinput;
 
  // AliInfo(Form("Stream version: %s", input.IsA()->GetName()));
 
@@ -305,7 +303,7 @@ void AliEveTRDLoaderSimEditor::SetModel(TObject* obj)
 {
   // Set model object.
 
-  fM = dynamic_cast<AliEveTRDLoaderSim*>(obj);
+  if(!(fM = dynamic_cast<AliEveTRDLoaderSim*>(obj))) return;
 
   Bool_t kRL   = (fM->IsDataLinked()) ? kTRUE : kFALSE;