X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=T0%2FMakeT0FullMisAlignment.C;h=1c7073fc38bf9fec34677614979162199732bf61;hb=ea78e01b1ea7faa1a61f7c415442aeab592cc215;hp=c356ef777e236822bf1c1ab95927d2ef35d99cf0;hpb=dfe9c69dbd55e818acd5733c6a20f4e5ce5332d2;p=u%2Fmrichter%2FAliRoot.git

diff --git a/T0/MakeT0FullMisAlignment.C b/T0/MakeT0FullMisAlignment.C
index c356ef777e2..1c7073fc38b 100644
--- a/T0/MakeT0FullMisAlignment.C
+++ b/T0/MakeT0FullMisAlignment.C
@@ -1,22 +1,13 @@
 void MakeT0FullMisAlignment(){
   // Create TClonesArray of full misalignment objects for T0
   //
-  TClonesArray *array = new TClonesArray("AliAlignObjAngles",30);
+  TClonesArray *array = new TClonesArray("AliAlignObjParams",4);
   TClonesArray &alobj = *array;
 
-  if(!AliGeomManager::GetGeometry()){
-    if(!(AliCDBManager::Instance())->IsDefaultStorageSet())
-      AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT");
-    AliCDBManager::Instance()->SetRun(0);
-    AliGeomManager::LoadGeometry();
-  }
-
-  AliAlignObjAngles a;
-
   Double_t dx, dy, dz, dpsi, dtheta, dphi;
-  TRandom *rnd   = new TRandom(4321);
-  Double_t sigmatr = 0.05; // sigma for shifts in cm
-  Double_t sigmarot = 0.3; // sigma for tilts in degrees
+  TRandom3 *rnd   = new TRandom3(4321);
+  Double_t sigmatr = 0.006; // sigma for shifts in cm
+  Double_t sigmarot = 0.001; // sigma for tilts in degrees
 
   TString symName, sn;
 
@@ -24,26 +15,19 @@ void MakeT0FullMisAlignment(){
   AliGeomManager::ELayerID iLayer = AliGeomManager::kInvalidLayer;
   UShort_t volid = AliGeomManager::LayerToVolUID(iLayer,iIndex);
 
-  Int_t j=0;
-  for (Int_t imod=0; imod<24; imod++){
-    if (imod < 12){
-      sn="T0/C/PMT";
-    }else{
-      sn="T0/A/PMT";
-    }
-    symName = sn;
-    symName += imod+1;
-    
+  for (Int_t imod=0; imod<2; imod++)
+  {
+    symName="/ALIC_1/0STR_1";
+    if(imod==1) symName="/ALIC_1/0STL_1";	
     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);
-    
-    new(alobj[j++]) AliAlignObjAngles(symName.Data(), volid, dx, dy, dz, dpsi, dtheta, dphi, kTRUE);
+    new(alobj[imod]) AliAlignObjParams(symName.Data(), volid, dx, dy, dz, dpsi, dtheta, dphi, kTRUE);
   }
-  
+    
   const char* macroname = "MakeT0FullMisAlignment.C";
   if( TString(gSystem->Getenv("TOCDB")) != TString("kTRUE") ){
     // save on file
@@ -56,7 +40,7 @@ void MakeT0FullMisAlignment(){
     Info(macroname,"Saving alignment objects to the file %s", filename);
     f.cd();
     f.WriteObject(array,"T0AlignObjs","kSingleKey");
-    f.Close();    TFile f(filename,"RECREATE");
+    f.Close();
   }else{
     // save in CDB storage
     TString Storage = gSystem->Getenv("STORAGE");
@@ -65,7 +49,7 @@ void MakeT0FullMisAlignment(){
       return;
     }
     Info(macroname,"Saving alignment objects in CDB storage %s",
-	 Storage.Data());
+         Storage.Data());
     AliCDBManager* cdb = AliCDBManager::Instance();
     AliCDBStorage* storage = cdb->GetStorage(Storage.Data());
     if(!storage){