//_____________________________________________________________________________
Bool_t AliCDBGrid::FilenameToId(TString& filename, AliCDBId& id) {
-// build AliCDBId from full path filename (fDBFolder/path/Run#x_#y_v#z.root)
+// build AliCDBId from full path filename (fDBFolder/path/Run#x_#y_v#z_s0.root)
if(filename.Contains(fDBFolder)){
filename = filename(fDBFolder.Length(),filename.Length()-fDBFolder.Length());
filename=filename(idPath.Length()+1,filename.Length()-idPath.Length());
Ssiz_t mSize;
- // valid filename: Run#firstRun_#lastRun_v#version.root
- TRegexp keyPattern("^Run[0-9]+_[0-9]+_v[0-9]+.root$");
+ // valid filename: Run#firstRun_#lastRun_v#version_s0.root
+ TRegexp keyPattern("^Run[0-9]+_[0-9]+_v[0-9]+_s0.root$");
keyPattern.Index(filename, &mSize);
if (!mSize) {
- AliDebug(2,Form("Bad filename <%s>.", filename.Data()));
- return kFALSE;
- }
+
+ // TODO backward compatibility ... maybe remove later!
+ Ssiz_t oldmSize;
+ TRegexp oldKeyPattern("^Run[0-9]+_[0-9]+_v[0-9]+.root$");
+ oldKeyPattern.Index(filename, &oldmSize);
+ if(!oldmSize) {
+ AliDebug(2,Form("Bad filename <%s>.", filename.Data()));
+ return kFALSE;
+ } else {
+ AliDebug(2,Form("Old filename format <%s>.", filename.Data()));
+ id.SetSubVersion(-11); // TODO trick to ensure backward compatibility
+ }
+
+ } else {
+ id.SetSubVersion(-1); // TODO trick to ensure backward compatibility
+ }
filename.Resize(filename.Length() - sizeof(".root") + 1);
return kFALSE;
}
- filename = Form("Run%d_%d_v%d.root",
+ filename = Form("Run%d_%d_v%d",
id.GetFirstRun(),
id.GetLastRun(),
id.GetVersion());
+ if (id.GetSubVersion() != -11) filename += "_s0"; // TODO to ensure backward compatibility
+ filename += ".root";
+
filename.Prepend(fDBFolder + id.GetPath() + '/');
return kTRUE;
TString dirName(fDBFolder);
Bool_t dirExist=kFALSE;
-
+
// go to the path; if directory does not exist, create it
TObjArray *arrName=pathName.Tokenize("/");
for(int i=0;i<arrName->GetEntries();i++){
}
}
- delete res;
-
+ delete res;
+
id.SetVersion(lastVersion + 1);
+ id.SetSubVersion(0);
TString lastStorage = id.GetLastStorage();
if(lastStorage.Contains(TString("new"), TString::kIgnoreCase) && id.GetVersion() > 1 ){
id.GetVersion()-1));
}
- if(!lastRunRange.IsAnyRange() && !(lastRunRange.IsEqual(&id.GetAliCDBRunRange())))
+ if(!lastRunRange.IsAnyRange() && !(lastRunRange.IsEqual(&id.GetAliCDBRunRange())))
AliWarning(Form("Run range modified w.r.t. previous version (Run%d_%d_v%d)",
lastRunRange.GetFirstRun(), lastRunRange.GetLastRun(), id.GetVersion()));
-
+
return kTRUE;
}
MakeQueryFilter(selectedId.GetFirstRun(), selectedId.GetLastRun(), 0, filter);
TString pattern = Form("%s/Run*", selectedId.GetPath().Data());
- if(selectedId.GetVersion() >= 0) pattern += Form("_v%d",selectedId.GetVersion());
+ if(selectedId.GetVersion() >= 0) pattern += Form("_v%d*",selectedId.GetVersion());
pattern += ".root";
AliDebug(2,Form("pattern: %s", pattern.Data()));
}
//_____________________________________________________________________________
-AliCDBEntry* AliCDBGrid::GetEntryFromFile(TString& filename, const AliCDBId* dataId){
+AliCDBEntry* AliCDBGrid::GetEntryFromFile(TString& filename, AliCDBId* dataId){
// Get AliCBEntry object from file "filename"
AliDebug(2,Form("Opening file: %s",filename.Data()));
if(anEntry){
AliCDBId entryId = anEntry->GetId();
- if(!((entryId.GetAliCDBRunRange()).IsEqual(&(dataId->GetAliCDBRunRange()))) ||
- entryId.GetVersion() != dataId->GetVersion()){
- AliWarning(Form("Either RunRange or gridVersion in the object's metadata"));
- AliWarning(Form("do noth match with fileName numbers:"));
- AliWarning(Form("someone renamed file by hand!"));
+ Int_t tmpSubVersion = dataId->GetSubVersion();
+ dataId->SetSubVersion(entryId.GetSubVersion()); // otherwise filename and id may mismatch
+ if(!entryId.IsEqual(dataId)){
+ AliWarning(Form("Mismatch between file name and object's Id!"));
+ AliWarning(Form("File name: %s", dataId->ToString().Data()));
+ AliWarning(Form("Object's Id: %s", entryId.ToString().Data()));
}
+ dataId->SetSubVersion(tmpSubVersion);
}
anEntry->SetLastStorage("grid");
+ // Check whether entry contains a TTree. In case load the tree in memory!
+ LoadTreeFromFile(anEntry);
+
// close file, return retieved entry
file->Close(); delete file; file=0;
TDirectory* saveDir = gDirectory;
+ TString fullFilename = Form("/alien%s", filename.Data());
// specify SE to filename
- TString fullFilename = Form("/alien%s?se=%s", filename.Data(), fSE.Data());
+ if (fSE != "default") fullFilename += Form("?se=%s",fSE.Data());
// open file
- TFile *file = TFile::Open(fullFilename,"CREATE");
- if(!file || !file->IsWritable()){
- AliError(Form("Can't open file <%s>!", filename.Data()));
- if(file && !file->IsWritable()) file->Close(); delete file; file=0;
- return kFALSE;
- }
+ TFile *file = TFile::Open(fullFilename,"CREATE");
+ if(!file || !file->IsWritable()){
+ AliError(Form("Can't open file <%s>!", filename.Data()));
+ if(file && !file->IsWritable()) file->Close(); delete file; file=0;
+ return kFALSE;
+ }
file->cd();
+ //SetTreeToFile(entry, file);
+
entry->SetVersion(id.GetVersion());
// write object (key name: "AliCDBEntry")
- Bool_t result = (entry->Write("AliCDBEntry") != 0);
+ Bool_t result = (file->WriteTObject(entry, "AliCDBEntry") != 0);
if (!result) AliError(Form("Can't write entry to file <%s>!", filename.Data()));
if(result) {
AliInfo(Form("CDB object stored into file %s", filename.Data()));
- AliInfo(Form("using S.E. %s", fSE.Data()));
+ AliInfo(Form("using S.E.: %s", fSE.Data()));
if(!TagFileId(filename, &id)){
AliInfo(Form("CDB tagging failed. Deleting file %s!",filename.Data()));
MakeQueryFilter(fRun, fRun, fMetaDataFilter, filter);
TString pattern = Form("%s/Run*", fPathFilter.GetPath().Data());
- if(fVersion >= 0) pattern += Form("_v%d", fVersion);
+ if(fVersion >= 0) pattern += Form("_v%d*", fVersion);
pattern += ".root";
AliDebug(2,Form("pattern: %s", pattern.Data()));
TString gridUrl = "alien://";
TString user = "";
TString dbFolder = "DBGrid";
- TString se = "ALICE::CERN::se01";
+ TString se = "default";
TObjArray *arr = buffer.Tokenize('?');
TIter iter(arr);
git://git.uio.no / u / mrichter / AliRoot.git / blobdiff