}
else {
if(gAlice){
- delete gAlice->GetRunLoader();
+ delete AliRunLoader::Instance();
delete gAlice;
gAlice=0;
}
AliCDBManager* man = AliCDBManager::Instance();
if (!man->IsDefaultStorageSet()) {
printf("Setting a local default storage and run number 0\n");
- man->SetDefaultStorage("local://$ALICE_ROOT");
+ man->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
man->SetRun(0);
}
else {
if(!gGeoManager){
AliGeomManager::LoadGeometry("geometry.root");
}
+
if(align) {
TFile f(alignfile.Data());
TClonesArray* ar = (TClonesArray*)f.Get("ITSAlignObjs");
AliGeomManager::ApplyAlignObjsToGeom(*ar);
f.Close();
+ } else {
+ AliGeomManager::ApplyAlignObjsFromCDB("ITS");
}
AliRunLoader* rl = AliRunLoader::Open("galice.root");
}
else {
if(gAlice){
- delete gAlice->GetRunLoader();
+ delete AliRunLoader::Instance();
delete gAlice;
gAlice=0;
}
AliCDBManager* man = AliCDBManager::Instance();
if (!man->IsDefaultStorageSet()) {
printf("Setting a local default storage and run number 0\n");
- man->SetDefaultStorage("local://$ALICE_ROOT");
+ man->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
man->SetRun(0);
}
else {
TClonesArray* ar = (TClonesArray*)f.Get("ITSAlignObjs");
AliGeomManager::ApplyAlignObjsToGeom(*ar);
f.Close();
+ } else {
+ AliGeomManager::ApplyAlignObjsFromCDB("ITS");
}
+
AliRunLoader* rl = AliRunLoader::Open("galice.root");
if (rl == 0x0){
cerr<<"Can not open session RL=NULL"<< endl;