Restored compilation

diff --git a/PMD/AliPMD.cxx b/PMD/AliPMD.cxx
index 94ae930cd5de7a8afac9bcf4361afd75196fa538..7e3dcf4bacf781fe359e236da020f7eb725f10f8 100644 (file)
--- a/PMD/AliPMD.cxx
+++ b/PMD/AliPMD.cxx
@@ -157,27 +157,6 @@ void AliPMD::AddHit(Int_t track, Int_t *vol, Float_t *hits)
   delete newcell;
 }
  
-//_____________________________________________________________________________
-void AliPMD::BuildGeometry()
-{
-  //
-  // Build simple ROOT TNode geometry for event display
-  //
-
-  TNode *node, *top;
-  const int kColorPMD  = kRed;
-
-  //
-  top=gAlice->GetGeometry()->GetNode("alice");
-
-  // PMD
-  new TBRIK("S_PMD","PMD box","void",300,300,5);
-  top->cd();
-  node = new TNode("PMD","PMD","S_PMD",0,0,-600,"");
-  node->SetLineColor(kColorPMD);
-  fNodes->Add(node);
-}
-
 //_____________________________________________________________________________
 void AliPMD::SetPAR(Float_t p1, Float_t p2, Float_t p3,Float_t p4)
 {

diff --git a/PMD/AliPMD.h b/PMD/AliPMD.h
index 7f2903d37270d24b2bbb8a57e85fc0cc8eb5fc7a..700489a94608a1b14d87a05a10a88c1994a5fdf0 100644 (file)
--- a/PMD/AliPMD.h
+++ b/PMD/AliPMD.h
@@ -28,7 +28,6 @@ public:
 
   virtual      ~AliPMD();
   virtual void  AddHit(Int_t track, Int_t* vol, Float_t* hits);
-  virtual void  BuildGeometry();
   virtual void  CreateGeometry() {}
   virtual void  CreateMaterials() {}
   virtual void  Init() {}

diff --git a/PMD/AliPMDDigitizer.cxx b/PMD/AliPMDDigitizer.cxx
index ff7143d2f3e9e349f1914758d07e6b316bc3cf59..e6188cf6f40ad715ec91c5d08d82678c2eeee17d 100644 (file)
--- a/PMD/AliPMDDigitizer.cxx
+++ b/PMD/AliPMDDigitizer.cxx
@@ -301,7 +301,7 @@ void AliPMDDigitizer::Hits2SDigits(Int_t ievt)
 
   for (Int_t track=0; track<ntracks;track++)
     {
-      gAlice->ResetHits();
+      gAlice->GetMCApp()->ResetHits();
       treeH->GetEvent(track);
       if (fPMD)
        {
@@ -531,7 +531,7 @@ void AliPMDDigitizer::Hits2Digits(Int_t ievt)
 
   for (Int_t track=0; track<ntracks;track++)
     {
-      gAlice->ResetHits();
+      gAlice->GetMCApp()->ResetHits();
       treeH->GetEvent(track);
       
       if (fPMD)

diff --git a/PMD/AliPMDv1.cxx b/PMD/AliPMDv1.cxx
index fa3fa56958a60d79817eccdd12ecd3f4ec2a0126..424a688914f8aacca23a32f83698bd3ae3fda2a8 100644 (file)
--- a/PMD/AliPMDv1.cxx
+++ b/PMD/AliPMDv1.cxx
@@ -40,7 +40,8 @@
 /////////////////////////////////////////////////////////////////////////////
 ////
 
-#include "Riostream.h"
+#include <Riostream.h>
+#include <TGeoGlobalMagField.h>
 #include <TVirtualMC.h>
 
 #include "AliConst.h" 
@@ -2099,8 +2100,8 @@ void AliPMDv1::CreateMaterials()
   //
   //  cout << " Inside create materials " << endl;
   
-  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();
   
   // --- Define the various materials for GEANT ---