X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;ds=inline;f=MUON%2FMakeMUONResMisAlignment.C;h=cc088f8be8e0436cc09764ec34a0863e6cbb6205;hb=5c2b3da2f932be94ed05bbd26874287b30bad355;hp=9ecdf62666857bf3c5597a6fa13536fe2f7d8e84;hpb=6fce62af1975e067a08b96e421e6fec691ab4712;p=u%2Fmrichter%2FAliRoot.git

diff --git a/MUON/MakeMUONResMisAlignment.C b/MUON/MakeMUONResMisAlignment.C
index 9ecdf626668..cc088f8be8e 100644
--- a/MUON/MakeMUONResMisAlignment.C
+++ b/MUON/MakeMUONResMisAlignment.C
@@ -15,10 +15,13 @@
 
 // $Id$
 
-// Macro for generating the residual misalignment data.
-// The macro is triggered from AliRoot/macros/MakeAllDETsResMisAlignment.C
-//
-//  Author: I. Hrivnacova, IPN Orsay
+/// \ingroup macros
+/// \file MakeMUONResMisAlignment.C
+/// \brief Macro for generating the residual misalignment data.
+///
+/// The macro is triggered from AliRoot/macros/MakeAllDETsResMisAlignment.C
+///
+/// \author: I. Hrivnacova, IPN Orsay
 
 #if !defined(__CINT__) || defined(__MAKECINT__)
 
@@ -28,9 +31,11 @@
 #include "AliGeomManager.h"
 #include "AliCDBManager.h"
 #include "AliCDBStorage.h"
+#include "AliCDBEntry.h"
 #include "AliCDBId.h"
 
 #include <TSystem.h>
+#include <TError.h>
 #include <TClonesArray.h>
 #include <TString.h>
 #include <TFile.h>
@@ -43,12 +48,12 @@ void MakeMUONResMisAlignment()
   const char* macroname = "MakeMUONResMisAlignment.C";
   // Activate CDB storage and load geometry from CDB
   AliCDBManager* cdb = AliCDBManager::Instance();
-  if(!cdb->IsDefaultStorageSet()) cdb->SetDefaultStorage("local://$ALICE_ROOT");
+  if(!cdb->IsDefaultStorageSet()) cdb->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   cdb->SetRun(0);
   
-  AliCDBStorage* storage;
+  AliCDBStorage* storage = 0;
   
-  if( gSystem->Getenv("TOCDB") == TString("kTRUE") ){
+  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());
@@ -77,11 +82,14 @@ void MakeMUONResMisAlignment()
     = misAligner.MisAlign(&transformer, true);
   const TClonesArray* array = newTransform->GetMisAlignmentData();
 
+  // 100 mum residual resolution for chamber misalignments?
+  misAligner.SetAlignmentResolution(array,-1,0.01,0.01);
+
   if ( TString(gSystem->Getenv("TOCDB")) != TString("kTRUE") ) {
     // Save in file
     const char* filename = "MUONresidualMisalignment.root";
     TFile f(filename,"RECREATE");
-    if(!f){
+    if(!f.IsOpen()){
       Error(macroname,"cannot open file for output\n");
       return;
     }