Added V0A23 (V0 rings 2-3), V0C01 (V0 rings 0-1) and V0S = V0A23+V0C01

[u/mrichter/AliRoot.git] / STEER / STEERBase / AliProdInfo.cxx

diff --git a/STEER/STEERBase/AliProdInfo.cxx b/STEER/STEERBase/AliProdInfo.cxx
index 038a8bf1e559cdddbad8958cc4d5daeb3ffd2286..366d2560f822cc260aab55bd09e3bce170860721 100644 (file)
--- a/STEER/STEERBase/AliProdInfo.cxx
+++ b/STEER/STEERBase/AliProdInfo.cxx
@@ -110,13 +110,25 @@ void AliProdInfo::ParseProdInfo(TNamed *prodInfoData) {
     if (stObj->GetString().Contains("aliroot") && (i==0) ) {  // aliroot version
       TObjArray *tali = (TObjArray *)stObj->GetString().Tokenize(":");
       TObjString *tos = (TObjString *)tali->At(0);
-      TObjArray *tali2 = (TObjArray *)tos->GetString().Tokenize(" ");
-      TObjString *av = (TObjString *)tali2->At(1);
-      fAlirootVersion=av->GetString().Data();
-      TObjString *ts = (TObjString*)tali->At(1); 
-      fAlirootSvnVersion = ts->GetString().Atoi();
+      fAlirootVersion="";
+      if (tos) {
+        TObjArray *tali2 = (TObjArray *)tos->GetString().Tokenize(" ");
+        TObjString *av = (TObjString *)tali2->At(1);
+        if (av) fAlirootVersion=av->GetString().Data();
+        else AliWarning("Cannot extract AliROOT version string. Might be git related.");
+        delete tali2;
+      }
+      
+      TObjString *ts = (TObjString*)tali->At(1);
+      if (ts){
+        if (ts->GetString().IsDigit()){
+          fAlirootSvnVersion = ts->GetString().Atoi();
+        } else {
+          AliWarning("Version number not numeric, might be on git. Using last svn rev number (65263) instead.");
+          fAlirootSvnVersion=65263;
+        }
+      }
       delete tali;
-      delete tali2;
     }
     else if (stObj->GetString().Contains("root") && (i==1) ) {  // root version
       TObjArray *tali = (TObjArray *)stObj->GetString().Tokenize(":");
@@ -177,7 +189,7 @@ void AliProdInfo::ParseProdInfo(TNamed *prodInfoData) {
       */
     }
   }
-
+  delete tokens;
 }
 
 //-------------------------------------------------------------------------------------------------