Merge branch 'master' of https://git.cern.ch/reps/AliRoot

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

diff --git a/EVE/EveDet/AliEveTRDLoaderImp.cxx b/EVE/EveDet/AliEveTRDLoaderImp.cxx
index 4f4555217f82852d38a667a24c842094ac146964..e7132227e0d9c7ef3a61c680b56375419ecc6457 100644 (file)
--- a/EVE/EveDet/AliEveTRDLoaderImp.cxx
+++ b/EVE/EveDet/AliEveTRDLoaderImp.cxx
@@ -9,7 +9,7 @@
 
 #include "AliEveTRDLoaderImp.h"
 #include "AliEveTRDModuleImp.h"
-#include "EveBase/AliEveEventManager.h"
+#include "AliEveEventManager.h"
 
 #include <TEveManager.h>
 
@@ -21,10 +21,8 @@
 #include "AliLog.h"
 #include "AliRun.h"
 #include "AliRunLoader.h"
-//#include "AliLoader.h"
 #include "AliTRDrawData.h"
 #include "AliTRDrawStream.h"
-#include "AliTRDrawStreamBase.h"
 #include "AliTRDdigitsManager.h"
 #include "AliRawReaderRoot.h"
 #include "AliRawReaderDate.h"
@@ -110,13 +108,13 @@ Bool_t    AliEveTRDLoaderSim::Open(const char *filename, const char *dir)
 
   if(fRunLoader) return kTRUE;
   
-  fRunLoader = AliRunLoader::GetRunLoader();
+  fRunLoader = AliRunLoader::Instance();
   if(!fRunLoader) fRunLoader = AliRunLoader::Open(filename,
          AliConfig::GetDefaultEventFolderName(),"read");
   if(!fRunLoader) return kFALSE;
 
   gAlice = fRunLoader->GetAliRun();
-  if(!gAlice) fRunLoader->LoadgAlice();
+  if(!gAlice && fRunLoader->LoadgAlice()) return kFALSE;
   if(!gAlice) return kFALSE;
  
   fFilename = filename;
@@ -226,14 +224,12 @@ Bool_t AliEveTRDLoaderRaw::LoadEvent()
   fRawRootReader->SelectEquipment(0, 1024, 1041);
   fRawRootReader->Select("TRD");
   
-  AliTRDrawStreamBase::SetRawStreamVersion(AliTRDrawStreamBase::kTRDrealStream);
-  AliTRDrawStream::AllowCorruptedData();
-  AliTRDrawStream::DisableStackNumberChecker();
-  AliTRDrawStream::DisableStackLinkNumberChecker();
+//   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()));
 
@@ -307,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;