Modifications of the TOF to make the inner radius 370 cm. This has still
authorfca <fca@f7af4fe6-9843-0410-8265-dc069ae4e863>
Fri, 11 Jun 1999 12:22:59 +0000 (12:22 +0000)
committerfca <fca@f7af4fe6-9843-0410-8265-dc069ae4e863>
Fri, 11 Jun 1999 12:22:59 +0000 (12:22 +0000)
to be verified by TOF people.

TOF/AliTOF.cxx
TOF/AliTOFv0.cxx
TOF/AliTOFv1.cxx
TOF/AliTOFv2.cxx

index ba14a45..82e2a76 100644 (file)
@@ -19,7 +19,6 @@
 #include <TTUBE.h>
 #include <TBRIK.h>
 #include "AliRun.h"
-#include "AliMC.h"
 #include "AliConst.h"
  
 ClassImp(AliTOF)
@@ -92,205 +91,248 @@ void AliTOF::BuildGeometry()
   new TRotMatrix("rot518","rot518",90,-341.0526,90,-251.0526,0,0);
   new TRotMatrix("rot519","rot519",90,-360,90,-270,0,0);
   //
+  // Position the different copies
+  //  const Float_t rtof=366;
+  // changed by Federico Carminati. TOF people should really look at this
+  const Float_t rtof=381;
+  const Int_t ntof=19;
+  const Float_t angle=2*kPI/ntof;
+  Float_t ang;
+  const Float_t xtof = rtof*TMath::Sin(kPI/ntof);
+  //
   // Define TOF basic volume
-  new TBRIK("S_TOF1","TOF box","void",60.,6.,175.);
+  new TBRIK("S_TOF1","TOF box","void",xtof,6.,175.);
   //
-  // Position the different copies
   Top->cd();
-  Node = new TNode("FTO11","FTO11","S_TOF1",224.8018,288.8254,175,"rot502");
+  ang=2.75*angle;
+  Node = new TNode("FTO11","FTO11","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),175,"rot502");
   Node->SetLineColor(kColorTOF);
   fNodes->Add(Node); 
   //
   Top->cd();
-  Node = new TNode("FTO12","FTO12","S_TOF1",306.4029,200.183,175,"rot503");
+  Node = new TNode("FTO111","FTO111","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-175,"rot502");
   Node->SetLineColor(kColorTOF);
   fNodes->Add(Node); 
   //
-  Top->cd();  
-  Node = new TNode("FTO13","FTO13","S_TOF1",354.8005,89.84769,175,"rot504");
-  Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node);
   //
   Top->cd();
-  Node = new TNode("FTO14","FTO14","S_TOF1",364.7499,-30.22407,175,"rot505");
+  ang=1.75*angle;
+  Node = new TNode("FTO12","FTO12","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),175,"rot503");
   Node->SetLineColor(kColorTOF);
   fNodes->Add(Node); 
   //
   Top->cd();
-  Node = new TNode("FTO15","FTO15","S_TOF1",335.173,-147.0205,175,"rot506");
+  Node = new TNode("FTO112","FTO112","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-175,"rot503");
   Node->SetLineColor(kColorTOF);
   fNodes->Add(Node); 
   //
+  //
   Top->cd();  
-  Node = new TNode("FTO16","FTO16","S_TOF1",-335.1731,-147.0205,175,"rot513");
+  ang=0.75*angle;
+  Node = new TNode("FTO13","FTO13","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),175,"rot504");
   Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node); 
+  fNodes->Add(Node);
   //
   Top->cd();
-  Node = new TNode("FTO17","FTO17","S_TOF1",-364.7499,-30.22407,175,"rot514");
+  Node = new TNode("FTO113","FTO113","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-175,"rot504");
   Node->SetLineColor(kColorTOF);
   fNodes->Add(Node); 
   //
+  //
   Top->cd();
-  Node = new TNode("FTO18","FTO18","S_TOF1",-354.8005,89.84778,175,"rot515");
+  ang=-0.25*angle;
+  Node = new TNode("FTO14","FTO14","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),175,"rot505");
   Node->SetLineColor(kColorTOF);
   fNodes->Add(Node); 
   //
   Top->cd();
-  Node = new TNode("FTO19","FTO19","S_TOF1",-306.4029,200.183,175,"rot516");
+  Node = new TNode("FTO114","FTO114","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-175,"rot505");
   Node->SetLineColor(kColorTOF);
   fNodes->Add(Node); 
   //
+  //
   Top->cd();
-  Node = new TNode("FTO110","FTO110","S_TOF1",-224.8019,288.8254,175,"rot517");
+  ang=-1.25*angle;
+  Node = new TNode("FTO15","FTO15","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),175,"rot506");
   Node->SetLineColor(kColorTOF);
   fNodes->Add(Node); 
   //
   Top->cd();
-  Node = new TNode("FTO111","FTO111","S_TOF1",224.8018,288.8254,-175,"rot502");
+  Node = new TNode("FTO115","FTO115","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-175,"rot506");
+  Node->SetLineColor(kColorTOF);
+  fNodes->Add(Node); 
+  //
+  //
+  Top->cd();  
+  ang=kPI+1.25*angle;
+  Node = new TNode("FTO16","FTO16","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),175,"rot513");
   Node->SetLineColor(kColorTOF);
   fNodes->Add(Node); 
   //
   Top->cd();
-  Node = new TNode("FTO112","FTO112","S_TOF1",306.4029,200.183,-175,"rot503");
+  Node = new TNode("FTO116","FTO116","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-175,"rot513");
   Node->SetLineColor(kColorTOF);
   fNodes->Add(Node); 
   //
+  //
   Top->cd();
-  Node = new TNode("FTO113","FTO113","S_TOF1",354.8005,89.84769,-175,"rot504");
+  ang=kPI+0.25*angle;
+  Node = new TNode("FTO17","FTO17","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),175,"rot514");
   Node->SetLineColor(kColorTOF);
   fNodes->Add(Node); 
   //
   Top->cd();
-  Node = new TNode("FTO114","FTO114","S_TOF1",364.7499,-30.22407,-175,"rot505");
+  Node = new TNode("FTO117","FTO117","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-175,"rot514");
   Node->SetLineColor(kColorTOF);
   fNodes->Add(Node); 
   //
+  //
   Top->cd();
-  Node = new TNode("FTO115","FTO115","S_TOF1",335.173,-147.0205,-175,"rot506");
+  ang=kPI-0.75*angle;
+  Node = new TNode("FTO18","FTO18","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),175,"rot515");
   Node->SetLineColor(kColorTOF);
   fNodes->Add(Node); 
   //
   Top->cd();
-  Node = new TNode("FTO116","FTO116","S_TOF1",-335.1731,-147.0205,-175,"rot513");
+  Node = new TNode("FTO118","FTO118","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-175,"rot515");
   Node->SetLineColor(kColorTOF);
   fNodes->Add(Node); 
   //
+  //
   Top->cd();
-  Node = new TNode("FTO117","FTO117","S_TOF1",-364.7499,-30.22407,-175,"rot514");
+  ang=kPI-1.75*angle;
+  Node = new TNode("FTO19","FTO19","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),175,"rot516");
   Node->SetLineColor(kColorTOF);
   fNodes->Add(Node); 
   //
   Top->cd();
-  Node = new TNode("FTO118","FTO118","S_TOF1",-354.8005,89.84778,-175,"rot515");
+  Node = new TNode("FTO119","FTO119","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-175,"rot516");
   Node->SetLineColor(kColorTOF);
   fNodes->Add(Node); 
   //
+  //
   Top->cd();
-  Node = new TNode("FTO119","FTO119","S_TOF1",-306.4029,200.183,-175,"rot516");
+  ang=kPI-2.75*angle;
+  Node = new TNode("FTO110","FTO110","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),175,"rot517");
   Node->SetLineColor(kColorTOF);
   fNodes->Add(Node); 
   //
   Top->cd();
-  Node = new TNode("FTO120","FTO120","S_TOF1",-224.8019,288.8254,-175,"rot517");
+  Node = new TNode("FTO120","FTO120","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-175,"rot517");
   Node->SetLineColor(kColorTOF);
   fNodes->Add(Node);
   //
   // Define second TOF volume
-  new TBRIK("S_TOF2","TOF box","void",60.,6.,100.);
+  new TBRIK("S_TOF2","TOF box","void",xtof,6.,100.);
   //
   // Position the volume
   Top->cd();
-  Node = new TNode("FTO21","FTO21","S_TOF2",269.275,-247.885,250,"rot507");
+  ang=-2.25*angle;
+  Node = new TNode("FTO21","FTO21","S_TOF2",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),250,"rot507");
   Node->SetLineColor(kColorTOF);
   fNodes->Add(Node); 
   //
   Top->cd();
-  Node = new TNode("FTO22","FTO22","S_TOF2",174.1967,-321.8874,250,"rot508");
+  Node = new TNode("FTO27","FTO27","S_TOF2",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-250,"rot507");
   Node->SetLineColor(kColorTOF);
   fNodes->Add(Node); 
   //
+  //
   Top->cd();
-  Node = new TNode("FTO23","FTO23","S_TOF2",60.24158,-361.0082,250,"rot509");
+  ang=-3.25*angle;
+  Node = new TNode("FTO22","FTO22","S_TOF2",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),250,"rot508");
   Node->SetLineColor(kColorTOF);
   fNodes->Add(Node); 
   //
   Top->cd();
-  Node = new TNode("FTO24","FTO24","S_TOF2",-60.24168,-361.0082,250,"rot510");
+  Node = new TNode("FTO28","FTO28","S_TOF2",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-250,"rot508");
   Node->SetLineColor(kColorTOF);
   fNodes->Add(Node); 
   //
+  //
   Top->cd();
-  Node = new TNode("FTO25","FTO25","S_TOF2",-174.1967,-321.8874,250,"rot511");
+  ang=-4.25*angle;
+  Node = new TNode("FTO23","FTO23","S_TOF2",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),250,"rot509");
   Node->SetLineColor(kColorTOF);
   fNodes->Add(Node); 
   //
   Top->cd();
-  Node = new TNode("FTO26","FTO26","S_TOF2",-269.275,-247.885,250,"rot512");
+  Node = new TNode("FTO29","FTO29","S_TOF2",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-250,"rot509");
   Node->SetLineColor(kColorTOF);
   fNodes->Add(Node); 
   //
+  //
   Top->cd();
-  Node = new TNode("FTO27","FTO27","S_TOF2",269.275,-247.885,-250,"rot507");
+  ang=kPI+4.25*angle;
+  Node = new TNode("FTO24","FTO24","S_TOF2",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),250,"rot510");
   Node->SetLineColor(kColorTOF);
   fNodes->Add(Node); 
   //
   Top->cd();
-  Node = new TNode("FTO28","FTO28","S_TOF2",174.1967,-321.8874,-250,"rot508");
+  Node = new TNode("FTO210","FTO210","S_TOF2",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-250,"rot510");
   Node->SetLineColor(kColorTOF);
   fNodes->Add(Node); 
   //
+  //
   Top->cd();
-  Node = new TNode("FTO29","FTO29","S_TOF2",60.24158,-361.0082,-250,"rot509");
+  ang=kPI+3.25*angle;
+  Node = new TNode("FTO25","FTO25","S_TOF2",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),250,"rot511");
   Node->SetLineColor(kColorTOF);
   fNodes->Add(Node); 
   //
   Top->cd();
-  Node = new TNode("FTO210","FTO210","S_TOF2",-60.24168,-361.0082,-250,"rot510");
+  Node = new TNode("FTO211","FTO211","S_TOF2",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-250,"rot511");
   Node->SetLineColor(kColorTOF);
   fNodes->Add(Node); 
   //
+  //
   Top->cd();
-  Node = new TNode("FTO211","FTO211","S_TOF2",-174.1967,-321.8874,-250,"rot511");
+  ang=kPI+2.25*angle;
+  Node = new TNode("FTO26","FTO26","S_TOF2",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),250,"rot512");
   Node->SetLineColor(kColorTOF);
   fNodes->Add(Node); 
   //
   Top->cd();
-  Node = new TNode("FTO212","FTO212","S_TOF2",-269.275,-247.885,-250,"rot512");
+  Node = new TNode("FTO212","FTO212","S_TOF2",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-250,"rot512");
   Node->SetLineColor(kColorTOF);
   fNodes->Add(Node); 
   //
   // Define third TOF volume
-  new TBRIK("S_TOF3","TOF box","void",60.,6.,75.);
+  new TBRIK("S_TOF3","TOF box","void",xtof,6.,75.);
   //
   // Position it
   Top->cd();
-  Node = new TNode("FTO31","FTO31","S_TOF3",118.84,346.1691,275,"rot501");
+  ang=3.75*angle;
+  Node = new TNode("FTO31","FTO31","S_TOF3",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),275,"rot501");
   Node->SetLineColor(kColorTOF);
   fNodes->Add(Node); 
   //
   Top->cd();
-  Node = new TNode("FTO32","FTO32","S_TOF3",-118.8399,346.1691,275,"rot518");
+  Node = new TNode("FTO34","FTO34","S_TOF3",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-275.,"rot501");
   Node->SetLineColor(kColorTOF);
   fNodes->Add(Node); 
   //
+  //
   Top->cd();
-  Node = new TNode("FTO33","FTO33","S_TOF3",0.,366.,275.,"rot519");
+  ang=kPI-3.75*angle;
+  Node = new TNode("FTO32","FTO32","S_TOF3",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),275,"rot518");
   Node->SetLineColor(kColorTOF);
   fNodes->Add(Node); 
   //
   Top->cd();
-  Node = new TNode("FTO34","FTO34","S_TOF3",118.84,346.1691,-275.,"rot501");
+  Node = new TNode("FTO35","FTO35","S_TOF3",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-275,"rot518");
   Node->SetLineColor(kColorTOF);
   fNodes->Add(Node); 
   //
+  //
   Top->cd();
-  Node = new TNode("FTO35","FTO35","S_TOF3",-118.8399,346.1691,-275,"rot518");
+  ang=kPI/2;
+  Node = new TNode("FTO33","FTO33","S_TOF3",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),275.,"rot519");
   Node->SetLineColor(kColorTOF);
   fNodes->Add(Node); 
   //
   Top->cd();
-  Node = new TNode("FTO36","FTO36","S_TOF3",0.,366.,-275.,"rot519");
+  Node = new TNode("FTO36","FTO36","S_TOF3",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-275.,"rot519");
   Node->SetLineColor(kColorTOF);
   fNodes->Add(Node); 
 }
@@ -356,8 +398,8 @@ void AliTOF::CreateGeometry()
   phos_max = (phos_phi * 4. + kPi) * kRaddeg;
   //
   // barrel radius in module contact point 
-  par[0] = 355.;
-  par[1] = 385.;
+  par[0] = 370;
+  par[1] = 390;
   par[2] = zl / 2.;
   pMC->Gsvolu("FBAR", "TUBE", idtmed[500], par, 3);
   //
@@ -393,7 +435,7 @@ void AliTOF::CreateGeometry()
   TOFpc(xm, ym, zm0, zm1, zm2);
   //
   //rp1 = 382.;
-  rp2 = 366.;
+  rp2 = 381;
   fil_step = 360. / lmax;
   fil_min = phos_min - fil_step * .5;
   fil_max = phos_max + fil_step * .5;
index 2b296de..3e613b5 100644 (file)
 
 #include "AliTOFv0.h"
 #include "AliRun.h"
-#include "AliMC.h"
 #include "AliConst.h"
   
 ClassImp(AliTOFv0)
  
 //_____________________________________________________________________________
-AliTOFv0::AliTOFv0() : AliTOF()
+AliTOFv0::AliTOFv0()
 {
   //
   // Default constructor
@@ -63,8 +62,10 @@ void AliTOFv0::CreateGeometry()
   Int_t *idtmed = gAlice->Idtmed();
   //
   // barrel size along Z axis 
-  rp1 = 360.;
-  rp2 = 372.;
+  //  rp1 = 360.;
+  // rp2 = 372.;
+  rp1 = 370;
+  rp2 = rp1 + 12;
   zl  = 720.;
   //
   // TOF width along radius of barrel 
index e7ffd04..708d16e 100644 (file)
 
 #include "AliTOFv1.h"
 #include "AliRun.h"
-#include "AliMC.h"
 #include "AliConst.h"
  
 ClassImp(AliTOFv1)
  
 //_____________________________________________________________________________
-AliTOFv1::AliTOFv1() : AliTOF()
+AliTOFv1::AliTOFv1()
 {
   //
   // Default constructor
@@ -63,8 +62,12 @@ void AliTOFv1::CreateGeometry()
   Int_t *idtmed = gAlice->Idtmed();
   //
   // barrel size along Z axis 
-  rp1 = 360.;
-  rp2 = 372.;
+  //
+  // Temporary fix TOF people should really check this!!
+  //  rp1 = 360.;
+  // rp2 = 372.;
+  rp1 = 370;
+  rp2 = rp1 + 12;
   zl  = 720.;
   //
   // TOF width along radius of barrel 
index 73369df..84d0533 100644 (file)
 ///////////////////////////////////////////////////////////////////////////////
 
 #include "AliTOFv2.h"
-#include <TNode.h>
-#include <TTUBE.h>
 #include "AliRun.h"
-#include "AliMC.h"
 #include "AliConst.h"
  
 ClassImp(AliTOFv2)
  
 //_____________________________________________________________________________
-AliTOFv2::AliTOFv2() : AliTOF()
+AliTOFv2::AliTOFv2()
 {
   //
   // Default constructor