From: ivana <ivana@f7af4fe6-9843-0410-8265-dc069ae4e863>
Date: Thu, 19 Apr 2007 10:24:50 +0000 (+0000)
Subject: Added includes to make macro compilable and corrected compiler
X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=commitdiff_plain;h=0eae073771ac71269790681914bce3de87dc05e8

Added includes to make macro compilable and corrected compiler
errors & warnings
---

diff --git a/MUON/MakeMUONFullMisAlignment.C b/MUON/MakeMUONFullMisAlignment.C
index dca2a9808b4..3cc1373a9c8 100644
--- a/MUON/MakeMUONFullMisAlignment.C
+++ b/MUON/MakeMUONFullMisAlignment.C
@@ -20,6 +20,24 @@
 //
 // Author: I. Hrivnacova, IPN Orsay
 
+#if !defined(__CINT__) || defined(__MAKECINT__)
+
+#include "AliMUONGeometryTransformer.h"
+#include "AliMUONGeometryMisAligner.h"
+
+#include "AliCDBManager.h"
+#include "AliCDBStorage.h"
+#include "AliCDBId.h"
+
+#include <TGeoManager.h>
+#include <TClonesArray.h>
+#include <TString.h>
+#include <TFile.h>
+#include <Riostream.h>
+
+#endif
+
+
 void MakeMUONFullMisAlignment()
 {
   // Check first if geometry is loaded,
@@ -35,19 +53,20 @@ void MakeMUONFullMisAlignment()
   AliMUONGeometryMisAligner misAligner(0.0, 0.03, 0.0, 0.03, 0.0, 0.03);
   AliMUONGeometryTransformer* newTransform 
     = misAligner.MisAlign(&transformer, true);
-  TClonesArray* array = newTransform->GetMisAlignmentData();
+  const TClonesArray* array = newTransform->GetMisAlignmentData();
   
-  if( TString(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";}
+    if ( !f.IsOpen() ) {
+      cerr << "cannot open file for output" << endl;
+    }
     
     f.cd();
     f.WriteObject(array,"MUONAlignObjs ","kSingleKey");
     f.Close();
-    array->Delete();
   }
   else {
     cout << "Generating full misalignment data in CDB" << endl;
@@ -62,10 +81,7 @@ void MakeMUONFullMisAlignment()
     cdbData->SetComment("MUON alignment objects with full misalignment");
     cdbData->SetAliRootVersion(gSystem->Getenv("ARVERSION"));
     AliCDBId id("MUON/Align/Data", 0, 9999999); 
-    storage->Put(array, id, cdbData);
-    
-    delete newTransform;
+    storage->Put(const_cast<TClonesArray*>(array), id, cdbData);
   }   
-  
-  
+  delete newTransform;
 }
diff --git a/MUON/MakeMUONResMisAlignment.C b/MUON/MakeMUONResMisAlignment.C
index 363f4e9649f..e631ce6f8c1 100644
--- a/MUON/MakeMUONResMisAlignment.C
+++ b/MUON/MakeMUONResMisAlignment.C
@@ -20,6 +20,23 @@
 //
 //  Author: I. Hrivnacova, IPN Orsay
 
+#if !defined(__CINT__) || defined(__MAKECINT__)
+
+#include "AliMUONGeometryTransformer.h"
+#include "AliMUONGeometryMisAligner.h"
+
+#include "AliCDBManager.h"
+#include "AliCDBStorage.h"
+#include "AliCDBId.h"
+
+#include <TGeoManager.h>
+#include <TClonesArray.h>
+#include <TString.h>
+#include <TFile.h>
+#include <Riostream.h>
+
+#endif
+
 void MakeMUONResMisAlignment()
 {
   // Check first if geometry is loaded,
@@ -35,14 +52,16 @@ void MakeMUONResMisAlignment()
   AliMUONGeometryMisAligner misAligner(0.0, 0.004, 0.0, 0.003, 0.0, 0.0023);
   AliMUONGeometryTransformer* newTransform 
     = misAligner.MisAlign(&transformer, true);
-  TClonesArray* array = newTransform->GetMisAlignmentData();
+  const TClonesArray* array = newTransform->GetMisAlignmentData();
 
-  if( TString(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";}
+    if( !f.IsOpen() ) {
+      cerr << "cannot open file for output" << endl;
+    }
     
     f.cd();
     f.WriteObject(array,"MUONAlignObjs ","kSingleKey");
@@ -59,8 +78,8 @@ void MakeMUONResMisAlignment()
     cdbData->SetComment("MUON alignment objects with residual misalignment");
     cdbData->SetAliRootVersion(gSystem->Getenv("ARVERSION"));
     AliCDBId id("MUON/Align/Data", 0, 9999999); 
-    storage->Put(array, id, cdbData);
+    storage->Put(const_cast<TClonesArray*>(array), id, cdbData);
   }
   delete newTransform;
-}   
+ }   
 
diff --git a/MUON/MakeMUONZeroMisAlignment.C b/MUON/MakeMUONZeroMisAlignment.C
index d64da78006d..35b0bfcbcfa 100644
--- a/MUON/MakeMUONZeroMisAlignment.C
+++ b/MUON/MakeMUONZeroMisAlignment.C
@@ -19,6 +19,22 @@
 //
 // Author: I. Hrivnacova, IPN Orsay
 
+#if !defined(__CINT__) || defined(__MAKECINT__)
+
+#include "AliMUONGeometryTransformer.h"
+
+#include "AliCDBManager.h"
+#include "AliCDBStorage.h"
+#include "AliCDBId.h"
+
+#include <TGeoManager.h>
+#include <TClonesArray.h>
+#include <TString.h>
+#include <TFile.h>
+#include <Riostream.h>
+
+#endif
+
 void MakeMUONZeroMisAlignment()
 {
   // Check first if geometry is loaded,
@@ -32,15 +48,16 @@ void MakeMUONZeroMisAlignment()
   transformer.ReadGeometryData("volpath.dat", gGeoManager);
   TClonesArray* array = transformer.CreateZeroAlignmentData();;
 
-  if( TString(gSystem->Getenv("TOCDB")) != TString("kTRUE") ) {
+  if ( TString(gSystem->Getenv("TOCDB")) != TString("kTRUE") ) {
     // save in file
     cout << "Generating zero misalignment data in a file ..." << endl;
 
     // Create a file to store the alignment data
     TFile f("MUONzeroMisalignment.root", "RECREATE");
-    if(!f) {
+    if( !f.IsOpen() ) {
       cerr<<"cannot open file for output\n";
     }
+    
     f.cd();
     f.WriteObject(array,"MUONAlignObjs ","kSingleKey");
     f.Close();