Adding more bins in QA (Alis)

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

diff --git a/MUON/MUONGenerateGeometryData.C b/MUON/MUONGenerateGeometryData.C
index a45698bebdc8b4e4db2b15ccc9b3d3b45fdc4845..c6e6d20c3f6c421daee478c51184c5f58c4c0a9c 100644 (file)
--- a/MUON/MUONGenerateGeometryData.C
+++ b/MUON/MUONGenerateGeometryData.C
@@ -15,15 +15,19 @@
 
 // $Id$
 //
-// Macro for generating the geometry data files:
-// volpath.dat, transform.dat, svmap.dat.
-// To be run from aliroot:
-// .x MUONGenerateGeometryData.C
-//
-// The generated files do not replace the existing ones
-// but have different names (with extension ".out").
-//
-//  Author: I. Hrivnacova, IPN Orsay
+/// \ingroup macros
+/// \file MUONGenerateGeometryData.C
+/// \brief Macro for generating the geometry data files:
+///  transform.dat, svmap.dat.
+///
+/// To be run from aliroot:
+///
+/// .x MUONGenerateGeometryData.C
+///
+/// The generated files do not replace the existing ones
+/// but have different names (with extension ".out").
+///
+/// \author: I. Hrivnacova, IPN Orsay
 
 #if !defined(__CINT__) || defined(__MAKECINT__)
 
@@ -32,18 +36,34 @@
 #include "AliMUONGeometryTransformer.h"
 
 #include "AliRun.h"
+#include "AliCDBManager.h"
+#include "AliMC.h"
 
 #include <Riostream.h>
+#include <TROOT.h>
+#include <TInterpreter.h>
 
 #endif
 
-void MUONGenerateGeometryData(Bool_t volpaths = true,
-                              Bool_t transforms = true, 
+void MUONGenerateGeometryData(Bool_t transforms = true, 
                               Bool_t svmaps = true,
                               Bool_t writeEnvelopes = true)
 {
+/// \param transforms      option to generete transform.dat
+/// \param svmaps          option to generete svmap.dat
+/// \param writeEnvelope   option to include virtual envelopes
+///                        in the volume paths
+
+  // Default CDB and run number
+  AliCDBManager* man = AliCDBManager::Instance();
+  man->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
+  man->SetRun(0);
+
   // Initialize
-  gAlice->Init("$ALICE_ROOT/MUON/Config.C");
+  TString configFileName = "$ALICE_ROOT/MUON/Config.C";
+  gROOT->LoadMacro(configFileName.Data());
+  gInterpreter->ProcessLine(gAlice->GetConfigFunction());
+  gAlice->GetMCApp()->Init();
   cout << "Init done " << endl;
 
   // Get MUON detector
@@ -55,11 +75,6 @@ void MUONGenerateGeometryData(Bool_t volpaths = true,
 
   // Get geometry builder
   AliMUONGeometryBuilder* builder = muon ->GetGeometryBuilder();
-  
-  if (volpaths) {
-    cout << "Generating volpath file ..." << endl;
-    builder->GetTransformer()->WriteVolumePaths("volpath.dat.out");
-  }  
 
   if (transforms) {
     cout << "Generating transformation file ..." << endl;