- New parameters to fill ESD MUON clusters with additional informations (including...

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

diff --git a/MUON/MUONGenerateGeometryData.C b/MUON/MUONGenerateGeometryData.C
index e36cbf680009bd05c69ed633b926b03755a10b49..5a0b1ebc60d924bfb3aecc463065a8a2a64b177a 100644 (file)
--- a/MUON/MUONGenerateGeometryData.C
+++ b/MUON/MUONGenerateGeometryData.C
@@ -16,7 +16,7 @@
 // $Id$
 //
 // Macro for generating the geometry data files:
-// (volpaths.dat, transform.dat, svmap.dat).
+// volpath.dat, transform.dat, svmap.dat.
 // To be run from aliroot:
 // .x MUONGenerateGeometryData.C
 //
@@ -25,9 +25,21 @@
 //
 //  Author: I. Hrivnacova, IPN Orsay
 
-void MUONGenerateGeometryData(Bool_t volpaths = true,
-                              Bool_t transforms = true, 
-                              Bool_t svmaps = true)
+#if !defined(__CINT__) || defined(__MAKECINT__)
+
+#include "AliMUON.h"
+#include "AliMUONGeometryBuilder.h"
+#include "AliMUONGeometryTransformer.h"
+
+#include "AliRun.h"
+
+#include <Riostream.h>
+
+#endif
+
+void MUONGenerateGeometryData(Bool_t transforms = true, 
+                              Bool_t svmaps = true,
+                              Bool_t writeEnvelopes = true)
 {
   // Initialize
   gAlice->Init("$ALICE_ROOT/MUON/Config.C");
@@ -36,17 +48,12 @@ void MUONGenerateGeometryData(Bool_t volpaths = true,
   // Get MUON detector
   AliMUON* muon = (AliMUON*)gAlice->GetModule("MUON");
   if (!muon) {
-    AliFatal("MUON detector not defined.");
-    return 0;
+    cerr << "MUON detector not defined." << endl;
+    return;
   }  
 
   // 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;
@@ -55,6 +62,6 @@ void MUONGenerateGeometryData(Bool_t volpaths = true,
 
   if (svmaps) {
     cout << "Generating svmaps file ..." << endl;
-    builder->WriteSVMaps();
+    builder->WriteSVMaps("svmap.dat.out", true, writeEnvelopes);
   }  
 }