From: rgrosso <rgrosso@f7af4fe6-9843-0410-8265-dc069ae4e863>
Date: Thu, 28 Jun 2012 17:27:50 +0000 (+0000)
Subject: Making AliCDBManager::GetId protected (was public)
X-Git-Url: http://git.uio.no/git/?a=commitdiff_plain;h=df3fcecb5c608eac638492a53674a6820db4eff2;p=u%2Fmrichter%2FAliRoot.git

Making AliCDBManager::GetId protected (was public)
---

diff --git a/STEER/CDB/AliCDBManager.h b/STEER/CDB/AliCDBManager.h
index c753791c8a1..9ac4d58f741 100644
--- a/STEER/CDB/AliCDBManager.h
+++ b/STEER/CDB/AliCDBManager.h
@@ -80,12 +80,6 @@ class AliCDBManager: public TObject {
 	AliCDBEntry* GetEntryFromSnapshot(const char* path);
 
 	const char* GetURI(const char* path);				 
-				 
-	AliCDBId* GetId(const AliCDBId& query);
-	AliCDBId* GetId(const AliCDBPath& path, Int_t runNumber=-1,
-				Int_t version = -1, Int_t subVersion = -1);
-	AliCDBId* GetId(const AliCDBPath& path, const AliCDBRunRange& runRange,
-				 Int_t version = -1, Int_t subVersion = -1);
 
 	TList* GetAll(const AliCDBId& query);
 	TList* GetAll(const AliCDBPath& path, Int_t runNumber=-1,
@@ -159,6 +153,12 @@ protected:
   	void CacheEntry(const char* path, AliCDBEntry* entry);
 
 	AliCDBParam* SelectSpecificStorage(const TString& path);
+				 
+	AliCDBId* GetId(const AliCDBId& query);
+	AliCDBId* GetId(const AliCDBPath& path, Int_t runNumber=-1,
+				Int_t version = -1, Int_t subVersion = -1);
+	AliCDBId* GetId(const AliCDBPath& path, const AliCDBRunRange& runRange,
+				 Int_t version = -1, Int_t subVersion = -1);
 	
 
 //	void Init();
diff --git a/STEER/STEER/AliReconstruction.cxx b/STEER/STEER/AliReconstruction.cxx
index 84a4633651f..2b20e569f48 100644
--- a/STEER/STEER/AliReconstruction.cxx
+++ b/STEER/STEER/AliReconstruction.cxx
@@ -1767,32 +1767,17 @@ void AliReconstruction::SlaveBegin(TTree*)
   // order to create all branches. Initialization is done from an
   // ESD layout template in CDB
   AliCDBManager* man = AliCDBManager::Instance();
-  AliCDBPath hltESDConfigPath("HLT/Calib/esdLayout");
-  AliCDBEntry* hltESDConfig=NULL;
-  if (man->GetId(hltESDConfigPath)!=NULL)
-    hltESDConfig=man->Get(hltESDConfigPath);
-  if (!hltESDConfig) {
-    // try the alternative path
-    // in Feb 2012 the object has been moved from ConfigHLT to Calib
-    AliCDBPath hltESDConfigLegacyPath("HLT/ConfigHLT/esdLayout");
-    AliInfo(Form("can not find HLT ESD config object in %s, trying legacy path %s",
-		 hltESDConfigPath.GetPath().Data(),
-		 hltESDConfigLegacyPath.GetPath().Data()));
-    hltESDConfig=man->Get(hltESDConfigLegacyPath);
-  }
-  if (hltESDConfig) {
-    AliESDEvent* pESDLayout=dynamic_cast<AliESDEvent*>(hltESDConfig->GetObject());
-    if (pESDLayout) {
+  AliCDBEntry* hltESDConfig = man->Get("HLT/Calib/esdLayout");
+  AliESDEvent* pESDLayout=dynamic_cast<AliESDEvent*>(hltESDConfig->GetObject());
+  if (pESDLayout) {
       // init all internal variables from the list of objects
       pESDLayout->GetStdContent();
 
       // copy content and create non-std objects
       *fhltesd=*pESDLayout;
       fhltesd->Reset();
-    } else {
-      AliError(Form("error setting hltEsd layout from %s: invalid object type",
-		    hltESDConfigPath.GetPath().Data()));
-    }
+  } else {
+      AliError(Form("error setting hltEsd layout from \"HLT/Calib/esdLayout\": invalid object type"));
   }
 
   fhltesd->WriteToTree(fhlttree);