X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=TOF%2FAliTOFv3.cxx;h=4c871b3bf6810bc888525ea122714ca0fbb7181b;hb=773aff84eae2782e3e24e55c39d9546dfe1c0ca9;hp=b9a0efc9d34cfa25c41960f9a27382805b689b82;hpb=4c475d270bc4db4b33ee441ca06c5d5194788e8c;p=u%2Fmrichter%2FAliRoot.git
diff --git a/TOF/AliTOFv3.cxx b/TOF/AliTOFv3.cxx
index b9a0efc9d34..4c871b3bf68 100644
--- a/TOF/AliTOFv3.cxx
+++ b/TOF/AliTOFv3.cxx
@@ -13,119 +13,51 @@
* provided "as is" without express or implied warranty. *
**************************************************************************/
-/*
-$Log$
-Revision 1.30 2002/10/22 14:26:28 alibrary
-Introducing Riostream.h
-
-Revision 1.29 2002/10/14 14:57:42 hristov
-Merging the VirtualMC branch to the main development branch (HEAD)
-
-Revision 1.25.6.3 2002/07/25 06:24:28 alibrary
-Updating TOF on VirtualMC
-
-Revision 1.28 2002/07/24 16:13:56 vicinanz
-Fixed bub in BuildGeometry
-
-Revision 1.27 2002/06/24 14:09:12 vicinanz
-review on materials and
-
-Revision 1.26 2002/05/08 13:24:50 vicinanz
-AliTOFanalyzeMatching.C macro added and minor changes to the AliTOF code
-
-Revision 1.25 2001/11/22 11:22:51 hristov
-Updated version of TOF digitization, N^2 problem solved (J.Chudoba)
-
-Revision 1.23 2001/09/27 10:39:20 vicinanz
-SDigitizer and Merger added
-
-Revision 1.22 2001/09/20 15:54:22 vicinanz
-Updated Strip Structure (Double Stack)
-
-Revision 1.21 2001/08/28 08:45:59 vicinanz
-TTask and TFolder structures implemented
-
-Revision 1.20 2001/05/16 14:57:24 alibrary
-New files for folders and Stack
-
-Revision 1.19 2001/05/04 10:09:48 vicinanz
-Major upgrades to the strip structure
-
-Revision 1.18 2000/12/04 08:48:20 alibrary
-Fixing problems in the HEAD
-
-Revision 1.17 2000/10/02 21:28:17 fca
-Removal of useless dependecies via forward declarations
-
-Revision 1.16 2000/05/10 16:52:18 vicinanz
-New TOF version with holes for PHOS/RICH
-
-Revision 1.14.2.1 2000/05/10 09:37:16 vicinanz
-New version with Holes for PHOS/RICH
-
-Revision 1.14 1999/11/05 22:39:06 fca
-New hits structure
-
-Revision 1.13 1999/11/02 11:26:39 fca
-added stdlib.h for exit
-
-Revision 1.12 1999/11/01 20:41:57 fca
-Added protections against using the wrong version of FRAME
-
-Revision 1.11 1999/10/22 08:04:14 fca
-Correct improper use of negative parameters
-
-Revision 1.10 1999/10/16 19:30:06 fca
-Corrected Rotation Matrix and CVS log
-
-Revision 1.9 1999/10/15 15:35:20 fca
-New version for frame1099 with and without holes
-
-Revision 1.8 1999/09/29 09:24:33 fca
-Introduction of the Copyright and cvs Log
-
-*/
+/* $Id$ */
///////////////////////////////////////////////////////////////////////////////
-//
+// //
// This class contains the functions for version 3 of the Time Of Flight //
// detector. //
-//
-// VERSION WITH 5 MODULES AND TILTED STRIPS
-// HITS DEFINED FOR THIS VERSION
-// HOLES FOR RICH DETECTOR
-//
-// Authors:
-//
-// Alessio Seganti
-// Domenico Vicinanza
-//
-// University of Salerno - Italy
-//
-// Fabrizio Pierella
-// University of Bologna - Italy
-//
-//
-//Begin_Html
-/*
-
-*/
-//End_Html
+// //
+// VERSION WITH 5 MODULES AND TILTED STRIPS //
+// HITS DEFINED FOR THIS VERSION //
+// HOLES FOR HMPID DETECTOR //
+// //
+// Authors: //
+// //
+// Alessio Seganti //
+// Domenico Vicinanza //
+// //
+// University of Salerno - Italy //
+// //
+// Fabrizio Pierella //
+// University of Bologna - Italy //
+// //
+// //
+//Begin_Html //
+/* //
+ //
+*/ //
+//End_Html //
// //
///////////////////////////////////////////////////////////////////////////////
#include
#include
-#include "AliTOFv3.h"
-#include "TBRIK.h"
-#include "TGeometry.h"
-#include "TNode.h"
+#include
+#include
#include
-#include "TObject.h"
-#include "AliRun.h"
-#include "AliConst.h"
+#include
+#include
+#include
+#include "AliConst.h"
+#include "AliRun.h"
+#include "AliTOFv3.h"
+#include "AliTOFConstants.h" // AdC
+#include "AliMC.h"
ClassImp(AliTOFv3)
@@ -186,7 +118,7 @@ void AliTOFv3::BuildGeometry()
Float_t zOffsetA = 0.;
// Define TOF basic volume
- char nodeName0[7], nodeName1[7], nodeName2[7];
+ char nodeName0[7], nodeName1[7], nodeName2[7];
char nodeName3[7], nodeName4[7], rotMatNum[7];
new TBRIK("S_TOF_C","TOF box","void",
@@ -221,32 +153,32 @@ void AliTOFv3::BuildGeometry()
top->cd();
node = new TNode(nodeName0,nodeName0,"S_TOF_C",krTof*TMath::Cos(ang),krTof*TMath::Sin(ang),zOffsetC,rotMatNum);
node->SetLineColor(kColorTOF);
- fNodes->Add(node);
+ fNodes->Add(node);
- top->cd();
+ top->cd();
node = new TNode(nodeName1,nodeName1,"S_TOF_C",krTof*TMath::Cos(ang),krTof*TMath::Sin(ang),-zOffsetC,rotMatNum);
node->SetLineColor(kColorTOF);
- fNodes->Add(node);
+ fNodes->Add(node);
if (nodeNum !=1 && nodeNum!=17 && nodeNum !=18)
{
top->cd();
node = new TNode(nodeName2,nodeName2,"S_TOF_B",krTof*TMath::Cos(ang),krTof*TMath::Sin(ang),zOffsetB,rotMatNum);
node->SetLineColor(kColorTOF);
- fNodes->Add(node);
+ fNodes->Add(node);
top->cd();
node = new TNode(nodeName3,nodeName3,"S_TOF_B",krTof*TMath::Cos(ang),krTof*TMath::Sin(ang),-zOffsetB,rotMatNum);
node->SetLineColor(kColorTOF);
- fNodes->Add(node);
- } // Holes for RICH detector
+ fNodes->Add(node);
+ } // Holes for HMPID detector
if (nodeNum !=1 && nodeNum !=17 && nodeNum !=18)
{
top->cd();
node = new TNode(nodeName4,nodeName4,"S_TOF_A",krTof*TMath::Cos(ang),krTof*TMath::Sin(ang),zOffsetA,rotMatNum);
node->SetLineColor(kColorTOF);
- fNodes->Add(node);
- } // Holes for RICH detector, central part
+ fNodes->Add(node);
+ } // Holes for HMPID detector, central part
}
}
@@ -387,7 +319,7 @@ void AliTOFv3::TOFpc(Float_t xtof, Float_t ytof, Float_t zlenC,
Float_t stripWidth = zSenStrip + 2*kdeadBound;
par[0] = xFLT*0.5;
- par[1] = yPad*0.5;
+ par[1] = yPad*0.5;
par[2] = stripWidth*0.5;
// new description for strip volume -double stack strip-
@@ -414,7 +346,7 @@ void AliTOFv3::TOFpc(Float_t xtof, Float_t ytof, Float_t zlenC,
Float_t parfp[3]={klstripx*0.5,khstripy*0.5,kwstripz*0.5};
// coordinates of the strip center in the strip reference frame; used for positioning
// internal strip volumes
- Float_t posfp[3]={0.,0.,0.};
+ Float_t posfp[3]={0.,0.,0.};
// FSTR volume definition and filling this volume with non sensitive Gas Mixture
@@ -446,7 +378,7 @@ void AliTOFv3::TOFpc(Float_t xtof, Float_t ytof, Float_t zlenC,
parfp[1] = khmyly*0.5;
gMC->Gsvolu("FMYL","BOX",idtmed[511],parfp,3);
// positioning 2 MYLAR Layers on FSTR volume
- posfp[1] = -khstripy*0.5+khhony+khpcby+parfp[1];
+ posfp[1] = -khstripy*0.5+khhony+khpcby+parfp[1];
gMC->Gspos("FMYL",1,"FSTR",0., posfp[1],0.,0,"ONLY");
gMC->Gspos("FMYL",2,"FSTR",0.,-posfp[1],0.,0,"ONLY");
// adding further 2 MYLAR Layers on FSTR volume
@@ -499,7 +431,7 @@ void AliTOFv3::TOFpc(Float_t xtof, Float_t ytof, Float_t zlenC,
gMC->Gsdvn("FSEX","FSEZ",knx,1);
// FPAD volume definition
- parfp[0] = klpadx*0.5;
+ parfp[0] = klpadx*0.5;
parfp[1] = khsensmy*0.5;
parfp[2] = kwpadz*0.5;
gMC->Gsvolu("FPAD","BOX",idtmed[513],parfp,3);
@@ -515,36 +447,42 @@ void AliTOFv3::TOFpc(Float_t xtof, Float_t ytof, Float_t zlenC,
Float_t gap = fGapA+0.5; //cm updated distance between the strip axis
Float_t zpos = 0;
Float_t ang = 0;
- Int_t i=1,j=1;
+ Int_t j=1; // AdC
nrot = 0;
zcoor = 0;
ycoor = -14.5 + kspace ; //2 cm over front plate
- AliMatrix (idrotm[0], 90., 0.,90.,90.,0., 90.);
- gMC->Gspos("FSTR",j,"FLTA",0.,ycoor, 0.,idrotm[0],"ONLY");
- if(fDebug) {
- printf("%s: %f, St. %2i, Pl.3 ",ClassName(),ang*kRaddeg,i);
+ AliMatrix (idrotm[0], 90., 0.,90.,90.,0., 90.);
+
+ Int_t centerLoc= (Int_t)(fNStripA/2.) + 1; // AdC
+
+ //gMC->Gspos("FSTR",j,"FLTA",0.,ycoor, 0.,idrotm[0],"ONLY");
+ gMC->Gspos("FSTR",centerLoc,"FLTA",0.,ycoor, 0.,idrotm[0],"ONLY"); // AdC
+ if(fDebug>=1) {
+ printf("%s: %f, St. %2i, Pl.3 ",ClassName(),ang*kRaddeg,j); // AdC
printf("y = %f, z = %f, zpos = %f \n",ycoor,zcoor,zpos);
}
zcoor -= zSenStrip;
- j++;
+ //j++; // AdC
Int_t upDown = -1; // upDown=-1 -> Upper strip
- // upDown=+1 -> Lower strip
+ // upDown=+1 -> Lower strip
do{
ang = atan(zcoor/radius);
ang *= kRaddeg;
- AliMatrix (idrotm[nrot], 90., 0.,90.-ang,90.,-ang, 90.);
+ AliMatrix (idrotm[nrot], 90., 0.,90.-ang,90.,-ang, 90.);
AliMatrix (idrotm[nrot+1],90.,180.,90.+ang,90., ang, 90.);
ang /= kRaddeg;
ycoor = -14.5+ kspace; //2 cm over front plate
ycoor += (1-(upDown+1)/2)*gap;
- gMC->Gspos("FSTR",j ,"FLTA",0.,ycoor, zcoor,idrotm[nrot], "ONLY");
- gMC->Gspos("FSTR",j+1,"FLTA",0.,ycoor,-zcoor,idrotm[nrot+1],"ONLY");
- if(fDebug) {
- printf("%s: %f, St. %2i, Pl.3 ",ClassName(),ang*kRaddeg,i);
+ //gMC->Gspos("FSTR",j ,"FLTA",0.,ycoor, zcoor,idrotm[nrot], "ONLY");
+ //gMC->Gspos("FSTR",j+1,"FLTA",0.,ycoor,-zcoor,idrotm[nrot+1],"ONLY");
+ gMC->Gspos("FSTR",centerLoc-j,"FLTA",0.,ycoor, zcoor,idrotm[nrot], "ONLY"); // AdC
+ gMC->Gspos("FSTR",centerLoc+j,"FLTA",0.,ycoor,-zcoor,idrotm[nrot+1],"ONLY"); // AdC
+ if(fDebug>=1) {
+ printf("%s: %f, St. %2i, Pl.3 ",ClassName(),ang*kRaddeg,j); // AdC
printf("y = %f, z = %f, zpos = %f \n",ycoor,zcoor,zpos);
}
- j += 2;
+ j++; //j += 2; // AdC
upDown*= -1; // Alternate strips
zcoor = zcoor-(zSenStrip/2)/TMath::Cos(ang)-
upDown*gap*TMath::Tan(ang)-
@@ -562,24 +500,26 @@ void AliTOFv3::TOFpc(Float_t xtof, Float_t ytof, Float_t zlenC,
ang = atan(zcoor/radius);
ang *= kRaddeg;
- AliMatrix (idrotm[nrot], 90., 0.,90.-ang,90.,-ang, 90.);
+ AliMatrix (idrotm[nrot], 90., 0.,90.-ang,90.,-ang, 90.);
AliMatrix (idrotm[nrot+1],90.,180.,90.+ang,90., ang, 90.);
ang /= kRaddeg;
ycoor = -14.5+ kspace; //2 cm over front plate
ycoor += (1-(upDown+1)/2)*gap;
- gMC->Gspos("FSTR",j ,"FLTA",0.,ycoor, zcoor,idrotm[nrot], "ONLY");
- gMC->Gspos("FSTR",j+1,"FLTA",0.,ycoor,-zcoor,idrotm[nrot+1],"ONLY");
- if(fDebug) {
- printf("%s: %f, St. %2i, Pl.3 ",ClassName(),ang*kRaddeg,i);
- printf("y = %f, z = %f, zpos = %f \n",ycoor,zcoor,zpos);
+ //gMC->Gspos("FSTR",j ,"FLTA",0.,ycoor, zcoor,idrotm[nrot], "ONLY");
+ //gMC->Gspos("FSTR",j+1,"FLTA",0.,ycoor,-zcoor,idrotm[nrot+1],"ONLY");
+ gMC->Gspos("FSTR",centerLoc-j,"FLTA",0.,ycoor, zcoor,idrotm[nrot], "ONLY"); // AdC
+ gMC->Gspos("FSTR",centerLoc+j,"FLTA",0.,ycoor,-zcoor,idrotm[nrot+1],"ONLY"); // AdC
+ if(fDebug>=1) {
+ printf("%s: %f, St. %2i, Pl.3 ",ClassName(),ang*kRaddeg,j); // AdC
+ printf("y = %f, z = %f, zpos = %f \n",ycoor,zcoor,zpos);
}
ycoor = -hTof/2.+ kspace;//2 cm over front plate
// Plate B
nrot = 0;
- i=1;
+ Int_t i=1; // AdC
upDown = 1;
Float_t deadRegion = 1.0;//cm
@@ -596,9 +536,9 @@ void AliTOFv3::TOFpc(Float_t xtof, Float_t ytof, Float_t zlenC,
ycoor += (1-(upDown+1)/2)*gap;
zcoor = zpos+(zFLTA*0.5+zFLTB*0.5+db); // Moves to the system of the modulus FLTB
gMC->Gspos("FSTR",i, "FLTB", 0., ycoor, zcoor,idrotm[nrot], "ONLY");
- if(fDebug) {
- printf("%s: %f, St. %2i, Pl.4 ",ClassName(),ang*kRaddeg,i);
- printf("y = %f, z = %f, zpos = %f \n",ycoor,zcoor,zpos);
+ if(fDebug>=1) {
+ printf("%s: %f, St. %2i, Pl.4 ",ClassName(),ang*kRaddeg,i);
+ printf("y = %f, z = %f, zpos = %f \n",ycoor,zcoor,zpos);
}
i++;
upDown*=-1;
@@ -617,7 +557,7 @@ void AliTOFv3::TOFpc(Float_t xtof, Float_t ytof, Float_t zlenC,
ycoor += (1-(upDown+1)/2)*(gap+deltaGapinB);
zcoor = zpos+(zFLTA*0.5+zFLTB*0.5+db); // Moves to the system of the modulus FLTB
gMC->Gspos("FSTR",i, "FLTB", 0., ycoor, zcoor,idrotm[nrot], "ONLY");
- if(fDebug) {
+ if(fDebug>=1) {
printf("%s: %f, St. %2i, Pl.4 ",ClassName(),ang*kRaddeg,i);
printf("y = %f, z = %f, zpos = %f \n",ycoor,zcoor,zpos);
}
@@ -641,7 +581,7 @@ void AliTOFv3::TOFpc(Float_t xtof, Float_t ytof, Float_t zlenC,
gMC->Gspos("FSTR",i, "FLTB", 0., ycoor+deltaMovingDown+deltaMovingUp, zcoor,idrotm[nrot], "ONLY");
deltaMovingUp+=0.8; // update delta moving toward the end of the plate
zpos = zpos - zSenStrip/TMath::Cos(ang);
- if(fDebug) {
+ if(fDebug>=1) {
printf("%s: %f, St. %2i, Pl.4 ",ClassName(),ang*kRaddeg,i);
printf("y = %f, z = %f, zpos = %f \n",ycoor,zcoor,zpos);
}
@@ -670,7 +610,7 @@ void AliTOFv3::TOFpc(Float_t xtof, Float_t ytof, Float_t zlenC,
ang /= kRaddeg;
zcoor = zpos+(zFLTC*0.5+zFLTB+zFLTA*0.5+db*2);
gMC->Gspos("FSTR",i, "FLTC", 0., ycoor, zcoor,idrotm[nrot], "ONLY");
- if(fDebug) {
+ if(fDebug>=1) {
printf("%s: %f, St. %2i, Pl.5 ",ClassName(),ang*kRaddeg,i);
printf("y = %f, z = %f, zpos = %f \n",ycoor,zcoor,zpos);
}
@@ -769,8 +709,8 @@ void AliTOFv3::TOFpc(Float_t xtof, Float_t ytof, Float_t zlenC,
for (icard=0; icard<19; ++icard) {
cardpos[2]= cardpos[2]+stepforcardB;
aplpos2 = cardpos[2]+0.15;
- gMC->Gspos("FCAR",icard,"FAIB",cardpos[0],cardpos[1],cardpos[2],idrotm[98],"ONLY");
- gMC->Gspos("FALP",icard,"FAIB",cardpos[0],aplpos1,aplpos2,idrotm[98],"ONLY");
+ gMC->Gspos("FCAR",icard,"FAIB",cardpos[0],cardpos[1],cardpos[2],idrotm[98],"ONLY");
+ gMC->Gspos("FALP",icard,"FAIB",cardpos[0],aplpos1,aplpos2,idrotm[98],"ONLY");
}
@@ -780,7 +720,7 @@ void AliTOFv3::TOFpc(Float_t xtof, Float_t ytof, Float_t zlenC,
for (icard=0; icard<20; ++icard) {
cardpos[2]= cardpos[2]+stepforcardC;
aplpos2 = cardpos[2]+0.15;
- gMC->Gspos("FCAR",icard,"FAIC",cardpos[0],cardpos[1],cardpos[2],idrotm[98],"ONLY");
+ gMC->Gspos("FCAR",icard,"FAIC",cardpos[0],cardpos[1],cardpos[2],idrotm[98],"ONLY");
gMC->Gspos("FALP",icard,"FAIC",cardpos[0],aplpos1,aplpos2,idrotm[98],"ONLY");
}
@@ -1086,7 +1026,7 @@ void AliTOFv3::Init()
" TOF "
"**************************************\n",ClassName());
printf("\n%s Version 3 of TOF initialing, "
- "TOF with holes for RICH detector\n",ClassName());
+ "TOF with holes for HMPID detector\n",ClassName());
}
AliTOF::Init();
@@ -1120,17 +1060,17 @@ void AliTOFv3::StepManager()
Int_t *idtmed = fIdtmed->GetArray()-499;
Float_t incidenceAngle;
- if(gMC->GetMedium()==idtmed[513] &&
+ if(gMC->CurrentMedium()==idtmed[513] &&
gMC->IsTrackEntering() && gMC->TrackCharge()
&& gMC->CurrentVolID(copy)==fIdSens)
{
// getting information about hit volumes
padzid=gMC->CurrentVolOffID(2,copy);
- padz=copy;
+ padz=copy;
padxid=gMC->CurrentVolOffID(1,copy);
- padx=copy;
+ padx=copy;
stripid=gMC->CurrentVolOffID(4,copy);
strip=copy;
@@ -1157,19 +1097,30 @@ void AliTOFv3::StepManager()
z = pos[2];
- plate = 0;
- if (TMath::Abs(z) <= fZlenA*0.5) plate = 3;
+ plate = 0;
+ if (TMath::Abs(z) <= fZlenA*0.5) plate = 2; //3; // AdC
if (z < (fZlenA*0.5+fZlenB) &&
- z > fZlenA*0.5) plate = 4;
+ z > fZlenA*0.5) plate = 1; //4; // AdC
if (z >-(fZlenA*0.5+fZlenB) &&
- z < -fZlenA*0.5) plate = 2;
- if (z > (fZlenA*0.5+fZlenB)) plate = 5;
- if (z <-(fZlenA*0.5+fZlenB)) plate = 1;
+ z < -fZlenA*0.5) plate = 3; //2; // AdC
+ if (z > (fZlenA*0.5+fZlenB)) plate = 0; //5; // AdC
+ if (z <-(fZlenA*0.5+fZlenB)) plate = 4; //1; // AdC
+
+ if (plate==0) strip=AliTOFConstants::fgkNStripC-strip; // AdC
+ else if (plate==1) strip=AliTOFConstants::fgkNStripB-strip; // AdC
+ else strip--; // AdC
+
+ if (z<=0.) padx=AliTOFConstants::fgkNpadX-padx; // AdC
+ else padx--; // AdC
+
+ if (plate==3 || plate==4) padz=AliTOFConstants::fgkNpadZ-padz; // AdC
+ else padz--; // AdC
phi = pos.Phi();
- phid = phi*kRaddeg+180.;
+ if (phi>=0.) phid = phi*kRaddeg; //+180.; // AdC
+ else phid = phi*kRaddeg + 360.; // AdC
sector = Int_t (phid/20.);
- sector++;
+ //sector++; // AdC
for(i=0;i<3;++i) {
hits[i] = pos[i];
@@ -1190,6 +1141,6 @@ void AliTOFv3::StepManager()
vol[3]= padx;
vol[4]= padz;
- AddHit(gAlice->CurrentTrack(),vol, hits);
+ AddHit(gAlice->GetMCApp()->GetCurrentTrackNumber(),vol, hits);
}
}