- Start from existing geometry (gGeoManager or geometry.root file)

- Removed generating MUON specific geometry data (as this is done
  in MUONGenerateGeometryData.C macro)
- Added copyrigt, CVS Id

diff --git a/MUON/MakeMUONFullMisAlignment.C b/MUON/MakeMUONFullMisAlignment.C
index 2d599c983beb18212ab9f21588f9f75e4f890727..dca2a9808b44de80a484b56c327d4bc9f30efd24 100644 (file)
--- a/MUON/MakeMUONFullMisAlignment.C
+++ b/MUON/MakeMUONFullMisAlignment.C
@@ -1,53 +1,45 @@
-void MakeMUONFullMisAlignment(Bool_t volpaths = true,
-                              Bool_t transforms = true, 
-                              Bool_t svmaps = true)
-// Macro for generating the geometry data files:
-// (volpath.dat, transform.dat, svmap.dat)
-// and local CDB storage with full misalignment
-//
-// The generated files do not replace the existing ones
-// but have different names (with extension ".out").
-//
-//  Author: I. Hrivnacova, IPN Orsay
-//
-{
-  // Initialize
-  gAlice->Init("$ALICE_ROOT/MUON/Config.C");
-  cout << "Init done " << endl;
+/**************************************************************************
+ * Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
+ *                                                                        *
+ * Author: The ALICE Off-line Project.                                    *
+ * Contributors are mentioned in the code where appropriate.              *
+ *                                                                        *
+ * Permission to use, copy, modify and distribute this software and its   *
+ * documentation strictly for non-commercial purposes is hereby granted   *
+ * without fee, provided that the above copyright notice appears in all   *
+ * copies and that both the copyright notice and this permission notice   *
+ * appear in the supporting documentation. The authors make no claims     *
+ * about the suitability of this software for any purpose. It is          *
+ * provided "as is" without express or implied warranty.                  *
+ **************************************************************************/
 
-  // Get MUON detector
-  AliMUON* muon = (AliMUON*)gAlice->GetModule("MUON");
-  if (!muon) {
-    AliFatal("MUON detector not defined.");
-    return 0;
-  }  
+// $Id$
 
-  // Get geometry builder
-  AliMUONGeometryBuilder* builder = muon ->GetGeometryBuilder();
-  
-  if (volpaths) {
-    cout << "Generating volpath file ..." << endl;
-    builder->GetTransformer()->WriteVolumePaths("volpath.dat.out");
-  }  
+// Macro for generating the full misalignment data.
+// The macro is trigger from AliRoot/macros/MakeAllDETsFullMisAlignment.C
+//
+// Author: I. Hrivnacova, IPN Orsay
 
-  if (transforms) {
-    cout << "Generating transformation file ..." << endl;
-    builder->GetTransformer()->WriteTransformations("transform.dat.out");
-  }  
-  
-  if (svmaps) {
-    cout << "Generating svmaps file ..." << endl;
-    builder->WriteSVMaps();
+void MakeMUONFullMisAlignment()
+{
+  // 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;
   }  
-  
-  cout << "Generating full misalignment data in  MUON/FullMisAlignCDB/Data..." << endl;
+
+  AliMUONGeometryTransformer transformer(true);
+  transformer.ReadGeometryData("volpath.dat", gGeoManager);
   
   AliMUONGeometryMisAligner misAligner(0.0, 0.03, 0.0, 0.03, 0.0, 0.03);
   AliMUONGeometryTransformer* newTransform 
-    = misAligner.MisAlign(builder->GetTransformer(), true);
+    = misAligner.MisAlign(&transformer, true);
   TClonesArray* array = newTransform->GetMisAlignmentData();
   
-  if( gSystem->Getenv("TOCDB") != TString("kTRUE") ){
+  if( TString(gSystem->Getenv("TOCDB")) != TString("kTRUE") ) {
+    cout << "Generating full misalignment data in a file" << endl;
+
     // Create a File to store the alignment data
     TFile f("MUONfullMisalignment.root","RECREATE");
     if(!f) {cerr<<"cannot open file for output\n";}
@@ -56,7 +48,10 @@ void MakeMUONFullMisAlignment(Bool_t volpaths = true,
     f.WriteObject(array,"MUONAlignObjs ","kSingleKey");
     f.Close();
     array->Delete();
-  }else{
+  }
+  else {
+    cout << "Generating full misalignment data in CDB" << endl;
+
     // save in CDB storage
     const char* Storage = gSystem->Getenv("STORAGE");
     

diff --git a/MUON/MakeMUONResMisAlignment.C b/MUON/MakeMUONResMisAlignment.C
index 595b7901fbbce332c41215fff458096c69c8b74d..363f4e9649f0609cfeaee32fecddd8260e9383d9 100644 (file)
--- a/MUON/MakeMUONResMisAlignment.C
+++ b/MUON/MakeMUONResMisAlignment.C
@@ -1,53 +1,45 @@
-void MakeMUONResMisAlignment(Bool_t volpaths = true,
-                             Bool_t transforms = true, 
-                             Bool_t svmaps = true)
-// Macro for generating the geometry data files:
-// (volpath.dat, transform.dat, svmap.dat)
-// and local CDB storage with zero, residual and full misalignment
-//
-// The generated files do not replace the existing ones
-// but have different names (with extension ".out").
-//
-//  Author: I. Hrivnacova, IPN Orsay
-//
-{
-  // Initialize
-  gAlice->Init("$ALICE_ROOT/MUON/Config.C");
-  cout << "Init done " << endl;
-
-  // Get MUON detector
-  AliMUON* muon = (AliMUON*)gAlice->GetModule("MUON");
-  if (!muon) {
-    AliFatal("MUON detector not defined.");
-    return 0;
-  }  
+/**************************************************************************
+ * Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
+ *                                                                        *
+ * Author: The ALICE Off-line Project.                                    *
+ * Contributors are mentioned in the code where appropriate.              *
+ *                                                                        *
+ * Permission to use, copy, modify and distribute this software and its   *
+ * documentation strictly for non-commercial purposes is hereby granted   *
+ * without fee, provided that the above copyright notice appears in all   *
+ * copies and that both the copyright notice and this permission notice   *
+ * appear in the supporting documentation. The authors make no claims     *
+ * about the suitability of this software for any purpose. It is          *
+ * provided "as is" without express or implied warranty.                  *
+ **************************************************************************/
 
-  // Get geometry builder
-  AliMUONGeometryBuilder* builder = muon ->GetGeometryBuilder();
-  
-  if (volpaths) {
-    cout << "Generating volpath file ..." << endl;
-    builder->GetTransformer()->WriteVolumePaths("volpath.dat.out");
-  }  
+// $Id$
 
-  if (transforms) {
-    cout << "Generating transformation file ..." << endl;
-    builder->GetTransformer()->WriteTransformations("transform.dat.out");
-  }  
+// Macro for generating the residual misalignment data.
+// The macro is triggered from AliRoot/macros/MakeAllDETsResMisAlignment.C
+//
+//  Author: I. Hrivnacova, IPN Orsay
 
-  if (svmaps) {
-    cout << "Generating svmaps file ..." << endl;
-    builder->WriteSVMaps();
+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;
   }  
 
-  cout << "Generating residual misalignment data in  MUON/ResMisAlignCDB/Data..." << endl;
+  AliMUONGeometryTransformer transformer(true);
+  transformer.ReadGeometryData("volpath.dat", gGeoManager);
   
   AliMUONGeometryMisAligner misAligner(0.0, 0.004, 0.0, 0.003, 0.0, 0.0023);
   AliMUONGeometryTransformer* newTransform 
-    = misAligner.MisAlign(builder->GetTransformer(), true);
+    = misAligner.MisAlign(&transformer, true);
   TClonesArray* array = newTransform->GetMisAlignmentData();
 
-  if( gSystem->Getenv("TOCDB") != TString("kTRUE") ){
+  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) {cerr<<"cannot open file for output\n";}
@@ -55,7 +47,9 @@ void MakeMUONResMisAlignment(Bool_t volpaths = true,
     f.cd();
     f.WriteObject(array,"MUONAlignObjs ","kSingleKey");
     f.Close();
-  }else{
+  }
+  else {
+    cout << "Generating residual misalignment data in CDB" << endl;
     // save in CDB storage
     const char* Storage = gSystem->Getenv("STORAGE");
     AliCDBManager* cdbManager = AliCDBManager::Instance();
@@ -67,7 +61,6 @@ void MakeMUONResMisAlignment(Bool_t volpaths = true,
     AliCDBId id("MUON/Align/Data", 0, 9999999); 
     storage->Put(array, id, cdbData);
   }
-  
   delete newTransform;
 }