Added the magnetic field as a static member of the AliL3Transform class,

[u/mrichter/AliRoot.git] / HLT / src / AliL3Display.cxx

diff --git a/HLT/src/AliL3Display.cxx b/HLT/src/AliL3Display.cxx
index db110a3337b40f39efd97535b0a26eba7bec4e7f..c743055d86ccc31c463c8f6cb5ad50188509f43d 100644 (file)
--- a/HLT/src/AliL3Display.cxx
+++ b/HLT/src/AliL3Display.cxx
@@ -13,8 +13,9 @@
 #include <TGeometry.h>
 #include <TShape.h>
 #include <TParticle.h>
+#include <TFile.h>
 
-#include "AliL3Evaluate.h"
+#include "AliL3Display.h"
 #ifdef use_aliroot
 #include "AliRun.h"
 #include "AliSimDigits.h"
@@ -24,9 +25,9 @@
 #include "AliL3Track.h"
 #include "AliL3TrackArray.h"
 #include "AliL3SpacePointData.h"
-#include "AliL3FileHandler.h"
+#include "AliL3MemHandler.h"
 #include "AliL3Logging.h"
-#include "AliL3Display.h"
+
 
 //_____________________________________________________________
 // AliL3Display
@@ -45,7 +46,7 @@ AliL3Display::AliL3Display(Int_t *slice)
 {
   //Ctor. Specify which slices you want to look at.
 
-  TFile *file = new TFile("/prog/alice/data/GEO/alice.geom");
+  TFile *file = new TFile("$(LEVEL3)/GEO/alice.geom");
   if(!file) printf("NO FILE\n");
   if(!file->IsOpen())
     LOG(AliL3Log::kError,"AliL3Display::AliL3Display","File Open")
@@ -55,7 +56,6 @@ AliL3Display::AliL3Display(Int_t *slice)
   fMinSlice = slice[0];
   fMaxSlice = slice[1];
 
-  fTransform = new AliL3Transform();
   file->Close();
   delete file;
 }
@@ -65,21 +65,20 @@ AliL3Display::~AliL3Display()
 
   if(fTracks)
     delete fTracks;
-  if(fTransform)
-    delete fTransform;
 }
 
 void AliL3Display::Setup(Char_t *trackfile,Char_t *path)
 {
   //Read in the hit and track information from produced files.
   
+  AliL3Transform::Init(path);
   Char_t fname[256];
-  AliL3FileHandler *clusterfile[36][6];
+  AliL3MemHandler *clusterfile[36][6];
   for(Int_t s=fMinSlice; s<=fMaxSlice; s++)
     {
       for(Int_t p=0; p<6; p++)
        {
-         clusterfile[s][p] = new AliL3FileHandler();
+         clusterfile[s][p] = new AliL3MemHandler();
          sprintf(fname,"%spoints_%d_%d.raw",path,s,p);
          if(!clusterfile[s][p]->SetBinaryInput(fname))
            {
@@ -96,7 +95,7 @@ void AliL3Display::Setup(Char_t *trackfile,Char_t *path)
     }
   
   
-  AliL3FileHandler *tfile = new AliL3FileHandler();
+  AliL3MemHandler *tfile = new AliL3MemHandler();
   if(!tfile->SetBinaryInput(trackfile))
     {
       LOG(AliL3Log::kError,"AliL3Evaluation::Setup","File Open")
@@ -259,7 +258,7 @@ void AliL3Display::DisplayAll(Int_t min_hits)
   v->SetRange(-430,-560,-430,430,560,1710);
   c1->Clear();
   c1->SetFillColor(1);
-  c1->SetTheta(180.);
+  c1->SetTheta(90.);
   c1->SetPhi(0.);
   
   for(Int_t s=fMinSlice; s<=fMaxSlice; s++)
@@ -370,10 +369,9 @@ void AliL3Display::DisplayClusterRow(Int_t slice,Int_t padrow,Char_t *digitsFile
   TTree *TD=(TTree*)file->Get("TreeD_75x40_100x60_0");
   AliSimDigits da, *digits=&da;
   TD->GetBranch("Segment")->SetAddress(&digits); //Return pointer to branch segment.
-  AliL3Transform *transform = new AliL3Transform();
   
   Int_t sector,row;
-  transform->Slice2Sector(slice,padrow,sector,row);
+  AliL3Transform::Slice2Sector(slice,padrow,sector,row);
   Int_t npads = param->GetNPads(sector,row);
   Int_t ntimes = param->GetMaxTBin();
   TH2F *histdig = new TH2F("histdig","",npads,0,npads-1,ntimes,0,ntimes-1);
@@ -429,7 +427,7 @@ void AliL3Display::DisplayClusterRow(Int_t slice,Int_t padrow,Char_t *digitsFile
          xyz[0] = points[i].fX;
          xyz[1] = points[i].fY;
          xyz[2] = points[i].fZ;
-         transform->Global2Raw(xyz,sector,row);
+         AliL3Transform::Global2Raw(xyz,sector,row);
          histfast->Fill(xyz[1],xyz[2],1);