Print format in log messages corrected in different places

[u/mrichter/AliRoot.git] / STRUCT / AliPIPEv1.cxx

diff --git a/STRUCT/AliPIPEv1.cxx b/STRUCT/AliPIPEv1.cxx
index f43b321dbd38fb6b0bd2c1b9a925c0a7ccd848bf..f92489a83d488a0208985a8cd248a5779512e45e 100644 (file)
--- a/STRUCT/AliPIPEv1.cxx
+++ b/STRUCT/AliPIPEv1.cxx
@@ -13,16 +13,11 @@
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
-/*
-$Log$
-Revision 1.6  1999/09/29 09:24:30  fca
-Introduction of the Copyright and cvs Log
-
-*/
+/* $Id$ */
 
 ///////////////////////////////////////////////////////////////////////////////
 //                                                                           //
-//  Beam pipe class                                                          //
+//  Beam pipe class. Test version                                            //
 //                                                                           //
 //Begin_Html
 /*
@@ -32,9 +27,11 @@ Introduction of the Copyright and cvs Log
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
+#include <TVirtualMC.h>
+
+#include "AliMagF.h"
 #include "AliPIPEv1.h"
 #include "AliRun.h"
-#include "AliMC.h"
  
 ClassImp(AliPIPEv1)
  
@@ -244,7 +241,7 @@ void AliPIPEv1::CreateGeometry()
 }
 
 //_____________________________________________________________________________
-void AliPIPEv1::DrawModule()
+void AliPIPEv1::DrawModule() const
 {
   //
   // Draw a shaded view of the Beam Pipe
@@ -287,8 +284,8 @@ void AliPIPEv1::CreateMaterials()
   // Create materials for beam pipe
   //
 
-  Int_t   isxfld = gAlice->Field()->Integ();
-  Float_t sxmgmx = gAlice->Field()->Max();
+  Int_t   isxfld = ((AliMagF*)TGeoGlobalMagField::Instance()->GetField())->Integ();
+  Float_t sxmgmx = ((AliMagF*)TGeoGlobalMagField::Instance()->GetField())->Max();
   
   Float_t asteel[4] = { 55.847,51.9961,58.6934,28.0855 };
   Float_t zsteel[4] = { 26.,24.,28.,14. };