From 15225134b18e2ab919522dd481116c1359938a29 Mon Sep 17 00:00:00 2001
From: cblume <Christoph.Blume@cern.ch>
Date: Sat, 31 Jan 2015 17:25:37 +0100
Subject: [PATCH] Add index i to GetCalDCSFEEObj()

---
 TRD/TRDbase/AliTRDcalibDB.cxx | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/TRD/TRDbase/AliTRDcalibDB.cxx b/TRD/TRDbase/AliTRDcalibDB.cxx
index 33396e4cfd0..b0f64f5ca78 100644
--- a/TRD/TRDbase/AliTRDcalibDB.cxx
+++ b/TRD/TRDbase/AliTRDcalibDB.cxx
@@ -1101,11 +1101,21 @@ Int_t AliTRDcalibDB::GetOnlineGainTableID()
     TString tableName = "";
     for (Int_t i = 0; i < 540; i++) {
       const AliTRDCalDCSFEEv2 *calDCSFEEv2 = calDCSv2->GetCalDCSFEEObj(i);
-      tableName = calDCSFEEv2->GetGainTableName();
-      if (tableName.Length() > 0) {
-        break;
+      if (!calDCSFEEv2) {
+        continue;
+      }
+      const TString tableNameTmp = calDCSFEEv2->GetGainTableName();
+      if (tableNameTmp.Length() > 0) {
+        if ((tableName.Length() > 0) &&
+            (tableName != tableNameTmp)) {
+          AliFatal(Form("Inconsistent gain table names! %s - %s"
+                       ,tableName.Data(),tableNameTmp.Data()));
+          continue; // maybe return -1;
+        }
+        tableName = tableNameTmp; // this contains the first entry found
       }
     }
+
     if      (tableName.CompareTo("Krypton_2011-01")               == 0)
       fOnlineGainTableID = 1;
     else if (tableName.CompareTo("Gaintbl_Uniform_FGAN0_2011-01") == 0)
-- 
2.39.3