From 80cadf8aa9b8b58f76a2bdbd050015ebce0ac378 Mon Sep 17 00:00:00 2001
From: prsnko <Dmitri.Peressounko@cern.ch>
Date: Wed, 9 Jul 2014 11:26:52 +0400
Subject: [PATCH] ALIROOT-5492 Another fix to HighLow Gain

---
 STEER/AOD/AliAODCaloCells.h | 20 ++++++++++++++------
 STEER/ESD/AliESDCaloCells.h | 20 ++++++++++++++------
 2 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/STEER/AOD/AliAODCaloCells.h b/STEER/AOD/AliAODCaloCells.h
index 0b0cc42e2f0..9797f54aab3 100644
--- a/STEER/AOD/AliAODCaloCells.h
+++ b/STEER/AOD/AliAODCaloCells.h
@@ -125,10 +125,14 @@ Bool_t AliAODCaloCells::GetCellHighGain(Short_t cellNumber)
   if (pos>=0 && pos < fNCells && fCellNumber[pos] == cellNumber ) {
     if(fHGLG)
       return fHGLG[pos];
-    else //old version of AOD, 
-      return !(fMCLabel[pos]==-2) ;
+    else{
+      if(fMCLabel) //old version of AOD, 
+         return !(fMCLabel[pos]==-2) ;
+      else
+	 return kTRUE ;
+    }
   } else {
-    return 0.;
+    return kFALSE;
   }
 }
 
@@ -162,10 +166,14 @@ Bool_t AliAODCaloCells::GetHighGain(Short_t pos) const
   if (pos>=0 && pos<fNCells) {
     if(fHGLG)
       return fHGLG[pos];
-    else //Old version of AOD store this flag in MCLabel
-      return !(fMCLabel[pos]==-2) ;
+    else{
+      if(fMCLabel)    //Old version of AOD store this flag in MCLabel
+        return !(fMCLabel[pos]==-2) ;
+      else
+	return kTRUE ;
+    }
   } else {
-    return 0.;
+    return kFALSE;
   }
 }
 
diff --git a/STEER/ESD/AliESDCaloCells.h b/STEER/ESD/AliESDCaloCells.h
index 142b353049f..faea00188cb 100644
--- a/STEER/ESD/AliESDCaloCells.h
+++ b/STEER/ESD/AliESDCaloCells.h
@@ -129,10 +129,14 @@ Bool_t AliESDCaloCells::GetCellHighGain(Short_t cellNumber)
   if (pos>=0 && pos < fNCells && fCellNumber[pos] == cellNumber ) {
     if(fHGLG)
       return fHGLG[pos];
-    else //old version of ESD, for data HG flag stored in MCLabel 
-      return !(fMCLabel[pos]==-2) ;
+    else{
+      if(fMCLabel)//old version of ESD, for data HG flag stored in MCLabel 
+        return !(fMCLabel[pos]==-2) ;
+      else
+	return kTRUE ;
+    }
   } else {
-    return 0.;
+    return kFALSE;
   }
 }
 
@@ -164,10 +168,14 @@ Bool_t AliESDCaloCells::GetHighGain(Short_t pos) const
   if (pos>=0 && pos<fNCells) {
     if(fHGLG)
       return fHGLG[pos];
-    else //old version of ESD, for data HG flag stored in MCLabel 
-      return !(fMCLabel[pos]==-2) ;
+    else{
+      if(fMCLabel)//old version of ESD, for data HG flag stored in MCLabel 
+        return !(fMCLabel[pos]==-2) ;
+      else
+	return kTRUE ;
+    }
   } else {
-    return 0.;
+    return kFALSE;
   }
 }
 
-- 
2.43.0