X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=STEER%2FAliCDBManager.h;h=22bd2b8e486b285ee485f3c498b527976f1ae550;hb=aec075904ab650f60812afa9adafa4fddf41fd58;hp=bfa1ce230ac06fabaac3a1806e7bb758141be92c;hpb=d1982b43e6066bc4ceb20e39eae35dec48fa8364;p=u%2Fmrichter%2FAliRoot.git

diff --git a/STEER/AliCDBManager.h b/STEER/AliCDBManager.h
index bfa1ce230ac..22bd2b8e486 100644
--- a/STEER/AliCDBManager.h
+++ b/STEER/AliCDBManager.h
@@ -13,6 +13,7 @@
 #include <TObject.h>
 #include <TList.h>
 #include <TMap.h>
+#include <TSystem.h>
 
 class AliCDBEntry;
 class AliCDBId;
@@ -48,6 +49,8 @@ class AliCDBManager: public TObject {
 	void SetDefaultStorage(const char* dbString);
 	void SetDefaultStorage(const AliCDBParam* param);
 	void SetDefaultStorage(AliCDBStorage *storage);
+	void SetDefaultStorage(const char* runType, const char* simType);
+	void SetDefaultStorageFromRun(Int_t run);
 
 	Bool_t IsDefaultStorageSet() const {return fDefaultStorage != 0;}
 	AliCDBStorage* GetDefaultStorage() const {return fDefaultStorage;}
@@ -89,15 +92,18 @@ class AliCDBManager: public TObject {
 				 Int_t version = -1, Int_t subVersion = -1); 
 
 	Bool_t Put(TObject* object, AliCDBId& id,
-			AliCDBMetaData* metaData, DataType type=kPrivate);
+			AliCDBMetaData* metaData, const DataType type=kPrivate);
 	Bool_t Put(AliCDBEntry* entry, DataType type=kPrivate);
 
 	void SetCacheFlag(Bool_t cacheFlag) {fCache=cacheFlag;}
 	Bool_t GetCacheFlag() const {return fCache;}
 	
-	void SetLock(Bool_t lockFlag=kTRUE);
+	ULong_t SetLock(Bool_t lockFlag=kTRUE, ULong_t key=0);
 	Bool_t GetLock() const {return fLock;}
 
+	void SetRaw(Bool_t rawFlag){fRaw=rawFlag;}
+	Bool_t GetRaw() const {return fRaw;}
+
 	void SetRun(Int_t run);
 	Int_t GetRun() const {return fRun;}
 
@@ -119,12 +125,19 @@ class AliCDBManager: public TObject {
 
 	static AliCDBManager* Instance(TMap *entryCache = NULL, Int_t run = -1);
 
- private:
+	void Init();
+	void InitFromCache(TMap *entryCache, Int_t run);
+  
+protected:
 
 	static TString fgkCondUri;	// URI of the Conditions data base folder
 	static TString fgkRefUri;	// URI of the Reference data base folder
+	static TString fgkMCIdealStorage;	// URI of the MC-Ideal Conditions data base folder form MC data
+	static TString fgkMCFullStorage;	// URI of the MC-Full Conditions data base folder form MC data
+	static TString fgkMCResidualStorage;	// URI of the MC-Residual Conditions data base folder form MC data
+	static TString fgkOCDBFolderXMLfile;	// alien path of the XML file for OCDB folder <--> Run range correspondance
 
-	AliCDBManager();
+	AliCDBManager() ; 
 	AliCDBManager(const AliCDBManager & source);
 	AliCDBManager & operator=(const AliCDBManager & source);
 
@@ -138,9 +151,9 @@ class AliCDBManager: public TObject {
 	AliCDBParam* SelectSpecificStorage(const TString& path);
 	
 
-	void Init();
+//	void Init();
 	void InitShortLived();
-	void InitFromCache(TMap *entryCache, Int_t run);
+//	void InitFromCache(TMap *entryCache, Int_t run);
 
 
 	TList fFactories; 		//! list of registered storage factories
@@ -162,6 +175,14 @@ class AliCDBManager: public TObject {
 	Bool_t fCache;			//! The cache flag
 	Bool_t fLock; 	//! Lock flag, if ON default storage and run number cannot be reset
 
+	Bool_t fRaw;   // flag to say whether we are in the raw case
+	Int_t fStartRunLHCPeriod; // 1st run of the LHC period set
+	Int_t fEndRunLHCPeriod;   // last run of the LHC period set
+	TString fLHCPeriod;       // LHC period alien folder
+
+private:
+   ULong_t fKey;  //! Key for locking/unlocking
+
 
 	ClassDef(AliCDBManager, 0);
 };