Improvements

[u/mrichter/AliRoot.git] / PWGLF / FORWARD / analysis2 / AliForwardUtil.cxx

diff --git a/PWGLF/FORWARD/analysis2/AliForwardUtil.cxx b/PWGLF/FORWARD/analysis2/AliForwardUtil.cxx
index 9fd671034323bb097067a7c750e26444b31d7531..9a77c4ac1278a4f58a45328c1a92cbbb107b4f04 100644 (file)
--- a/PWGLF/FORWARD/analysis2/AliForwardUtil.cxx
+++ b/PWGLF/FORWARD/analysis2/AliForwardUtil.cxx
@@ -88,13 +88,15 @@ ULong_t AliForwardUtil::AliROOTBranch()
   TObjArray*   tokens = str.Tokenize("-");
   TObjString*  pMajor = static_cast<TObjString*>(tokens->At(0));
   TObjString*  pMinor = static_cast<TObjString*>(tokens->At(1));
-  TObjString*  pRelea = static_cast<TObjString*>(tokens->At(2));
+  TObjString*  pRelea = (tokens->GetEntries() > 2 ? 
+    static_cast<TObjString*>(tokens->At(2)) : 0);
   TObjString* pAn     = (tokens->GetEntries() > 3 ? 
     static_cast<TObjString*>(tokens->At(3)) : 0);
   TString sMajor = pMajor->String().Strip(TString::kLeading, '0');
   TString sMinor = pMinor->String().Strip(TString::kLeading, '0');
-  TString sRelea = pRelea->String().Strip(TString::kLeading, '0');
-  
+  TString sRelea = (pRelea ? pRelea->String() : "");
+  sRelea = sRelea.Strip(TString::kLeading, '0');
+
   ret = (((sMajor.Atoi() & 0xFF) << 12) |
     ((sMinor.Atoi() & 0xFF) <<  8) |
     ((sRelea.Atoi() & 0xFF) <<  4) |