fCDBUri = "";
}
else {
- AliWarning("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
- AliWarning(Form("Default CDB storage is set to: %s",fCDBUri.Data()));
- AliWarning("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
+ AliDebug(2,"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
+ AliDebug(2, Form("Default CDB storage is set to: %s",fCDBUri.Data()));
+ AliDebug(2, "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
man->SetDefaultStorage(fCDBUri);
}
for (Int_t i = 0; i < fSpecCDBUri.GetEntriesFast(); i++) {
TObject* obj = fSpecCDBUri[i];
if (!obj) continue;
- AliWarning("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
- AliWarning(Form("Specific CDB storage for %s is set to: %s",obj->GetName(),obj->GetTitle()));
- AliWarning("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
- man->SetSpecificStorage(obj->GetName(),obj->GetTitle());
+ AliDebug(2, "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
+ AliDebug(2, Form("Specific CDB storage for %s is set to: %s",obj->GetName(),obj->GetTitle()));
+ AliDebug(2, "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
+ man->SetSpecificStorage(obj->GetName(), obj->GetTitle());
}
man->Print();
}
}
//_____________________________________________________________________________
-void AliSimulation::SetSpecificStorage(const char* detName, const char* uri) {
+void AliSimulation::SetSpecificStorage(const char* calibType, const char* uri) {
// Store a detector-specific CDB storage location
// Activate it later within the Run() method
- TObject* obj = fSpecCDBUri.FindObject(detName);
+ AliCDBPath aPath(calibType);
+ if(!aPath.IsValid()){
+ AliError(Form("Not a valid path: %s", calibType));
+ return;
+ }
+
+ TObject* obj = fSpecCDBUri.FindObject(calibType);
if (obj) fSpecCDBUri.Remove(obj);
- fSpecCDBUri.Add(new TNamed(detName, uri));
+ fSpecCDBUri.Add(new TNamed(calibType, uri));
}
}
if (AliDebugLevelClass() >= 1) {
- gGeoManager->GetTopNode()->CheckOverlaps(20);
+ gGeoManager->GetTopNode()->CheckOverlaps(1);
TObjArray* ovexlist = gGeoManager->GetListOfOverlaps();
if(ovexlist->GetEntriesFast()){
AliError("The application of alignment objects to the geometry caused huge overlaps/extrusions!");
if ((detStr.CompareTo("ALL") == 0)) detStr = "";
dataNotLoaded += detStr;
- AliInfo(Form("Alignment data loaded for: %s",
+ if(!dataLoaded.IsNull()) AliInfo(Form("Alignment data loaded for: %s",
dataLoaded.Data()));
- AliInfo(Form("Didn't/couldn't load alignment data for: %s",
+ if(!dataNotLoaded.IsNull()) AliInfo(Form("Didn't/couldn't load alignment data for: %s",
dataNotLoaded.Data()));
} // fLoadAlignFromCDB flag
}
}
+
+ // Update the internal geometry of modules (ITS needs it)
+ TString detStr = fLoadAlignData;
+ TObjArray* detArray = runLoader->GetAliRun()->Detectors();
+ for (Int_t iDet = 0; iDet < detArray->GetEntriesFast(); iDet++) {
+
+ AliModule* det = (AliModule*) detArray->At(iDet);
+ if (!det || !det->IsActive()) continue;
+ if (IsSelected(det->GetName(), detStr)) {
+ det->UpdateInternalGeometry();
+ }
+ } // end loop over detectors
+
+
if (delRunLoader) delete runLoader;
+ // Update the TGeoPhysicalNodes
+ gGeoManager->RefreshPhysicalNodes();
+
return kTRUE;
}
}
}
- runLoader->MakeTree( "CT" );
+ runLoader->MakeTree( "GG" );
AliCentralTrigger* aCTP = runLoader->GetTrigger();
// Load Descriptors
aCTP->LoadDescriptor( des );
// }
MisalignGeometry(runLoader);
- // Temporary fix by A.Gheata
- // Could be removed with the next Root version (>5.11)
- if (gGeoManager) {
- TIter next(gGeoManager->GetListOfVolumes());
- TGeoVolume *vol;
- while ((vol = (TGeoVolume *)next())) {
- if (vol->GetVoxels()) {
- if (vol->GetVoxels()->NeedRebuild()) {
- vol->GetVoxels()->Voxelize();
- vol->FindOverlaps();
- }
- }
- }
- }
-
// Export (mis)aligned geometry
if (gGeoManager) gGeoManager->Export("misaligned_geometry.root");
AliInfo(Form("converting raw data DDL files to DATE file %s", dateFileName));
char command[256];
- sprintf(command, "dateStream -D -o %s -# %d -C",
+ // Note the option -s. It is used in order to avoid
+ // the generation of SOR/EOR events.
+ sprintf(command, "dateStream -s -D -o %s -# %d -C",
dateFileName, runLoader->GetNumberOfEvents());
FILE* pipe = gSystem->OpenPipe(command, "w");
// convert a DATE file to a root file with the program "alimdc"
// ALIMDC setup
- const Int_t kDBSize = 1000000000;
+ const Int_t kDBSize = 2000000000;
const Int_t kTagDBSize = 1000000000;
const Bool_t kFilter = kFALSE;
- const Int_t kCompression = 1;
+ const Int_t kCompression = 0;
char* path = gSystem->Which(gSystem->Getenv("PATH"), "alimdc");
if (!path) {
const char* rawDBFS[2] = { "/tmp/mdc1", "/tmp/mdc2" };
const char* tagDBFS = "/tmp/mdc1/tags";
- const char* runDBFS = "/tmp/mdc1/meta";
// User defined file system locations
if (gSystem->Getenv("ALIMDC_RAWDB1"))
rawDBFS[1] = gSystem->Getenv("ALIMDC_RAWDB2");
if (gSystem->Getenv("ALIMDC_TAGDB"))
tagDBFS = gSystem->Getenv("ALIMDC_TAGDB");
- if (gSystem->Getenv("ALIMDC_RUNDB"))
- runDBFS = gSystem->Getenv("ALIMDC_RUNDB");
gSystem->Exec(Form("rm -rf %s",rawDBFS[0]));
gSystem->Exec(Form("rm -rf %s",rawDBFS[1]));
gSystem->Exec(Form("rm -rf %s",tagDBFS));
- gSystem->Exec(Form("rm -rf %s",runDBFS));
gSystem->Exec(Form("mkdir %s",rawDBFS[0]));
gSystem->Exec(Form("mkdir %s",rawDBFS[1]));
gSystem->Exec(Form("mkdir %s",tagDBFS));
- gSystem->Exec(Form("mkdir %s",runDBFS));
Int_t result = gSystem->Exec(Form("alimdc %d %d %d %d %s",
kDBSize, kTagDBSize, kFilter, kCompression, dateFileName));
gSystem->Exec(Form("rm -rf %s",rawDBFS[0]));
gSystem->Exec(Form("rm -rf %s",rawDBFS[1]));
gSystem->Exec(Form("rm -rf %s",tagDBFS));
- gSystem->Exec(Form("rm -rf %s",runDBFS));
return (result == 0);
}