memory leak fixed

[u/mrichter/AliRoot.git] / MUON / MakeMUONResMisAlignment.C

diff --git a/MUON/MakeMUONResMisAlignment.C b/MUON/MakeMUONResMisAlignment.C
index e631ce6f8c1dc7ad056899b8d1b48bebcbc6b91b..cc088f8be8e0436cc09764ec34a0863e6cbb6205 100644 (file)
--- a/MUON/MakeMUONResMisAlignment.C
+++ b/MUON/MakeMUONResMisAlignment.C
@@ -15,21 +15,27 @@
 
 // $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__)
 
 #include "AliMUONGeometryTransformer.h"
 #include "AliMUONGeometryMisAligner.h"
 
+#include "AliGeomManager.h"
 #include "AliCDBManager.h"
 #include "AliCDBStorage.h"
+#include "AliCDBEntry.h"
 #include "AliCDBId.h"
 
-#include <TGeoManager.h>
+#include <TSystem.h>
+#include <TError.h>
 #include <TClonesArray.h>
 #include <TString.h>
 #include <TFile.h>
@@ -39,45 +45,65 @@
 
 void MakeMUONResMisAlignment()
 {
-  // Check first if geometry is loaded,
-  // if not loaded try to load it from galice.root file
-  if ( ! gGeoManager && ! TGeoManager::Import("geometry.root") )  {
-    cerr << "Loading geometry failed." << endl;
-    return;
-  }  
+  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/OCDB");
+  cdb->SetRun(0);
+  
+  AliCDBStorage* storage = 0;
+  
+  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
+  }    
 
-  AliMUONGeometryTransformer transformer(true);
-  transformer.ReadGeometryData("volpath.dat", gGeoManager);
+  AliMUONGeometryTransformer transformer;
+  transformer.LoadGeometryData();
   
   AliMUONGeometryMisAligner misAligner(0.0, 0.004, 0.0, 0.003, 0.0, 0.0023);
   AliMUONGeometryTransformer* newTransform 
     = 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") ) {
-    cout << "Generating residual misalignment data in a file" << endl;
-  
-    // Create a File to store the alignment data
-    TFile f("MUONresidualMisalignment.root","RECREATE");
-    if( !f.IsOpen() ) {
-      cerr << "cannot open file for output" << endl;
+    // Save in file
+    const char* filename = "MUONresidualMisalignment.root";
+    TFile f(filename,"RECREATE");
+    if(!f.IsOpen()){
+      Error(macroname,"cannot open file for output\n");
+      return;
     }
-    
+    Info(macroname,"Saving alignment objects to the file %s", filename);
     f.cd();
-    f.WriteObject(array,"MUONAlignObjs ","kSingleKey");
+    f.WriteObject(array,"MUONAlignObjs","kSingleKey");
     f.Close();
-  }
-  else {
-    cout << "Generating residual misalignment data in CDB" << endl;
-    // save in CDB storage
-    const char* Storage = gSystem->Getenv("STORAGE");
-    AliCDBManager* cdbManager = AliCDBManager::Instance();
-    AliCDBStorage* storage = cdbManager->GetStorage(Storage);
+  } else {
+    // Save in CDB storage
     AliCDBMetaData* cdbData = new AliCDBMetaData();
     cdbData->SetResponsible("Dimuon Offline project");
     cdbData->SetComment("MUON alignment objects with residual misalignment");
     cdbData->SetAliRootVersion(gSystem->Getenv("ARVERSION"));
-    AliCDBId id("MUON/Align/Data", 0, 9999999); 
+    AliCDBId id("MUON/Align/Data", 0, AliCDBRunRange::Infinity()); 
     storage->Put(const_cast<TClonesArray*>(array), id, cdbData);
   }
   delete newTransform;