X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=TPC%2FAliTPCv1.cxx;h=af8f9946b9cd78b619faa99723584d074c820218;hb=596a855f140200041a7a9c6af1d4d99d432a34b4;hp=1230694126b27640bed3817ecdfe155c0ffb79dd;hpb=f4900c610468566fa53147830c9417c7e7e997ef;p=u%2Fmrichter%2FAliRoot.git diff --git a/TPC/AliTPCv1.cxx b/TPC/AliTPCv1.cxx index 1230694126b..af8f9946b9c 100644 --- a/TPC/AliTPCv1.cxx +++ b/TPC/AliTPCv1.cxx @@ -13,81 +13,7 @@ * provided "as is" without express or implied warranty. * **************************************************************************/ -/* -$Log$ -Revision 1.26 2001/04/24 11:17:33 kowal2 -New TPC geometry. - -Revision 1.25 2001/03/13 13:07:34 kowal2 -Corrected bug in the TPC mother volume geometry. -Thanks to A. Morsch - -Revision 1.24 2000/11/30 11:48:50 kowal2 -TLorentzVector.h adde to satisfy the latest changes by Federico - -Revision 1.23 2000/11/14 10:48:57 kowal2 -Correct material used for TSA4. Thanks to J. Barbosa. - -Revision 1.22 2000/11/06 17:24:10 kowal2 -Corrected bug in the outer containment vessel and -the outer field cage geometry. -Thanks to J. Barbosa. - -Revision 1.21 2000/11/02 16:55:24 kowal2 -Corrected bug in the inner containment vessel geometry. -Thanks to J. Belikov - -Revision 1.20 2000/11/02 07:24:11 kowal2 -Correction in the TPC geometry. -Changes due to the new hit structure. - -Revision 1.19 2000/07/10 20:57:39 hristov -Update of TPC code and macros by M.Kowalski - -Revision 1.18 2000/06/30 12:07:50 kowal2 -Updated from the TPC-PreRelease branch - -Revision 1.17.2.4 2000/06/26 07:39:42 kowal2 -Changes to obey the coding rules - -Revision 1.17.2.3 2000/06/25 08:38:41 kowal2 -Splitted from AliTPCtracking - -Revision 1.17.2.2 2000/06/16 12:58:13 kowal2 -Changed parameter settings - -Revision 1.17.2.1 2000/06/09 07:15:07 kowal2 - -Defaults loaded automatically (hard-wired) -Optional parameters can be set via macro called in the constructor - -Revision 1.17 2000/05/15 10:00:30 kowal2 -Corrected bug in the TPC geometry, thanks to Ivana Hrivnacova - -Revision 1.16 2000/04/17 09:37:33 kowal2 -removed obsolete AliTPCDigitsDisplay.C - -Revision 1.15.8.2 2000/04/10 08:29:48 kowal2 - -Different pad geometry for different sectors -Updated readouch chambers geometry - -Revision 1.15.8.1 2000/04/10 07:56:53 kowal2 -Not used anymore - removed - -Revision 1.15 1999/11/04 17:28:07 fca -Correct barrel part of HV Degrader - -Revision 1.14 1999/10/08 06:27:23 fca -Corrected bug in the HV degrader geometry, thanks to G.Tabary - -Revision 1.13 1999/10/04 13:39:54 fca -Correct array index problem - -Revision 1.12 1999/09/29 09:24:34 fca -Introduction of the Copyright and cvs Log - -*/ +/* $Id$ */ // /////////////////////////////////////////////////////////////////////////////// @@ -103,24 +29,24 @@ Introduction of the Copyright and cvs Log // // /////////////////////////////////////////////////////////////////////////////// -#include +#include + +#include #include +#include +#include #include -#include #include -#include "AliTPCv1.h" -#include "AliRun.h" -#include -#include -#include "TLorentzVector.h" +#include -#include "AliMC.h" #include "AliConst.h" - +#include "AliRun.h" +#include "AliTPCDigitsArray.h" #include "AliTPCParam.h" #include "AliTPCParamSR.h" -#include "AliTPCDigitsArray.h" -#include +#include "AliTPCv1.h" +#include "TLorentzVector.h" +#include "AliMC.h" ClassImp(AliTPCv1) @@ -187,7 +113,7 @@ void AliTPCv1::CreateGeometry() // dm[3]=-283.7; - dm[4]=65.6; + dm[4]=77.017; dm[5]=278.; // @@ -229,7 +155,7 @@ void AliTPCv1::CreateGeometry() // dm[24]=283.7; - dm[25]=65.6; + dm[25]=77.017; dm[26]=278.; gMC->Gsvolu("TPC ","PCON",idtmed[0],dm,27); @@ -306,13 +232,13 @@ void AliTPCv1::CreateGeometry() // dm[9]=-247.6; - dm[10]=274.81; + dm[10]=274.8124; dm[11]=278.; // dm[12]=253.6; - dm[13]=274.81; + dm[13]=274.8124; dm[14]=278.; // @@ -333,7 +259,7 @@ void AliTPCv1::CreateGeometry() // Tpc SAndwich 1 - Al - dm[0]=274.81; + dm[0]=274.8124; dm[1]=278.; dm[2]=252.1; @@ -356,8 +282,8 @@ void AliTPCv1::CreateGeometry() // Tpc SAndwich 4 - fiber glass (G10) - dm[0] += 5.e-3; - dm[1] -= 5.e-3; + dm[0] += 3.8e-3; + dm[1] -= 3.8e-3; gMC->Gsvolu("TSA4","TUBE",idtmed[12],dm,3); @@ -407,25 +333,25 @@ void AliTPCv1::CreateGeometry() dm[9]=-250.6; dm[10]=258.; - dm[11]=260.05; + dm[11]=260.0476; // dm[12]=250.6; dm[13]=258.; - dm[14]=260.05; + dm[14]=260.0476; // dm[15]=250.6; dm[16]=258.; - dm[17]=275.5; + dm[17]=269.6; // dm[18]=253.6; dm[19]=258.; - dm[20]=275.5; + dm[20]=269.6; gMC->Gsvolu("TOFC","PCON",idtmed[4],dm,21); @@ -434,15 +360,15 @@ void AliTPCv1::CreateGeometry() // Tpc SAndwich 6 - Tedlar dm[0]= 258.; - dm[1]= 260.05; + dm[1]= 260.0476; dm[2]= 252.1; gMC->Gsvolu("TSA6","TUBE",idtmed[9],dm,3); // Tpc SAndwich 7 - fiber glass - dm[0] += 5.e-3; - dm[1] -= 5.e-3; + dm[0] += 3.8e-3; + dm[1] -= 3.8e-3; gMC->Gsvolu("TSA7","TUBE",idtmed[12],dm,3); @@ -539,37 +465,37 @@ void AliTPCv1::CreateGeometry() // dm[9]=-250.6; - dm[10]=77.05; + dm[10]=77.0524; dm[11]=79.2; // dm[12]=-88.; - dm[13]=77.05; + dm[13]=77.0524; dm[14]=79.2; // dm[15]=-88.; - dm[16]=77.09; + dm[16]=77.0924; dm[17]=79.16; // dm[18]=88.; - dm[19]=77.09; + dm[19]=77.0924; dm[20]=79.16; // dm[21]=88.; - dm[22]=77.05; + dm[22]=77.0524; dm[23]=79.2; // dm[24]=250.6; - dm[25]=77.05; + dm[25]=77.0524; dm[26]=79.2; // @@ -590,7 +516,7 @@ void AliTPCv1::CreateGeometry() // Tpc Sandwich 9 -Tedlar - dm[0]=77.09; + dm[0]=77.0924; dm[1]=79.16; dm[2]=88.; @@ -598,8 +524,8 @@ void AliTPCv1::CreateGeometry() // Tpc Sandwich 10 - fiber glass (G10) - dm[0] += 5.e-3; - dm[1] -= 5.e-3; + dm[0] += 3.8e-3; + dm[1] -= 3.8e-3; gMC->Gsvolu("TS10","TUBE",idtmed[12],dm,3); @@ -621,7 +547,7 @@ void AliTPCv1::CreateGeometry() // Tpc Sandwich 12 -Tedlar - dm[0]=77.05; + dm[0]=77.0524; dm[1]=79.2; dm[2]=82.05; @@ -629,8 +555,8 @@ void AliTPCv1::CreateGeometry() // Tpc Sandwich 13 - fiber glass (G10) - dm[0] += 5.e-3; - dm[1] -= 5.e-3; + dm[0] += 3.8e-3; + dm[1] -= 3.8e-3; gMC->Gsvolu("TS13","TUBE",idtmed[12],dm,3); @@ -755,13 +681,13 @@ void AliTPCv1::CreateGeometry() // dm[9]=-69.1; - dm[10]=60.64; + dm[10]=60.6224; dm[11]=61.2; // dm[12]=69.1; - dm[13]=60.64; + dm[13]=60.6224; dm[14]=61.2; // @@ -780,7 +706,7 @@ void AliTPCv1::CreateGeometry() // Tpc Sandwich 15 - Al - dm[0]=60.64; + dm[0]=60.6224; dm[1]=61.2; dm[2]=70.1; @@ -800,19 +726,19 @@ void AliTPCv1::CreateGeometry() gMC->Gsvolu("TS17","TUBE",idtmed[9],dm,3); - // Tpc Sandwich 18 - fiber glass + // Tpc Sandwich 18 - carbon fiber - dm[0] += 5.e-3; - dm[1] -= 5.e-3; + dm[0] += 3.8e-3; + dm[1] -= 3.8e-3; - gMC->Gsvolu("TS18","TUBE",idtmed[12],dm,3); + gMC->Gsvolu("TS18","TUBE",idtmed[15],dm,3); // Tpc Sandwich 19 - Nomex - dm[0] += 0.01; - dm[1] -= 0.01; + dm[0] += 0.02; + dm[1] -= 0.02; - gMC->Gsvolu("TS19","TUBE",idtmed[12],dm,3); + gMC->Gsvolu("TS19","TUBE",idtmed[6],dm,3); // 19->18->17->16->15-> TICM @@ -1781,7 +1707,9 @@ void AliTPCv1::Init() fIdLSec=gMC->VolId("TPLS"); // lower sector fIdUSec=gMC->VolId("TPUS"); // upper sector - printf("TPC version 1 initialized\n"); + printf("%s: *** TPC version 1 initialized***\n",ClassName()); + + // printf("TPC version 1 initialized\n"); } //_____________________________________________________________________________ @@ -1839,27 +1767,27 @@ void AliTPCv1::StepManager() hits[1]=p[1]; hits[2]=p[2]; hits[3]=0.; // this hit has no energy loss - // new(lhits[fNhits++]) AliTPChit(fIshunt,gAlice->CurrentTrack(),vol,hits); + // new(lhits[fNhits++]) AliTPChit(fIshunt,gAlice->GetCurrentTrackNumber(),vol,hits); - AddHit(gAlice->CurrentTrack(), vol,hits); // M.I. + AddHit(gAlice->GetMCApp()->GetCurrentTrackNumber(), vol,hits); // M.I. gMC->TrackPosition(p); hits[0]=p[0]; hits[1]=p[1]; hits[2]=p[2]; hits[3]=0.; // this hit has no energy loss - // new(lhits[fNhits++]) AliTPChit(fIshunt,gAlice->CurrentTrack(),vol,hits); + // new(lhits[fNhits++]) AliTPChit(fIshunt,gAlice->GetCurrentTrackNumber(),vol,hits); - AddHit(gAlice->CurrentTrack(), vol,hits); // M.I. + AddHit(gAlice->GetMCApp()->GetCurrentTrackNumber(), vol,hits); // M.I. } gMC->TrackPosition(p); for(i=0;i<3;++i) hits[i]=p[i]; hits[3]=1; //I'd like to have something positive here (I.Belikov) - // new(lhits[fNhits++]) AliTPChit(fIshunt,gAlice->CurrentTrack(),vol,hits); + // new(lhits[fNhits++]) AliTPChit(fIshunt,gAlice->GetCurrentTrackNumber(),vol,hits); - AddHit(gAlice->CurrentTrack(), vol,hits); // M.I. + AddHit(gAlice->GetMCApp()->GetCurrentTrackNumber(), vol,hits); // M.I. }