X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=STEER%2FAliCDBId.h;h=511519f5c82a6699be9d74fb5ec66093a8778642;hb=2894a0c933f304a64c12524138f980a805323c0f;hp=6d144f526f18cfd841fb1bae97530c3cab91e8ac;hpb=9e1ceb13c690a7673f9720e254c12f53b7777dee;p=u%2Fmrichter%2FAliRoot.git

diff --git a/STEER/AliCDBId.h b/STEER/AliCDBId.h
index 6d144f526f1..511519f5c82 100644
--- a/STEER/AliCDBId.h
+++ b/STEER/AliCDBId.h
@@ -32,49 +32,52 @@ public:
 		Int_t firstRun , Int_t lastRun , Int_t verison = -1, 
 		Int_t subVersion = -1); 
 
+	static AliCDBId* MakeFromString(const TString& idString); 		
+		
 	virtual ~AliCDBId();
 
-	const AliCDBPath& 	GetAliCDBPath() const {return fPath;};
-	const TString& 		GetPath() const {return fPath.GetPath();};
-	const TString& 		GetLevel0() const {return fPath.GetLevel0();};
-	const TString& 		GetLevel1() const {return fPath.GetLevel1();};
-	const TString& 		GetLevel2() const {return fPath.GetLevel2();};
-	Bool_t 			IsWildcard() const {return fPath.IsWildcard();};
+	const AliCDBPath& 	GetAliCDBPath() const {return fPath;}
+	const TString& 		GetPath() const {return fPath.GetPath();}
+	const TString 		GetPathLevel(Int_t i) const {return fPath.GetLevel(i);}
+	Bool_t 			IsWildcard() const {return fPath.IsWildcard();}
 
-	void 	SetPath(const char* path) {fPath.SetPath(path);};
+	void 	SetPath(const char* path) {fPath.SetPath(path);}
 
-	const 		AliCDBRunRange& GetAliCDBRunRange() const {return fRunRange;};
-	AliCDBRunRange& GetAliCDBRunRange() {return fRunRange;};
-	Int_t 		GetFirstRun() const {return fRunRange.GetFirstRun();};
-	Int_t 		GetLastRun() const {return fRunRange.GetLastRun();};	
-	void 		SetFirstRun(Int_t firstRun) {fRunRange.SetFirstRun(firstRun);};
-	void 		SetLastRun(Int_t lastRun) {fRunRange.SetLastRun(lastRun);};
-	void 		SetRunRange(Int_t firstRun, Int_t lastRun) 
-			{fRunRange.SetRunRange(firstRun, lastRun);};
+	const 		AliCDBRunRange& GetAliCDBRunRange() const {return fRunRange;}
+	AliCDBRunRange& GetAliCDBRunRange() {return fRunRange;}
+	Int_t 		GetFirstRun() const {return fRunRange.GetFirstRun();}
+	Int_t 		GetLastRun() const {return fRunRange.GetLastRun();}
+	void 		SetFirstRun(Int_t firstRun) {fRunRange.SetFirstRun(firstRun);}
+	void 		SetLastRun(Int_t lastRun) {fRunRange.SetLastRun(lastRun);}
+	void 		SetRunRange(Int_t firstRun, Int_t lastRun)
+			{fRunRange.SetRunRange(firstRun, lastRun);}
 
 
-	Bool_t 	IsAnyRange() const {return fRunRange.IsAnyRange();};
+	Bool_t 	IsAnyRange() const {return fRunRange.IsAnyRange();}
 
 
-	Int_t 	GetVersion() const {return fVersion;};
-	Int_t 	GetSubVersion() const {return fSubVersion;};
-	void 	SetVersion(Int_t version) {fVersion = version;};	
-	void 	SetSubVersion(Int_t subVersion) {fSubVersion = subVersion;};
-	
-	const TString& 	GetLastStorage() const {return fLastStorage;};
-	void 		SetLastStorage(TString& lastStorage){fLastStorage = lastStorage;};
+	Int_t 	GetVersion() const {return fVersion;}
+	Int_t 	GetSubVersion() const {return fSubVersion;}
+	void 	SetVersion(Int_t version) {fVersion = version;}
+	void 	SetSubVersion(Int_t subVersion) {fSubVersion = subVersion;}
+
+	const TString& 	GetLastStorage() const {return fLastStorage;}
+	void 		SetLastStorage(TString& lastStorage){fLastStorage = lastStorage;}
 
 	Bool_t IsValid() const; 
-	Bool_t IsSpecified() const {return !(IsWildcard() || IsAnyRange());};
+	Bool_t IsSpecified() const {return !(IsWildcard() || IsAnyRange());}
+
+	Bool_t HasVersion() const {return fVersion >= 0;}
+	Bool_t HasSubVersion() const {return fSubVersion >= 0;}
+
+	Bool_t Comprises(const AliCDBId& other) const
+		{return fPath.Comprises(other.fPath)
+		         && fRunRange.Comprises(other.fRunRange);}
 
-	Bool_t HasVersion() const {return fVersion >= 0;};
-	Bool_t HasSubVersion() const {return fSubVersion >= 0;};
+	virtual Bool_t IsEqual(const TObject *obj) const;
 
-	Bool_t Comprises(const AliCDBId& other) const 
-		{return fPath.Comprises(other.fPath) 
-		         && fRunRange.Comprises(other.fRunRange);};
-	
 	TString ToString() const;
+	void Print(Option_t* option="") const;
 
 private: