]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - TOF/AliTOFv1.cxx
git://git.uio.no / u / mrichter / AliRoot.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Use gMC and not pMC everywhere
[u/mrichter/AliRoot.git] / TOF / AliTOFv1.cxx
diff --git a/TOF/AliTOFv1.cxx b/TOF/AliTOFv1.cxx
index 708d16e2303515b2636f0f786688ffdb21d9c82f..7dbc17f8ce60a31685a66aa10e40db3b547b711d 100644 (file)
--- a/TOF/AliTOFv1.cxx
+++ b/TOF/AliTOFv1.cxx
@@ -6,7 +6,7 @@
 //                                                                           //
 //Begin_Html
 /*
-<img src="gif/AliTOFv1Class.gif">
+<img src="picts/AliTOFv1Class.gif">
 */
 //End_Html
 //                                                                           //
@@ -43,13 +43,11 @@ void AliTOFv1::CreateGeometry()
   // Authors :   Maxim Martemianov, Boris Zagreev (ITEP)   18/09/98 
   //Begin_Html
   /*
-    <img src="gif/AliTOFv1.gif">
+    <img src="picts/AliTOFv1.gif">
   */
   //End_Html
   //
 
-  AliMC* pMC = AliMC::GetMC();
-  
   Float_t fil_rich;
   Int_t lmax;
   Float_t phos_phi, zcor2, zcor3, ztof0, ztof1, ztof2;
@@ -59,7 +57,7 @@ void AliTOFv1::CreateGeometry()
   Float_t rp1, rp2;
   Float_t par[10], fil_min, fil_max, ysz, fil0;
   //
-  Int_t *idtmed = gAlice->Idtmed();
+  Int_t *idtmed = fIdtmed->GetArray()-499;
   //
   // barrel size along Z axis 
   //
@@ -99,9 +97,9 @@ void AliTOFv1::CreateGeometry()
   par[0] = rp1;
   par[1] = rp2;
   par[2] = zl / 2.;
-  pMC->Gsvolu("FBAR", "TUBE", idtmed[500], par, 3);
-  pMC->Gspos("FBAR", 1, "ALIC", 0., 0., 0., 0, "ONLY");
-  pMC->Gsatt("FBAR", "SEEN", 0);
+  gMC->Gsvolu("FBAR", "TUBE", idtmed[500], par, 3);
+  gMC->Gspos("FBAR", 1, "ALIC", 0., 0., 0., 0, "ONLY");
+  gMC->Gsatt("FBAR", "SEEN", 0);
   //
   // --- First Block
   par[0] = (rp1+rp2-zazor)/2.;
@@ -112,42 +110,42 @@ void AliTOFv1::CreateGeometry()
   fil0 = 180. - (par[3] + par[4]);
   //
   // --- Sensitive volume 
-  pMC->Gsvolu("FBT1", "TUBS", idtmed[509], par, 5);
+  gMC->Gsvolu("FBT1", "TUBS", idtmed[509], par, 5);
   AliMatrix(idrotm[1], 90., fil0, 90., fil0 + 90., 0., 0.);
-  pMC->Gspos("FBT1", 0, "FBAR", 0., 0., 0., 0, "ONLY");
-  pMC->Gspos("FBT1", 1, "FBAR", 0., 0., 0., idrotm[1], "ONLY");
+  gMC->Gspos("FBT1", 0, "FBAR", 0., 0., 0., 0, "ONLY");
+  gMC->Gspos("FBT1", 1, "FBAR", 0., 0., 0., idrotm[1], "ONLY");
   //
   // ALUMINA
   par[0] = (rp1+rp2+zazor)/2.;
   par[1] = (rp1+rp2+zazor)/2.+ysz;
-  pMC->Gsvolu("FPE1","TUBS",idtmed[507], par, 0);
-  pMC->Gsposp("FPE1",2,"FBAR", 0., 0., 0., 0,         "ONLY", par, 5);
-  pMC->Gsposp("FPE1",3,"FBAR", 0., 0., 0., idrotm[1], "ONLY", par, 5);
+  gMC->Gsvolu("FPE1","TUBS",idtmed[507], par, 0);
+  gMC->Gsposp("FPE1",2,"FBAR", 0., 0., 0., 0,         "ONLY", par, 5);
+  gMC->Gsposp("FPE1",3,"FBAR", 0., 0., 0., idrotm[1], "ONLY", par, 5);
   //
   par[0] = (rp1+rp2-zazor)/2.-ysz;
   par[1] = (rp1+rp2-zazor)/2.;
-  pMC->Gsposp("FPE1",4,"FBAR", 0., 0., 0., 0,         "ONLY", par, 5);
-  pMC->Gsposp("FPE1",5,"FBAR", 0., 0., 0., idrotm[1], "ONLY", par, 5);
+  gMC->Gsposp("FPE1",4,"FBAR", 0., 0., 0., 0,         "ONLY", par, 5);
+  gMC->Gsposp("FPE1",5,"FBAR", 0., 0., 0., idrotm[1], "ONLY", par, 5);
   // --- Second block 
   par[0] = (rp1+rp2-zazor)/2.;
   par[1] = (rp1+rp2+zazor)/2.;
   par[2] = ztof1 / 2.;
   par[3] = 90. - fil_max;
   par[4] = 90. - fil_min;
-  pMC->Gsvolu("FBT2", "TUBS", idtmed[509], par, 5);
-  pMC->Gspos("FBT2", 0, "FBAR", 0., 0., zcor2, 0, "ONLY");
-  pMC->Gspos("FBT2", 1, "FBAR", 0., 0., -zcor2, 0, "ONLY");
+  gMC->Gsvolu("FBT2", "TUBS", idtmed[509], par, 5);
+  gMC->Gspos("FBT2", 0, "FBAR", 0., 0., zcor2, 0, "ONLY");
+  gMC->Gspos("FBT2", 1, "FBAR", 0., 0., -zcor2, 0, "ONLY");
   //
   par[0]=(rp1+rp2+zazor)/2.;
   par[1]=(rp1+rp2+zazor)/2.+ysz;
-  pMC->Gsvolu("FPE2","TUBS",idtmed[507], par, 0);
-  pMC->Gsposp("FPE2",2,"FBAR",0.,0.,zcor2,0,"ONLY",par,5);
-  pMC->Gsposp("FPE2",3,"FBAR",0.,0.,-zcor2,0,"ONLY",par,5);
+  gMC->Gsvolu("FPE2","TUBS",idtmed[507], par, 0);
+  gMC->Gsposp("FPE2",2,"FBAR",0.,0.,zcor2,0,"ONLY",par,5);
+  gMC->Gsposp("FPE2",3,"FBAR",0.,0.,-zcor2,0,"ONLY",par,5);
   //
   par[0]=(rp1+rp2-zazor)/2.-ysz;
   par[1]=(rp1+rp2-zazor)/2.;
-  pMC->Gsposp("FPE2",4,"FBAR",0.,0.,zcor2,0,"ONLY",par,5);
-  pMC->Gsposp("FPE2",5,"FBAR",0.,0.,-zcor2,0,"ONLY",par,5);
+  gMC->Gsposp("FPE2",4,"FBAR",0.,0.,zcor2,0,"ONLY",par,5);
+  gMC->Gsposp("FPE2",5,"FBAR",0.,0.,-zcor2,0,"ONLY",par,5);
   //
   // --- Third block 
   par[0] = (rp1+rp2-zazor)/2.;
@@ -155,20 +153,20 @@ void AliTOFv1::CreateGeometry()
   par[2] = ztof2 / 2.;
   par[3] = 90. - fil_rich;
   par[4] = fil_rich + 90.;
-  pMC->Gsvolu("FBT3", "TUBS", idtmed[509], par, 5);
-  pMC->Gspos("FBT3", 0, "FBAR", 0., 0., zcor3, 0, "ONLY");
-  pMC->Gspos("FBT3", 1, "FBAR", 0., 0., -zcor3, 0, "ONLY");
+  gMC->Gsvolu("FBT3", "TUBS", idtmed[509], par, 5);
+  gMC->Gspos("FBT3", 0, "FBAR", 0., 0., zcor3, 0, "ONLY");
+  gMC->Gspos("FBT3", 1, "FBAR", 0., 0., -zcor3, 0, "ONLY");
   //
   par[0]=(rp1+rp2+zazor)/2.;
   par[1]=(rp1+rp2+zazor)/2.+ysz;
-  pMC->Gsvolu("FPE3","TUBS",idtmed[507], par, 0);
-  pMC->Gsposp("FPE3",2,"FBAR",0.,0.,zcor3,0,"ONLY",par,5);
-  pMC->Gsposp("FPE3",3,"FBAR",0.,0.,-zcor3,0,"ONLY",par,5);
+  gMC->Gsvolu("FPE3","TUBS",idtmed[507], par, 0);
+  gMC->Gsposp("FPE3",2,"FBAR",0.,0.,zcor3,0,"ONLY",par,5);
+  gMC->Gsposp("FPE3",3,"FBAR",0.,0.,-zcor3,0,"ONLY",par,5);
   //
   par[0]=(rp1+rp2-zazor)/2.-ysz;
   par[1]=(rp1+rp2-zazor)/2.;
-  pMC->Gsposp("FPE3",4,"FBAR",0.,0.,zcor3,0,"ONLY",par,5);
-  pMC->Gsposp("FPE3",5,"FBAR",0.,0.,-zcor3,0,"ONLY",par,5);
+  gMC->Gsposp("FPE3",4,"FBAR",0.,0.,zcor3,0,"ONLY",par,5);
+  gMC->Gsposp("FPE3",5,"FBAR",0.,0.,-zcor3,0,"ONLY",par,5);
   //
 }
  
@@ -179,30 +177,28 @@ void AliTOFv1::DrawModule()
   // Draw a shaded view of the Time Of Flight version 1
   //
 
-  AliMC* pMC = AliMC::GetMC();
-  
   // Set everything unseen
-  pMC->Gsatt("*", "seen", -1);
+  gMC->Gsatt("*", "seen", -1);
   // 
   // Set ALIC mother transparent
-  pMC->Gsatt("ALIC","SEEN",0);
+  gMC->Gsatt("ALIC","SEEN",0);
   //
   // Set the volumes visible
-  pMC->Gsatt("FBAR","SEEN",0);
-  pMC->Gsatt("FPE1","SEEN",1);
-  pMC->Gsatt("FPE2","SEEN",1);
-  pMC->Gsatt("FPE3","SEEN",1);
-  //
-  pMC->Gdopt("hide", "on");
-  pMC->Gdopt("shad", "on");
-  pMC->Gsatt("*", "fill", 7);
-  pMC->SetClipBox(".");
-  pMC->SetClipBox("*", 0, 1000, -1000, 1000, -1000, 1000);
-  pMC->DefaultRange();
-  pMC->Gdraw("alic", 40, 30, 0, 12, 9.5, .02, .02);
-  pMC->Gdhead(1111, "Time Of Flight");
-  pMC->Gdman(18, 4, "MAN");
-  pMC->Gdopt("hide","off");
+  gMC->Gsatt("FBAR","SEEN",0);
+  gMC->Gsatt("FPE1","SEEN",1);
+  gMC->Gsatt("FPE2","SEEN",1);
+  gMC->Gsatt("FPE3","SEEN",1);
+  //
+  gMC->Gdopt("hide", "on");
+  gMC->Gdopt("shad", "on");
+  gMC->Gsatt("*", "fill", 7);
+  gMC->SetClipBox(".");
+  gMC->SetClipBox("*", 0, 1000, -1000, 1000, -1000, 1000);
+  gMC->DefaultRange();
+  gMC->Gdraw("alic", 40, 30, 0, 12, 9.5, .02, .02);
+  gMC->Gdhead(1111, "Time Of Flight");
+  gMC->Gdman(18, 4, "MAN");
+  gMC->Gdopt("hide","off");
 }
 
 //___________________________________________
@@ -220,11 +216,9 @@ void AliTOFv1::Init()
   //
   // Initialise Time Of Flight after it has been built
 
-  AliMC* pMC = AliMC::GetMC();
-  
   AliTOF::Init();
-  fIdFBT2=pMC->VolId("FBT2");
-  fIdFBT3=pMC->VolId("FBT3");
+  fIdFBT2=gMC->VolId("FBT2");
+  fIdFBT3=gMC->VolId("FBT3");
 }
  
 //______________________________________________________________________________
@@ -233,22 +227,21 @@ void AliTOFv1::StepManager()
   Float_t hits[8];
   Int_t vol[3];
   Int_t copy, id;
-  AliMC *pMC= AliMC::GetMC();
-  Int_t *idtmed = gAlice->Idtmed();
-  if(pMC->GetMedium()==idtmed[510-1] && 
-     pMC->TrackEntering() && pMC->TrackCharge()
-     && (id=pMC->CurrentVol(0,copy))==fIdSens) {
+  Int_t *idtmed = fIdtmed->GetArray()-499;
+  if(gMC->GetMedium()==idtmed[510-1] && 
+     gMC->TrackEntering() && gMC->TrackCharge()
+     && (id=gMC->CurrentVol(0,copy))==fIdSens) {
     TClonesArray &lhits = *fHits;
 //
 // Record only charged tracks at entrance
     vol[2]=copy;
-    vol[1]=pMC->CurrentVolOff(1,0,copy);
+    vol[1]=gMC->CurrentVolOff(1,0,copy);
     if(id==fIdFBT2) copy+=2; else 
       if(id==fIdFBT2) copy+=4;
     vol[0]=1;
-    pMC->TrackPosition(hits);
-    pMC->TrackMomentum(&hits[3]);
-    hits[7]=pMC->TrackTime();
+    gMC->TrackPosition(hits);
+    gMC->TrackMomentum(&hits[3]);
+    hits[7]=gMC->TrackTime();
     new(lhits[fNhits++]) AliTOFhit(fIshunt,gAlice->CurrentTrack(),vol,hits);
   }
 }