X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=TPC%2FMakeTPCFullMisAlignment.C;h=6d01a793353ffcb36eca61e3242d0c628ff6b961;hb=e0617052e91d52576d13bf16372fc8c9bd51b532;hp=f0b423b6aa1e96fca7c4357bc49482655d3d4190;hpb=1895a097f0a10aa676c803ff663b1c31836edddf;p=u%2Fmrichter%2FAliRoot.git

diff --git a/TPC/MakeTPCFullMisAlignment.C b/TPC/MakeTPCFullMisAlignment.C
index f0b423b6aa1..6d01a793353 100644
--- a/TPC/MakeTPCFullMisAlignment.C
+++ b/TPC/MakeTPCFullMisAlignment.C
@@ -1,55 +1,83 @@
 void MakeTPCFullMisAlignment(){
   // Create TClonesArray of full misalignment objects for TPC
   //
-  if(!gGeoManager) TGeoManager::Import("geometry.root");
-  // needed for the constructors with local coordinates not to fail
-
-  TClonesArray *array = new TClonesArray("AliAlignObjAngles",100);
+  const char* macroname = "MakeTPCFullMisAlignment.C";
+  // 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
+  }    
+		  
+  TClonesArray *array = new TClonesArray("AliAlignObjParams",100);
   TClonesArray &alobj = *array;
   
   TRandom *rnd   = new TRandom(4357);
-  AliAlignObjAngles o;
   Int_t j = 0;
+  Double_t dx, dy, dz, dpsi, dtheta, dphi;
+
   // RS = local
-  // sigma translation = 1mm
-  // sigma rotation = 1mrad
+  // sigma translation = 0.1 mm
+  // sigma rotation = 0.1 mrad
   Float_t sigmatr=0.01;
-  Float_t sigmarot = 0.06;
-  for (Int_t iLayer = AliAlignObj::kTPC1; iLayer <= AliAlignObj::kTPC2; iLayer++) {
-    for (Int_t iModule = 0; iModule < AliAlignObj::LayerSize(iLayer); iModule++) {
-
-      Float_t dx = (rnd->Uniform()-0.5)*sigmatr;
-      Float_t dy = (rnd->Uniform()-0.5)*sigmatr;
-      Float_t dz = (rnd->Uniform()-0.5)*sigmatr;
-      Float_t dpsi = (rnd->Uniform()-0.5)*sigmarot;
-      Float_t dtheta = (rnd->Uniform()-0.5)*sigmarot;
-      Float_t dphi = (rnd->Uniform()-0.5)*sigmarot;
-
-      UShort_t volid = AliAlignObj::LayerToVolUID(iLayer,iModule);
-      const char *path = AliAlignObj::SymName(volid);
-      new(alobj[j]) AliAlignObjAngles(path, volid, dx, dy, dz, dpsi, dtheta, dphi, kFALSE);
-      j++;
+  Float_t sigmarot = 0.006;
+
+  for (Int_t iLayer = AliGeomManager::kTPC1; iLayer <= AliGeomManager::kTPC2; iLayer++) {
+    for (Int_t iModule = 0; iModule < AliGeomManager::LayerSize(iLayer); iModule++) {
+
+      dx = rnd->Gaus(0,sigmatr);
+      dy = rnd->Gaus(0,sigmatr);
+      dz = rnd->Gaus(0,sigmatr);
+      dpsi = rnd->Gaus(0,sigmarot);
+      dtheta = rnd->Gaus(0,sigmarot);
+      dphi = rnd->Gaus(0,sigmarot);
+
+      UShort_t volid = AliGeomManager::LayerToVolUID(iLayer,iModule);
+      const char *symname = AliGeomManager::SymName(volid);
+      new(alobj[j++]) AliAlignObjParams(symname, volid, dx, dy, dz, dpsi, dtheta, dphi, kFALSE);
     }
   }
 
-
-  if(!gSystem->Getenv("$TOCDB")){
+  if( TString(gSystem->Getenv("TOCDB")) != TString("kTRUE") ){
     // save on file
-    TFile f("TPCfullMisalignment.root","RECREATE");
-    if(!f) cerr<<"cannot open file for output\n";
+    const char* filename = "TPCfullMisalignment.root";
+    TFile f(filename,"RECREATE");
+    if(!f){
+      Error(macroname,"cannot open file for output\n");
+      return;
+    }
+    Info(macroname,"Saving alignment objects to the file %s", filename);
     f.cd();
     f.WriteObject(array,"TPCAlignObjs","kSingleKey");
     f.Close();
   }else{
     // save in CDB storage
-    const char* Storage = gSystem->Getenv("$STORAGE");
-    AliCDBManager* cdb = AliCDBManager::Instance();
-    AliCDBStorage* storage = cdb->GetStorage(Storage);
     AliCDBMetaData* md = new AliCDBMetaData();
     md->SetResponsible("Marian Ivanov");
     md->SetComment("Full misalignment for TPC, sigmatr=0.01 and sigmarot=0.6 in the local RS");
-    md->SetAliRootVersion(gSystem->Getenv("$ARVERSION"));
-    AliCDBId id("TPC/Align/Data",0,9999999);
+    md->SetAliRootVersion(gSystem->Getenv("ARVERSION"));
+    AliCDBId id("TPC/Align/Data",0,AliCDBRunRange::Infinity());
     storage->Put(array,id,md);
   }