try coverity fix 23965, condition checked twice

[u/mrichter/AliRoot.git] / EVE / macros / alieve_init.C

diff --git a/EVE/macros/alieve_init.C b/EVE/macros/alieve_init.C
index f5b960618720affe3f6fb856af0712fc1f19a261..fac6c54b76f37f619ca9f4d99b197e71d2e62d93 100644 (file)
--- a/EVE/macros/alieve_init.C
+++ b/EVE/macros/alieve_init.C
@@ -7,8 +7,11 @@
  * full copyright notice.                                                 *
  **************************************************************************/
 
+/// \ingroup evemacros
+/// \file alieve_init.C
+
 void alieve_init(const TString& cdburi = "",
-                const TString& path   = ".", Int_t event=0,
+                const TString& path   = ".", Int_t event=0,Bool_t showHLTESDTree=kFALSE,
                  const Text_t* esdfile = 0,
                  const Text_t* aodfile = 0,
                  const Text_t* rawfile = 0,
@@ -32,7 +35,16 @@ void alieve_init(const TString& cdburi = "",
 
   gSystem->ProcessEvents();
 
-  AliEveEventManager::SetESDFileName(esdfile);
+  AliEveEventManager::SetFilesPath(path);
+  
+  if(showHLTESDTree){
+   AliEveEventManager::SetESDFileName(esdfile, AliEveEventManager::kHLTTree);
+  }
+  else
+  {
+   AliEveEventManager::SetESDFileName(esdfile, AliEveEventManager::kOfflineTree);
+  }
+  
   AliEveEventManager::SetRawFileName(rawfile);
   AliEveEventManager::SetCdbUri(cdburi);
   AliEveEventManager::SetAssertElements(assert_runloader, assert_esd,
@@ -48,22 +60,22 @@ void alieve_init(const TString& cdburi = "",
     else
     {
       Info("alieve_init", "AliEn requested - connecting.");
-      if (gSystem->Getenv("alien_API_VO") == 0)
+      if (gSystem->Getenv("GSHELL_ROOT") == 0)
       {
-       Error("alieve_init", "AliEn environment not initialized. Aborting.");
-       gSystem->Exit(1);
+             Error("alieve_init", "AliEn environment not initialized. Aborting.");
+             gSystem->Exit(1);
       }
       if (TGrid::Connect("alien") == 0)
       {
-       Error("alieve_init", "TGrid::Connect() failed. Aborting.");
-       gSystem->Exit(1);
+             Error("alieve_init", "TGrid::Connect() failed. Aborting.");
+             gSystem->Exit(1);
       }
     }
   }
 
   Info("alieve_init", "Opening event %d from '%s' ...", event, path.Data());
   TString name("Event"); // CINT has trouble with direct "Event".
-  new AliEveEventManager(name, path, event);
+  new AliEveEventManager(name, event);
   gEve->AddEvent(AliEveEventManager::GetMaster());
 }
 
@@ -81,29 +93,23 @@ void alieve_init_import_macros()
   {
     char* filename;
     TPMERegexp re("\\.C$");
-    std::list<string> names; // This form understood by cint (fails with std::string).
+    TObjArray names;
     while ((filename = gSystem->GetDirEntry(dirhandle)) != 0)
     {
       if (re.Match(filename))
-       names.push_back(filename);
+       names.AddLast(new TObjString(filename));
     }
-    names.sort();
-    //PH The line below is replaced waiting for a fix in Root
-    //PH which permits to use variable siza arguments in CINT
-    //PH on some platforms (alphalinuxgcc, solariscc5, etc.)
-    // f->Add(new TEveMacro(Form("%s/%s", macdir.Data(), filename)));
-    char fullName[1000];
-    for (std::list<string>::iterator si=names.begin(); si!=names.end(); ++si)
+    names.Sort();
+
+    for (Int_t ii=0; ii<names.GetEntries(); ++ii)
     {
-      sprintf(fullName,"%s/%s", macdir.Data(), si->c_str());
-      f->Add(new TEveMacro(fullName));
+      TObjString * si = (TObjString*) names.At(ii);
+       f->Add(new TEveMacro(Form("%s/%s", macdir.Data(), (si->GetString()).Data())));
     }
   }
   gSystem->FreeDirectory(dirhandle);
 
-  gROOT->GetListOfBrowsables()->Add
-    // (new TSystemDirectory("alice-macros", macdir.Data())); // !!!! this spits blood, but then works
-    (new TSystemDirectory(macdir.Data(), macdir.Data()));
+  gROOT->GetListOfBrowsables()->Add(new TSystemDirectory(macdir.Data(), macdir.Data()));
 
   {
     TEveBrowser   *br = gEve->GetBrowser();