Adapt add macro and particle/cluster containers for the analysis on jets

[u/mrichter/AliRoot.git] / PHOS / AliPHOSvFast.cxx

diff --git a/PHOS/AliPHOSvFast.cxx b/PHOS/AliPHOSvFast.cxx
index 53b0c2332e87997b91f0e22fc957d663fe9f0fbc..ad524ca25523e069a12cdaaa38899cdf1da9805a 100644 (file)
--- a/PHOS/AliPHOSvFast.cxx
+++ b/PHOS/AliPHOSvFast.cxx
@@ -37,10 +37,9 @@
 
 // --- ROOT system ---
  
-#include <TBRIK.h>
 #include <TGeometry.h>
-#include <TNode.h>
 #include <TParticle.h>
+#include <TDatabasePDG.h>
 #include "TClonesArray.h" 
 #include <TVirtualMC.h>
 
@@ -119,63 +118,6 @@ void AliPHOSvFast::AddRecParticle(const AliPHOSFastRecParticle & rp)
   fNRecParticles++ ; 
 }
 
-//____________________________________________________________________________
-void AliPHOSvFast::BuildGeometry()
-{
-  // Build the PHOS geometry for the ROOT display
-   //BEGIN_HTML
-  /*
-    <H2>
-     PHOS FAST in ALICE displayed by root
-    </H2>
-    <H4> All Views </H4>
-    <P>
-    <CENTER>
-    <IMG Align=BOTTOM ALT="Fast All Views" SRC="../images/AliPHOSvFastAllViews.gif"> 
-    </CENTER></P>
-    <H4> Front View </H4>
-    <P>
-    <CENTER>
-    <IMG Align=BOTTOM ALT="Fast Front View" SRC="../images/AliPHOSvFastFrontView.gif"> 
-    </CENTER></P>
-  */
-  //END_HTML  
- 
-  const Int_t kColorPHOS = kRed ;
-  
-  Double_t const kRADDEG = 180.0 / TMath::Pi() ;
-  
-  new TBRIK( "BigBox", "PHOS box", "void", GetBigBox(0)/2, 
-            GetBigBox(1)/2, 
-            GetBigBox(2)/2 );
-  
-  // position PHOS into ALICE
-
-  Float_t r = GetGeometry()->GetIPtoCrystalSurface() + GetBigBox(1) / 2.0 ;
-  Int_t number = 988 ; 
-  Float_t pphi =  TMath::ATan( GetBigBox(0)  / ( 2.0 * GetGeometry()->GetIPtoCrystalSurface() ) ) ;
-  pphi *= kRADDEG ;
-  TNode * top = gAlice->GetGeometry()->GetNode("alice") ;
- 
-  char * nodename = new char[20] ;  
-  char * rotname  = new char[20] ; 
-
-  for( Int_t i = 1; i <= GetGeometry()->GetNModules(); i++ ) { 
-   Float_t angle = pphi * 2 * ( i - GetGeometry()->GetNModules() / 2.0 - 0.5 ) ;
-   sprintf(rotname, "%s%d", "rot", number++) ;
-   new TRotMatrix(rotname, rotname, 90, angle, 90, 90 + angle, 0, 0);
-   top->cd();
-   sprintf(nodename,"%s%d", "Module", i) ;    
-   Float_t x =  r * TMath::Sin( angle / kRADDEG ) ;
-   Float_t y = -r * TMath::Cos( angle / kRADDEG ) ;
-   TNode * bigboxnode = new TNode(nodename, nodename, "BigBox", x, y, 0, rotname ) ;
-   bigboxnode->SetLineColor(kColorPHOS) ;
-   fNodes->Add(bigboxnode) ;
-  }
-  delete[] nodename ; 
-  delete[] rotname ; 
-}
-
 //____________________________________________________________________________
 void AliPHOSvFast::CreateGeometry()
 {
@@ -198,7 +140,7 @@ void AliPHOSvFast::CreateGeometry()
   bigbox[1] =   GetBigBox(1) / 2.0 ;
   bigbox[2] =   GetBigBox(2) / 2.0 ;
   
-  gMC->Gsvolu("PHOS", "BOX ", idtmed[798], bigbox, 3) ;
+  TVirtualMC::GetMC()->Gsvolu("PHOS", "BOX ", idtmed[798], bigbox, 3) ;
   
   // --- Position  PHOS mdules in ALICE setup ---
   
@@ -214,7 +156,7 @@ void AliPHOSvFast::CreateGeometry()
 
     Float_t xP1 = r * TMath::Sin( angle / kRADDEG ) ;
     Float_t yP1 = -r * TMath::Cos( angle / kRADDEG ) ;
-    gMC->Gspos("PHOS", i, "ALIC", xP1, yP1, 0.0, idrotm[i-1], "ONLY") ;
+    TVirtualMC::GetMC()->Gspos("PHOS", i, "ALIC", xP1, yP1, 0.0, idrotm[i-1], "ONLY") ;
  
   } // for GetNModules
 
@@ -480,23 +422,23 @@ void AliPHOSvFast::StepManager(void)
   // Only verifies if the particle reaches PHOS and stops the tracking 
 
   TLorentzVector lv ; 
-  gMC->TrackPosition(lv) ;
+  TVirtualMC::GetMC()->TrackPosition(lv) ;
   TVector3 pos = lv.Vect() ; 
   Int_t modid  ; 
-  gMC->CurrentVolID(modid);
+  TVirtualMC::GetMC()->CurrentVolID(modid);
   
-  Float_t energy = gMC->Etot() ; //Total energy of current track
+  Float_t energy = TVirtualMC::GetMC()->Etot() ; //Total energy of current track
 
   //Calculating mass of current particle
   TDatabasePDG * pdg = TDatabasePDG::Instance() ;
-  TParticlePDG * partPDG = pdg->GetParticle(gMC->TrackPid()) ;
+  TParticlePDG * partPDG = pdg->GetParticle(TVirtualMC::GetMC()->TrackPid()) ;
   Float_t mass = partPDG->Mass() ;
 
   if(energy > mass){
     pos.SetMag(TMath::Sqrt(energy*energy-mass*mass)) ;
     TLorentzVector pTrack(pos, energy) ;  
 
-    TParticle * part = new TParticle(gMC->TrackPid(), 0,-1,-1,-1,-1, pTrack, lv)  ;
+    TParticle * part = new TParticle(TVirtualMC::GetMC()->TrackPid(), 0,-1,-1,-1,-1, pTrack, lv)  ;
         
     AliPHOSFastRecParticle rp(*part) ;
 
@@ -511,7 +453,7 @@ void AliPHOSvFast::StepManager(void)
   }
   // stop the track as soon PHOS is reached
   
-  gMC->StopTrack() ; 
+  TVirtualMC::GetMC()->StopTrack() ; 
 
 }