-void MakeEMCALResMisAlignment(){
+void MakeEMCALResMisAlignment(TString geoname = "EMCAL_COMPLETE12SMV1"){
// Create TClonesArray of residual misalignment objects for EMCAL
//
- TClonesArray *array = new TClonesArray("AliAlignObjAngles",10);
+ const char* macroname = "MakeEMCALResMisAlignment.C";
+ if(geoname=="")geoname=AliEMCALGeometry::GetDefaultGeometryName();
+ const AliEMCALGeometry *emcalGeom = AliEMCALGeometry::GetInstance(geoname,"");
+ if(!emcalGeom) {
+ Error("MakeEMCALResMisAlignment","Cannot obtain AliEMCALGeometry singleton\n");
+ return;
+ }
+
+ TClonesArray *array = new TClonesArray("AliAlignObjParams",emcalGeom->GetNumberOfSuperModules());
TClonesArray &alobj = *array;
- if(!AliGeomManager::GetGeometry()){
- if(!(AliCDBManager::Instance())->IsDefaultStorageSet())
- AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT");
- AliCDBManager::Instance()->SetRun(0);
- AliGeomManager::LoadGeometry();
- }
- AliAlignObjAngles a;
+
+ // Activate CDB storage and load geometry from CDB
+ AliCDBManager* cdb = AliCDBManager::Instance();
+ if(!cdb->IsDefaultStorageSet()) cdb->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
+ cdb->SetRun(0);
+
+ AliCDBStorage* storage;
+
+ if( TString(gSystem->Getenv("TOCDB")) == TString("kTRUE") ){
+ TString Storage = gSystem->Getenv("STORAGE");
+ if(!Storage.BeginsWith("local://") && !Storage.BeginsWith("alien://")) {
+ Error(macroname,"STORAGE variable set to %s is not valid. Exiting\n",Storage.Data());
+ return;
+ }
+ storage = cdb->GetStorage(Storage.Data());
+ if(!storage){
+ Error(macroname,"Unable to open storage %s\n",Storage.Data());
+ return;
+ }
+ AliCDBPath path("GRP","Geometry","Data");
+ AliCDBEntry *entry = storage->Get(path.GetPath(),cdb->GetRun());
+ if(!entry) Fatal(macroname,"Could not get the specified CDB entry!");
+ entry->SetOwner(0);
+ TGeoManager* geom = (TGeoManager*) entry->GetObject();
+ AliGeomManager::SetGeometry(geom);
+ }else{
+ AliGeomManager::LoadGeometry(); //load geom from default CDB storage
+ }
Double_t dx, dy, dz, dpsi, dtheta, dphi;
// sigma translation = 1mm
// sigma rotation = 0.1 degree
TRandom *rnd = new TRandom(4321);
- Double_t sigmatr = 0.1; // max shift in cm w.r.t. local RS
+ Double_t sigmatr = 0.05; // max shift in cm w.r.t. local RS
Double_t sigmarot = 0.1; // max rot in degrees w.r.t. local RS
for(i=0; i<10; i++){
dphi = rnd->Gaus(0.,sigmarot);
pathstr=basepath;
pathstr+=(i+1);
- new(alobj[j++]) AliAlignObjAngles(pathstr, volid, dx, dy, dz, dpsi, dtheta, dphi, kFALSE);
+ new(alobj[j++]) AliAlignObjParams(pathstr, volid, dx, dy, dz, dpsi, dtheta, dphi, kFALSE);
}
for(i=0; i<2; i++){
dphi = rnd->Gaus(0.,sigmarot);
pathstr=hbasepath;
pathstr+=(i+1);
- new(alobj[j++]) AliAlignObjAngles(pathstr, volid, dx, dy, dz, dpsi, dtheta, dphi, kTRUE);
+ new(alobj[j++]) AliAlignObjParams(pathstr, volid, dx, dy, dz, dpsi, dtheta, dphi, kTRUE);
}
- const char* macroname = "MakeEMCALResMisAlignment.C";
- if( gSystem->Getenv("TOCDB") != TString("kTRUE") ){
+ if( TString(gSystem->Getenv("TOCDB")) != TString("kTRUE") ){
// save on file
const char* filename = "EMCALresidualMisalignment.root";
TFile f(filename,"RECREATE");
f.Close();
}else{
// save in CDB storage
- TString Storage = gSystem->Getenv("STORAGE");
- if(!Storage.BeginsWith("local://") && !Storage.BeginsWith("alien://")) {
- Error(macroname,"STORAGE variable set to %s is not valid. Exiting\n",Storage.Data());
- return;
- }
- Info(macroname,"Saving alignment objects in CDB storage %s",
- Storage.Data());
- AliCDBManager* cdb = AliCDBManager::Instance();
- AliCDBStorage* storage = cdb->GetStorage(Storage.Data());
- if(!storage){
- Error(macroname,"Unable to open storage %s\n",Storage.Data());
- return;
- }
AliCDBMetaData* md = new AliCDBMetaData();
- md->SetResponsible("Jennifer Clay");
- md->SetComment("Residual misalignment for EMCAL, produced with sigmatr=0.05 and sigmarot=0.3 in the local RS");
+ md->SetResponsible("Jennifer Klay");
+ md->SetComment("Residual misalignment for EMCAL, produced with sigmatr=0.05 and sigmarot=0.1 in the local RS");
md->SetAliRootVersion(gSystem->Getenv("ARVERSION"));
AliCDBId id("EMCAL/Align/Data",0,AliCDBRunRange::Infinity());
storage->Put(array,id,md);