#include "TGeoVolume.h"
#include "TGeoPcon.h"
#include "TGeoTube.h"
+#include "TGeoCone.h"
#include "TGeoPgon.h"
#include "TGeoTrd1.h"
#include "TGeoCompositeShape.h"
#include "TGeoPhysicalNode.h"
#include "TGeoHalfSpace.h"
#include "TTreeStream.h"
+#include "TGeoArb8.h"
+using std::ifstream;
+using std::ios_base;
ClassImp(AliTPCv2)
//_____________________________________________________________________________
// here I define a volume TPC
// retrive the medium name with "TPC_" as a leading string
//
- TGeoPcon *tpc = new TGeoPcon(0.,360.,24); //24 sections
+ TGeoPcon *tpc = new TGeoPcon(0.,360.,30); //30 sections
//
- tpc->DefineSection(0,-291.,77.,278.);
- tpc->DefineSection(1,-270,77.,278.);
+ tpc->DefineSection(0,-289.6,77.,278.);
+ tpc->DefineSection(1,-262.1,77.,278.);
//
- tpc->DefineSection(2,-270.,77.,278.);
- tpc->DefineSection(3,-259.6,70.,278.);
+ tpc->DefineSection(2,-262.1,83.1,278.);
+ tpc->DefineSection(3,-260.,83.1,278.);
//
- tpc->DefineSection(4,-259.6,68.1,278.);
- tpc->DefineSection(5,-253.6,68.1,278.);
+ tpc->DefineSection(4,-260.,70.,278.);
+ tpc->DefineSection(5,-259.6,70.,278.);
//
- tpc->DefineSection(6,-253.6,68.,278.);
- tpc->DefineSection(7,-74.0,60.8,278.);
+ tpc->DefineSection(6,-259.6,68.1,278.);
+ tpc->DefineSection(7,-253.6,68.1,278.);
//
- tpc->DefineSection(8,-74.0,60.1,278.);
- tpc->DefineSection(9,-73.3,60.1,278.);
+ tpc->DefineSection(8,-253.6,67.88,278.);//hs
+ tpc->DefineSection(9,-74.0,60.68,278.);// hs
//
- tpc->DefineSection(10,-73.3,56.9,278.);
- tpc->DefineSection(11,-68.5,56.9,278.);
+ tpc->DefineSection(10,-74.0,60.1,278.);
+ tpc->DefineSection(11,-73.3,60.1,278.);
//
- tpc->DefineSection(12,-68.5,60.,278.);
- tpc->DefineSection(13,-65.,60.,278.);
+ tpc->DefineSection(12,-73.3,56.9,278.);
+ tpc->DefineSection(13,-68.5,56.9,278.);
//
- tpc->DefineSection(14,-65.,56.9,278.);
- tpc->DefineSection(15,73.3,56.9,278.);
+ tpc->DefineSection(14,-68.5,60.,278.);
+ tpc->DefineSection(15,-64.7,60.,278.);
//
- tpc->DefineSection(16,73.3,60.1,278.);
- tpc->DefineSection(17,74.0,60.1,278.);
+ tpc->DefineSection(16,-64.7,56.9,278.);
+ tpc->DefineSection(17,73.3,56.9,278.);
//
- tpc->DefineSection(18,74.0,60.8,278.);
- tpc->DefineSection(19,253.6,65.5,278.);
+ tpc->DefineSection(18,73.3,60.1,278.);
+ tpc->DefineSection(19,74.0,60.1,278.);
//
- tpc->DefineSection(20,253.6,65.6,278.);
- tpc->DefineSection(21,259.6,65.6,278.);
+ tpc->DefineSection(20,74.0,60.68,278.);// hs
+ tpc->DefineSection(21,253.6,65.38,278.);// hs
//
- tpc->DefineSection(22,259.6,70.0,278.);
- tpc->DefineSection(23,291.,77.,278.);
+ tpc->DefineSection(22,253.6,65.6,278.);
+ tpc->DefineSection(23,259.6,65.6,278.);
+ //
+ tpc->DefineSection(24,259.6,70.0,278.);
+ tpc->DefineSection(25,260.,70.0,278.);
+ //
+ tpc->DefineSection(26,260.,83.1,278.);
+ tpc->DefineSection(27,262.1,83.1,278.);
+ //
+ tpc->DefineSection(28,262.1,77.,278);
+ tpc->DefineSection(29,289.6,77.,278.);
//
TGeoMedium *m1 = gGeoManager->GetMedium("TPC_Air");
TGeoVolume *v1 = new TGeoVolume("TPC_M",tpc,m1);
dvol->DefineSection(4,253.6,74.5,264.4);
dvol->DefineSection(5,260.,74.5,264.4);
//
- TGeoMedium *m5 = gGeoManager->GetMedium("TPC_Ne-CO2-N-2");
+ TGeoMedium *m5 = gGeoManager->GetMedium("TPC_DriftGas2");
TGeoVolume *v9 = new TGeoVolume("TPC_Drift",dvol,m5);
//
v1->AddNode(v9,1);
TGeoMedium *sm3 = gGeoManager->GetMedium("TPC_Prepreg2");
TGeoMedium *sm4 = gGeoManager->GetMedium("TPC_Nomex");
//
+ TGeoMedium *smep = gGeoManager->GetMedium("TPC_Epoxy1");
+ //
TGeoVolume *tov1 = new TGeoVolume("TPC_OCV1",to1,sm1);
TGeoVolume *tov2 = new TGeoVolume("TPC_OCV2",to2,sm2);
TGeoVolume *tov3 = new TGeoVolume("TPC_OCV3",to3,sm3);
TGeoVolume *tov4 = new TGeoVolume("TPC_OCV4",to4,sm4);
TGeoVolume *togv5 = new TGeoVolume("TPC_OCVG5",tog5,sm1);
+ //
+ TGeoMedium *mhs = gGeoManager->GetMedium("TPC_Steel");
+ TGeoMedium *m12 = gGeoManager->GetMedium("TPC_Water");
//-------------------------------------------------------
// Tpc Outer Field Cage
// daughters - composite (sandwich)
TGeoVolume *tf1v = new TGeoVolume("TPC_OFC1",tf1,sm2);
TGeoVolume *tf2v = new TGeoVolume("TPC_OFC2",tf2,sm5);
TGeoVolume *tf3v = new TGeoVolume("TPC_OFC3",tf3,sm4);
- TGeoVolume *tfg4v = new TGeoVolume("TPC_OFCG4",tfg4,sm1);
+ TGeoVolume *tfg4v = new TGeoVolume("TPC_OFCG4",tfg4,smep);
//
// outer part - positioning
//
tcms->DefineSection(9,-71.3,56.9,58.8);
//
TGeoVolume *v7 = new TGeoVolume("TPC_ICVM",tcms,m3);
+ //------------------------------------------------
+ // Heat screen muon side
+ //------------------------------------------------
+
+ TGeoCone *thsm = new TGeoCone(89.8,67.88,68.1,60.68,60.9);
+ TGeoCone *thsmw = new TGeoCone(89.8,67.94,68.04,60.74,60.84);
+ TGeoVolume *hvsm = new TGeoVolume("TPC_HSM",thsm,mhs); //steel
+ TGeoVolume *hvsmw = new TGeoVolume("TPC_HSMW",thsmw,m12); //water
+ // assembly heat screen muon
+ hvsm->AddNode(hvsmw,1);
//-----------------------------------------------
// inner containment vessel - shaft side
//-----------------------------------------------
tcss->DefineSection(9,258.1,65.6,74.2);
//
TGeoVolume *v8 = new TGeoVolume("TPC_ICVS",tcss,m3);
+ //-------------------------------------------------
+ // Heat screen shaft side
+ //--------------------------------------------------
+ TGeoCone *thss = new TGeoCone(89.8,60.68,60.9,65.38,65.6);
+ TGeoCone *thssw = new TGeoCone(89.8,60.74,60.84,65.44,65.54);
+ TGeoVolume *hvss = new TGeoVolume("TPC_HSS",thss,mhs); //steel
+ TGeoVolume *hvssw = new TGeoVolume("TPC_HSSW",thssw,m12); //water
+ //assembly heat screen shaft
+ hvss->AddNode(hvssw,1);
//-----------------------------------------------
// Inner field cage
// define 4 parts and make an assembly
TGeoVolume *tv3 = new TGeoVolume("TPC_IFC4",t3,sm3);
TGeoVolume *tv4 = new TGeoVolume("TPC_IFC5",t4,sm5);
TGeoVolume *tv5 = new TGeoVolume("TPC_IFC6",t5,sm4);
- TGeoVolume *tvep1 = new TGeoVolume("TPC_IFEPOX1",tepox1,sm1);
+ TGeoVolume *tvep1 = new TGeoVolume("TPC_IFEPOX1",tepox1,smep);
TGeoVolume *tvpr1 = new TGeoVolume("TPC_PRSTR1",tpr1,sm2);
//
// middle parts - 2 copies
TGeoVolume *tv7 = new TGeoVolume("TPC_IFC8",t7,sm3);
TGeoVolume *tv8 = new TGeoVolume("TPC_IFC9",t8,sm5);
TGeoVolume *tv9 = new TGeoVolume("TPC_IFC10",t9,sm4);
- TGeoVolume *tvep2 = new TGeoVolume("TPC_IFEPOX2",tepox2,sm1);
+ TGeoVolume *tvep2 = new TGeoVolume("TPC_IFEPOX2",tepox2,smep);
TGeoVolume *tvpr2 = new TGeoVolume("TPC_PRSTR2",tpr2,sm2);
// central part - 1 copy
//
TGeoVolume *tv10 = new TGeoVolume("TPC_IFC11",t10,sm2);
TGeoVolume *tv11 = new TGeoVolume("TPC_IFC12",t11,sm5);
TGeoVolume *tv12 = new TGeoVolume("TPC_IFC13",t12,sm4);
- TGeoVolume *tvep3 = new TGeoVolume("TPC_IFEPOX3",tepox3,sm1);
+ TGeoVolume *tvep3 = new TGeoVolume("TPC_IFEPOX3",tepox3,smep);
TGeoVolume *tvpr3 = new TGeoVolume("TPC_PRSTR3",tpr3,sm2);
//
// creating a sandwich for the outer par,t tv2 is the mother
v5->AddNode(v6,1, new TGeoTranslation(0.,0.,-252.1));
v5->AddNode(v6,2, new TGeoTranslation(0.,0.,252.1));
v1->AddNode(v5,1); v1->AddNode(v7,1); v1->AddNode(v8,1);
+ v1->AddNode(hvsm,1,new TGeoTranslation(0.,0.,-163.8));
+ v1->AddNode(hvss,1,new TGeoTranslation(0.,0.,163.8));
v9->AddNode(tv100,1);
//
// central drum
//
TGeoVolume *cflv = new TGeoVolume("TPC_CDR",cfl,m3);
// sandwich
- TGeoTubeSeg *cd1 = new TGeoTubeSeg(60.6224,61.19,71.1,0.1,119.9);
- TGeoTubeSeg *cd2 = new TGeoTubeSeg(60.6262,61.1862,71.1,0.1,119.9);
- TGeoTubeSeg *cd3 = new TGeoTubeSeg(60.6462,61.1662,71.1,0.1,119.9);
- TGeoTubeSeg *cd4 = new TGeoTubeSeg(60.6562,61.1562,71.1,0.1,119.9);
- TGeoTubeSeg *tepox4 = new TGeoTubeSeg(60.6224,61.19,71.1,359.9,0.1);
- // TGeoTube *cd1 = new TGeoTube(60.6224,61.19,71.1);
- // TGeoTube *cd2 = new TGeoTube(60.6262,61.1862,71.1);
- // TGeoTube *cd3 = new TGeoTube(60.6462,61.1662,71.1);
- // TGeoTube *cd4 = new TGeoTube(60.6562,61.1562,71.1);
+ TGeoTubeSeg *cd1 = new TGeoTubeSeg(60.6224,61.19,71.1,0.2,119.8);
+ TGeoTubeSeg *cd2 = new TGeoTubeSeg(60.6262,61.1862,71.1,0.2,119.8);
+ TGeoTubeSeg *cd3 = new TGeoTubeSeg(60.6462,61.1662,71.1,0.2,119.8);
+ TGeoTubeSeg *cd4 = new TGeoTubeSeg(60.6562,61.1562,71.1,0.2,119.8);
+ TGeoTubeSeg *tepox4 = new TGeoTubeSeg(60.6224,61.19,71.1,359.8,0.2);
//
TGeoMedium *sm6 = gGeoManager->GetMedium("TPC_Prepreg1");
TGeoMedium *sm8 = gGeoManager->GetMedium("TPC_Epoxyfm");
TGeoVolume *cd2v = new TGeoVolume("TPC_CDR2",cd2,sm6);// prepreg1
TGeoVolume *cd3v = new TGeoVolume("TPC_CDR3",cd3,sm8); //epoxy film
TGeoVolume *cd4v = new TGeoVolume("TPC_CDR4",cd4,sm4); //nomex
- TGeoVolume *tvep4 = new TGeoVolume("TPC_IFEPOX4",tepox4,sm1);
+ TGeoVolume *tvep4 = new TGeoVolume("TPC_IFEPOX4",tepox4,smep);
//
// seals for central drum 2 copies
TGeoMedium *m6=gGeoManager->GetMedium("TPC_Makrolon");
TGeoMedium *m7=gGeoManager->GetMedium("TPC_Cu");
TGeoMedium *m10 = gGeoManager->GetMedium("TPC_Alumina");
- TGeoMedium *m11 = gGeoManager->GetMedium("TPC_Peek");
- TGeoMedium *m12 = gGeoManager->GetMedium("TPC_Water");
+ TGeoMedium *m11 = gGeoManager->GetMedium("TPC_Peek");;
TGeoMedium *m13 = gGeoManager->GetMedium("TPC_Brass");
//
// tpc rod is an assembly of 10 long parts and 2 short parts
TGeoCombiTrans *transf[13];
Char_t name[30];
for(Int_t i=0;i<13;i++){
- sprintf(name,"transf%d",i);
+ //sprintf(name,"transf%d",i);
+ snprintf(name,30,"transf%d",i);
transf[i]= new TGeoCombiTrans(name,0.,-2.,-9.+i*1.5,rhole);
transf[i]->RegisterYourself();
}
// union expression for holes
TString operl("hhole:transf0");
for (Int_t i=1;i<13;i++){
- sprintf(name,"+hhole:transf%d",i);
+ //sprintf(name,"+hhole:transf%d",i);
+ snprintf(name,30,"+hhole:transf%d",i);
operl.Append(name);
}
//
TString opers("hhole:transf1");
for (Int_t i=2;i<12;i++){
- sprintf(name,"+hhole:transf%d",i);
+ //sprintf(name,"+hhole:transf%d",i);
+ snprintf(name,30,"+hhole:transf%d",i);
opers.Append(name);
}
//union of holes
tpcmrod->AddNode(ringv,i+12,new TGeoTranslation(0.,0.,-105.+i*21));
}
for(Int_t i=0;i<10;i++){
- tpcrrod->AddNode(lpart,i+1,new TGeoTranslation(0.,0.,-94.5+i*21));
- tpcmrod->AddNode(mrodl,i+1,new TGeoTranslation(0.,0.,-94.5+i*21));
+ tpcrrod->AddNode(lpart,i+1,new TGeoTranslation(0.,0.,-94.5+i*21));//resistor rod
+ tpcmrod->AddNode(mrodl,i+1,new TGeoTranslation(0.,0.,-94.5+i*21));//makrolon rod
}
//
- // short pieces
+ // right plug - identical for all rods
+ //
+ TGeoPcon *tpcrp = new TGeoPcon(0.,360.,6);
+ //
+ tpcrp->DefineSection(0,123.05,1.89,2.1075);
+ tpcrp->DefineSection(1,123.59,1.89,2.1075);
+ //
+ tpcrp->DefineSection(2,123.59,1.8,2.2);
+ tpcrp->DefineSection(3,127.,1.8,2.2);
+ //
+ tpcrp->DefineSection(4,127.,0.,2.2);
+ tpcrp->DefineSection(5,127.5,0.,2.2);
+ //
+ TGeoVolume *tpcrpv = new TGeoVolume("TPC_RP",tpcrp,m6);
+ //
+ // adding short pieces and right plug
//
tpcrrod->AddNode(spart,1,new TGeoTranslation(0.,0.,-114.));
tpcrrod->AddNode(spart,2,new TGeoTranslation(0.,0.,114.));
tpcrrod->AddNode(ringv,23,new TGeoTranslation(0.,0.,-123.));
tpcrrod->AddNode(ringv,24,new TGeoTranslation(0.,0.,123.));
+ tpcrrod->AddNode(tpcrpv,1);
//
tpcmrod->AddNode(mrods,1,new TGeoTranslation(0.,0.,-114.));
tpcmrod->AddNode(mrods,2,new TGeoTranslation(0.,0.,114.));
tpcmrod->AddNode(ringv,25,new TGeoTranslation(0.,0.,-123.));
tpcmrod->AddNode(ringv,26,new TGeoTranslation(0.,0.,123.));
- //
- // left plaque
- //
- TGeoPcon *lp = new TGeoPcon(0.,360.,4);
- //
- lp->DefineSection(0,-125.8,1.92,2.235);
- lp->DefineSection(1,-124.8,1.92,2.235);
- //
- lp->DefineSection(2,-124.8,1.92,2.08);
- lp->DefineSection(3,-123.1,1.92,2.08);
- //
- TGeoVolume *lpv1 = new TGeoVolume("TPC_lpv1",lp,m6);
- TGeoVolume *lpv2 = new TGeoVolume("TPC_lpv2",lp,m6);
- // left ring
- TGeoTube *lr = new TGeoTube(2.1075,2.235,0.5);
- TGeoVolume *lrv = new TGeoVolume("TPC_lrv",lr,m3);
+ tpcmrod->AddNode(tpcrpv,2);
//
- lpv2->AddNode(lrv,1,new TGeoTranslation(0.,0.,-125.3));
+ // from the ringv position to the CM is 3.0 cm!
+ //----------------------------------------
//
- tpcrrod->AddNode(lpv2,1);
- tpcmrod->AddNode(lpv1,1);
//
- // right plaque
- //
- TGeoTube *rp = new TGeoTube(1.92,2.08,2.025);
- TGeoVolume *rpv = new TGeoVolume("TPC_rpv",rp,m6);
- tpcrrod->AddNode(rpv,1, new TGeoTranslation(0.,0.,125.125));
- tpcmrod->AddNode(rpv,2,new TGeoTranslation(0.,0.,125.125));
- //
- //
- //HV rods - makrolon + 0.58cm (diameter) Cu
- TGeoTube *hvr = new TGeoTube(0.,1.465,126.5);
- TGeoTube *hvc = new TGeoTube(0.,0.29,126.5);
+ //HV rods - makrolon + 0.58cm (diameter) Cu ->check the length
+ TGeoTube *hvr = new TGeoTube(0.,1.465,123.);
+ TGeoTube *hvc = new TGeoTube(0.,0.29,123.);
//
TGeoVolume *hvrv = new TGeoVolume("TPC_HV_Rod",hvr,m6);
TGeoVolume *hvcv = new TGeoVolume("TPC_HV_Cable",hvc,m7);
//
//resistor rod
//
- TGeoTube *cr = new TGeoTube(0.,0.45,126.2);
- TGeoTube *cw = new TGeoTube(0.,0.15,126.2);
+ TGeoTube *cr = new TGeoTube(0.,0.45,123.);
+ TGeoTube *cw = new TGeoTube(0.,0.15,123.);
TGeoVolume *crv = new TGeoVolume("TPC_CR",cr,m10);
TGeoVolume *cwv = new TGeoVolume("TPC_W",cw,m12);
//
//
//peek rod
//
- TGeoTube *pr =new TGeoTube(0.2,0.35,126.2);
+ TGeoTube *pr =new TGeoTube(0.2,0.35,123.);
TGeoVolume *prv = new TGeoVolume("TPC_PR",pr,m11);
//
// copper plates with connectors
}
tpcrrod->AddNode(rrod,1,new TGeoCombiTrans(0.,0.,0.5,crr1));
+ //
+ // rod left head with holders - inner
+ //
+ // first element - support for inner holder TPC_IHS
+ Double_t shift1[3] = {0.0,-0.175,0.0};
+
+new TGeoBBox("tpcihs1", 4.7, 0.66, 2.35);
+new TGeoBBox("tpcihs2", 4.7, 0.485, 1.0, shift1);
+new TGeoBBox("tpcihs3", 1.5, 0.485, 2.35, shift1);
+new TGeoTube("tpcihs4", 0.0, 2.38, 0.1);
+//
+Double_t pointstrap[16];
+pointstrap[0]= 0.0;
+pointstrap[1]= 0.0;
+pointstrap[2]= 0.0;
+pointstrap[3]= 1.08;
+pointstrap[4]= 2.3;
+pointstrap[5]= 1.08;
+pointstrap[6]= 3.38;
+pointstrap[7]= 0.0;
+pointstrap[8]= 0.0;
+pointstrap[9]= 0.0;
+pointstrap[10]= 0.0;
+pointstrap[11]= 1.08;
+pointstrap[12]= 2.3;
+pointstrap[13]= 1.08;
+pointstrap[14]= 3.38;
+pointstrap[15]= 0.0;
+//
+TGeoArb8 *tpcihs5 = new TGeoArb8("tpcihs5", 0.6, pointstrap);
+//
+// half space - cutting "legs"
+//
+ p[0]=0.0;
+ p[1]=0.105;
+ p[2]=0.0;
+ //
+n[0] = 0.0;
+n[1] = 1.0;
+n[2] = 0.0;
+
+new TGeoHalfSpace("cutil1", p, n);
+
+//
+// transformations
+//
+TGeoTranslation *trans2 = new TGeoTranslation("trans2", 0.0, 2.84, 2.25);
+trans2->RegisterYourself();
+TGeoTranslation*trans3= new TGeoTranslation("trans3", 0.0, 2.84, -2.25);
+trans3->RegisterYourself();
+//support - composite volume
+//
+TGeoCompositeShape *tpcihs6 = new TGeoCompositeShape("tpcihs6", "tpcihs1-(tpcihs2+tpcihs3)-(tpcihs4:trans2)-(tpcihs4:trans3)-cutil1");
+//
+// volumes - all makrolon
+//
+ TGeoVolume *tpcihss = new TGeoVolume("TPC_IHSS", tpcihs6, m6); //support
+ TGeoVolume *tpcihst = new TGeoVolume("TPC_IHSTR",tpcihs5 , m6); //trapesoid
+ //now assembly
+TGeoRotation *rot111 = new TGeoRotation();
+rot111->RotateY(180.0);
+//
+TGeoVolumeAssembly *tpcihs = new TGeoVolumeAssembly("TPC_IHS"); // assembly of the support
+tpcihs->AddNode(tpcihss, 1);
+tpcihs->AddNode(tpcihst, 1, new TGeoTranslation(-4.7, 0.66, 0.0));
+tpcihs->AddNode(tpcihst, 2, new TGeoCombiTrans(4.7, 0.66, 0.0, rot111));
+//
+// two rod holders (TPC_IRH) assembled with the support
+//
+new TGeoBBox("tpcirh1", 4.7, 1.33, 0.5);
+ shift1[0]=-3.65;
+ shift1[1]=0.53;
+ shift1[2]=0.;
+new TGeoBBox("tpcirh2", 1.05, 0.8, 0.5, shift1);
+ shift1[0]=3.65;
+ shift1[1]=0.53;
+ shift1[2]=0.;
+new TGeoBBox("tpcirh3", 1.05, 0.8, 0.5, shift1);
+ shift1[0]=0.0;
+ shift1[1]=1.08;
+ shift1[2]=0.;
+new TGeoBBox("tpcirh4", 1.9, 0.25, 0.5, shift1);
+new TGeoTube("tpcirh5", 0, 1.9, 5);
+//
+TGeoTranslation *trans4 = new TGeoTranslation("trans4", 0, 0.83, 0.0);
+trans4->RegisterYourself();
+//
+TGeoCompositeShape *tpcirh6 = new TGeoCompositeShape("tpcirh6", "tpcirh1-tpcirh2-tpcirh3-(tpcirh5:trans4)-tpcirh4");
+//
+// now volume
+//
+TGeoVolume *tpcirh = new TGeoVolume("TPC_IRH", tpcirh6, m6);
+//
+// and all together...
+//
+TGeoVolume *tpciclamp = new TGeoVolumeAssembly("TPC_ICLP");
+tpciclamp->AddNode(tpcihs, 1);
+tpciclamp->AddNode(tpcirh, 1, new TGeoTranslation(0, 1.99, 1.1));
+tpciclamp->AddNode(tpcirh, 2, new TGeoTranslation(0, 1.99, -1.1));
+//
+// and now left inner "head"
+//
+TGeoPcon *inplug = new TGeoPcon("inplug", 0.0, 360.0, 14);
+
+inplug->DefineSection(0, 0.3, 0.0, 2.2);
+inplug->DefineSection(1, 0.6, 0.0, 2.2);
+
+inplug->DefineSection(2, 0.6, 0.0, 1.75);
+inplug->DefineSection(3, 0.7, 0.0, 1.75);
+
+inplug->DefineSection(4, 0.7, 1.55, 1.75);
+inplug->DefineSection(5, 1.6, 1.55, 1.75);
+
+inplug->DefineSection(6, 1.6, 1.55, 2.2);
+inplug->DefineSection(7, 1.875, 1.55, 2.2);
+
+inplug->DefineSection(8, 1.875, 1.55, 2.2);
+inplug->DefineSection(9, 2.47, 1.75, 2.2);
+
+inplug->DefineSection(10, 2.47, 1.75, 2.08);
+inplug->DefineSection(11, 2.57, 1.8, 2.08);
+
+inplug->DefineSection(12, 2.57, 1.92, 2.08);
+inplug->DefineSection(13, 2.95, 1.92, 2.08);
+//
+ shift1[0]=0.0;
+ shift1[1]=-2.09;
+ shift1[2]=1.075;
+ //
+new TGeoBBox("pcuti", 1.5, 0.11, 1.075, shift1);
+//
+TGeoCompositeShape *inplleft = new TGeoCompositeShape("inplleft", "inplug-pcuti");
+TGeoVolume *tpcinlplug = new TGeoVolume("TPC_INPLL", inplleft, m6);
+//
+// holder + plugs
+//
+ TGeoVolume *tpcihpl = new TGeoVolumeAssembly("TPC_IHPL"); //holder+2 plugs (reflected)
+ tpcihpl->AddNode(tpcinlplug, 1);
+ tpcihpl->AddNode(tpcinlplug, 2,ref);
+ tpcihpl->AddNode(tpciclamp,1,new TGeoTranslation(0.0, -2.765, 0.0));
+ //
+ // outer holders and clamps
+ //
+
+ // outer membrane holder (between rods)
+pointstrap[0]= 0.0;
+pointstrap[1]= 0.0;
+pointstrap[2]= 0.0;
+pointstrap[3]= 2.8;
+pointstrap[4]= 3.1;
+pointstrap[5]= 2.8-3.1*TMath::Tan(15.*TMath::DegToRad());
+pointstrap[6]= 3.1;
+pointstrap[7]= 0.0;
+pointstrap[8]= 0.0;
+pointstrap[9]= 0.0;
+pointstrap[10]= 0.0;
+pointstrap[11]= 2.8;
+pointstrap[12]= 3.1;
+pointstrap[13]= 2.8-3.1*TMath::Tan(15.*TMath::DegToRad());
+pointstrap[14]= 3.1;
+pointstrap[15]= 0.0;
+//
+TGeoArb8 *tpcomh1 = new TGeoArb8("tpcomh1", 1.05, pointstrap);
+TGeoBBox *tpcomh2 = new TGeoBBox("tpcomh2", 0.8, 1.4, 6);
+//
+TGeoVolume *tpcomh1v = new TGeoVolume("TPC_OMH1", tpcomh1, m7);
+TGeoVolume *tpcomh2v = new TGeoVolume("TPC_OMH2", tpcomh2, m7);
+//
+TGeoVolume *tpcomh3v = new TGeoVolumeAssembly("TPC_OMH3"); // assembly1
+tpcomh3v->AddNode(tpcomh1v, 1, new TGeoTranslation(0.8, -1.4, 4.95));
+ tpcomh3v->AddNode(tpcomh1v, 2, new TGeoTranslation(0.8, -1.4, -4.95));
+tpcomh3v->AddNode(tpcomh2v, 1);
+//
+shift1[0] = 0.9;
+shift1[1] = -1.85;
+shift1[2] = 0.0;
+//
+new TGeoBBox("tpcomh3", 1.65, 1.15, 3.4);
+TGeoBBox *tpcomh4 = new TGeoBBox("tpcomh4", 0.75, 0.7, 3.4, shift1);
+//
+// halfspace 1
+//
+p[0] = 0.0;
+p[1] = -1.05;
+p[2] = -3.4;
+//
+n[0] = 0.0;
+n[1] = -1.0*TMath::Tan(30.*TMath::DegToRad());
+n[2] = 1.0;
+//
+new TGeoHalfSpace("cutomh1", p, n);
+//
+// halfspace 2
+//
+p[0] = 0.0;
+p[1] = -1.05;
+p[2] = 3.4;
+//
+n[0] = 0.0;
+n[1] = -1.0*TMath::Tan(30.*TMath::DegToRad());
+n[2] = -1.0;
+//
+new TGeoHalfSpace("cutomh2", p, n);
+//
+// halfspace 3
+//
+p[0] = -1.65;
+p[1] = 0.0;
+p[2] = -0.9;
+//
+n[0] = 1.0*TMath::Tan(75.*TMath::DegToRad());
+n[1] = 0.0;
+n[2] = 1.0;
+//
+new TGeoHalfSpace("cutomh3", p, n);
+//
+// halfspace 4
+//
+p[0] = -1.65;
+p[1] = 0.0;
+p[2] = 0.9;
+//
+n[0] = 1.0*TMath::Tan(75*TMath::DegToRad());
+n[1] = 0.0;
+n[2] = -1.0;
+//
+new TGeoHalfSpace("cutomh4", p, n);
+//
+// halsfspace 5
+//
+p[0] = 1.65;
+p[1] = -1.05;
+p[2] = 0.0;
+//
+n[0] = -1.0;
+n[1] = -1.0*TMath::Tan(20.*TMath::DegToRad());
+n[2] = 0.0;
+//
+new TGeoHalfSpace("cutomh5", p, n);
+//
+TGeoCompositeShape *tpcomh5 = new TGeoCompositeShape("tpcomh5", "tpcomh3-cutomh1-cutomh2-cutomh3-cutomh4-cutomh5");
+//
+ TGeoVolume *tpcomh5v = new TGeoVolume("TPC_OMH5",tpcomh5,m6);
+ TGeoVolume *tpcomh4v = new TGeoVolume("TPC_OMH6",tpcomh4,m6);
+ //
+ TGeoVolumeAssembly *tpcomh7v = new TGeoVolumeAssembly("TPC_OMH7");
+ tpcomh7v->AddNode(tpcomh5v,1);
+ tpcomh7v->AddNode(tpcomh4v,1);
+ //
+ // full membrane holder - tpcomh3v + tpcomh7v
+ //
+ TGeoVolumeAssembly *tpcomh = new TGeoVolumeAssembly("TPC_OMH");
+ tpcomh->AddNode(tpcomh3v,1,new TGeoTranslation(1.5,0.,0.));
+ tpcomh->AddNode(tpcomh3v,2,new TGeoCombiTrans(-1.5,0.,0.,rot111));
+ tpcomh->AddNode(tpcomh7v,1,new TGeoTranslation(0.65+1.5, 2.55, 0.0));
+ tpcomh->AddNode(tpcomh7v,2,new TGeoCombiTrans(-0.65-1.5, 2.55, 0.0,rot111));
+ //
+ // outer rod holder support
+ //
+new TGeoBBox("tpcohs1", 3.8, 0.675, 2.35);
+//
+shift1[0] = 0.0;
+shift1[1] = 0.175;
+shift1[2] = 0.0;
+//
+new TGeoBBox("tpcohs2", 1.5, 0.5, 2.35, shift1);
+new TGeoBBox("tpcohs3", 3.8, 0.5, 0.85, shift1);
+//
+shift1[0] = 0.0;
+shift1[1] = -1.175;
+shift1[2] = 0.0;
+//
+TGeoBBox *tpcohs4 = new TGeoBBox("tpsohs4", 3.1, 0.5, 0.7, shift1);
+//
+TGeoVolume *tpcohs4v = new TGeoVolume("TPC_OHS4", tpcohs4, m6);
+//
+p[0] = 0.0;
+p[1] = -0.186;
+p[2] = 0.0;
+//
+n[0] = 0.0;
+n[1] = -1.0;
+n[2] = 0.0;
+//
+new TGeoHalfSpace("cutohs1", p, n);
+//
+TGeoCompositeShape *tpcohs5 = new TGeoCompositeShape("tpcohs5", "tpcohs1-tpcohs2-tpcohs3-cutohs1");
+TGeoVolume *tpcohs5v = new TGeoVolume("TPC_OHS5", tpcohs5, m6);
+//
+TGeoVolumeAssembly *tpcohs = new TGeoVolumeAssembly("TPC_OHS");
+tpcohs->AddNode(tpcohs5v, 1);
+tpcohs->AddNode(tpcohs4v, 1);
+//
+// outer rod holder itself
+//
+shift1[0] = 0.0;
+shift1[1] = 1.325;
+shift1[2] = 0.0;
+ new TGeoBBox("tpcorh1", 3.1, 1.825, 0.55); //from this box we cut pieces...
+ //
+shift1[0] = -3.1;
+shift1[1] = -0.5;
+shift1[2] = 0.0;
+//
+new TGeoBBox("tpcorh2", 0.5, 2.75, 1.1, shift1);
+//
+shift1[0] = 3.1;
+shift1[1] = -0.5;
+shift1[2] = 0.0;
+//
+new TGeoBBox("tpcorh3", 0.5, 2.75, 1.1, shift1);
+//
+shift1[0] = 0.0;
+shift1[1] = -0.5;
+shift1[2] = -0.95;
+//
+new TGeoBBox("tpcorh4", 3.9, 2.75, 0.5, shift1);
+//
+shift1[0] = 0.0;
+shift1[1] = -0.5;
+shift1[2] = 0.0;
+//
+new TGeoBBox("tpcorh5", 1.95, 0.5, 1.1, shift1);
+//
+shift1[0] = 0.0;
+shift1[1] = -0.5;
+shift1[2] = 0.55;
+//
+new TGeoBBox("tpcorh6", 2.4, 0.5, 0.6, shift1);
+//
+new TGeoTube("tpcorh7", 0, 1.95, 0.85);
+new TGeoTube("tpcorh8", 0, 2.4, 0.6);
+//
+TGeoTranslation *trans33 = new TGeoTranslation("trans33", 0.0, 0.0, 0.55);
+trans33->RegisterYourself();
+//
+TGeoCompositeShape *tpcorh9 = new TGeoCompositeShape("tpcorh9", "tpcorh1-tpcorh2-tpcorh3-tpcorh4-tpcorh5-tpcorh6-(tpcorh8:trans33)-tpcorh7");
+//
+ TGeoVolume *tpcorh9v = new TGeoVolume("TPC_ORH",tpcorh9,m6); //outer rod holder
+ //
+ // now 2 holders together
+ //
+ TGeoVolumeAssembly *tpcorh = new TGeoVolumeAssembly("TPC_ORH2");
+ //
+ tpcorh->AddNode(tpcorh9v,1,new TGeoTranslation(0.0, 0.0, 1.25));
+ tpcorh->AddNode(tpcorh9v,2,new TGeoCombiTrans(0.0, 0.0, -1.25,rot111));
+//
+// outer rod plug left
+//
+TGeoPcon *outplug = new TGeoPcon("outplug", 0.0, 360.0, 14);
+
+outplug->DefineSection(0, 0.5, 0.0, 2.2);
+outplug->DefineSection(1, 0.7, 0.0, 2.2);
+
+outplug->DefineSection(2, 0.7, 1.55, 2.2);
+outplug->DefineSection(3, 0.8, 1.55, 2.2);
+
+outplug->DefineSection(4, 0.8, 1.55, 1.75);
+outplug->DefineSection(5, 1.2, 1.55, 1.75);
+
+outplug->DefineSection(6, 1.2, 1.55, 2.2);
+outplug->DefineSection(7, 1.875, 1.55, 2.2);
+
+outplug->DefineSection(8, 1.875, 1.55, 2.2);
+outplug->DefineSection(9, 2.47, 1.75, 2.2);
+
+outplug->DefineSection(10, 2.47, 1.75, 2.08);
+outplug->DefineSection(11, 2.57, 1.8, 2.08);
+
+outplug->DefineSection(12, 2.57, 1.92, 2.08);
+outplug->DefineSection(13, 2.95, 1.92, 2.08);
+//
+shift1[0] = 0.0;
+shift1[1] = 2.09;
+shift1[2] = 1.01;
+
+new TGeoBBox("cutout", 2.5, 0.11, 1.01, shift1);
+//
+
+TGeoCompositeShape *outplleft = new TGeoCompositeShape("outplleft", "outplug-cutout");
+TGeoVolume *outplleftv = new TGeoVolume("TPC_OPLL", outplleft, m6);
+//
+// support + holder + plug
+//
+
+
+ TGeoVolumeAssembly *tpcohpl = new TGeoVolumeAssembly("TPC_OHPL");
+ //
+ tpcohpl->AddNode(outplleftv,1); //plug
+ tpcohpl->AddNode(outplleftv,2,ref); //plug reflected
+ tpcohpl->AddNode(tpcorh,1); //rod holder
+ tpcohpl->AddNode(tpcohs,1,new TGeoTranslation(0.0, 3.925, 0)); // support
+ //
+
+ //
+ // main membrane holder
+ //
+pointstrap[0]= 0.0;
+pointstrap[1]= 0.0;
+pointstrap[2]= 0.0;
+pointstrap[3]= 2.8;
+pointstrap[4]= 3.1;
+pointstrap[5]= 1.96;
+pointstrap[6]= 3.1;
+pointstrap[7]= 0.0;
+pointstrap[8]= 0.0;
+pointstrap[9]= 0.0;
+pointstrap[10]= 0.0;
+pointstrap[11]= 2.8;
+pointstrap[12]= 3.1;
+pointstrap[13]= 1.96;
+pointstrap[14]= 3.1;
+pointstrap[15]= 0.0;
+//
+TGeoArb8 *tpcmmh1 = new TGeoArb8("tpcmmh1", 1.75, pointstrap);
+TGeoBBox *tpcmmh2 = new TGeoBBox("tpcmmh2", 0.8, 1.4, 12.5);
+//
+TGeoVolume *tpcmmh1v = new TGeoVolume("TPC_MMH1", tpcmmh1, m6);
+TGeoVolume *tpcmmh2v = new TGeoVolume("TPC_MMH2", tpcmmh2, m6);
+//
+ TGeoVolumeAssembly *tpcmmhs = new TGeoVolumeAssembly("TPC_MMHS");
+ tpcmmhs->AddNode(tpcmmh1v,1,new TGeoTranslation(0.8, -1.4, 10.75));
+ tpcmmhs->AddNode(tpcmmh1v,2,new TGeoTranslation(0.8, -1.4, -10.75));
+ tpcmmhs->AddNode(tpcmmh2v,1);
+ //
+ // main membrahe holder clamp
+ //
+shift1[0] = -0.75;
+shift1[1] = -1.15;
+shift1[2] = 0.0;
+//
+new TGeoBBox("tpcmmhc1", 1.65, 1.85, 8.9);
+new TGeoBBox("tpcmmhc2", 0.9, 0.7, 8.9, shift1);
+//
+// half spaces - cuts
+//
+p[0] = -1.65;
+p[1] = 0.0;
+p[2] = -0.9;
+//
+n[0] = 8.0;
+n[1] = 0.0;
+n[2] = 8.0*TMath::Tan(13.*TMath::DegToRad());
+//
+new TGeoHalfSpace("cutmmh1", p, n);
+//
+p[0] = -1.65;
+p[1] = 0.0;
+p[2] = 0.9;
+//
+n[0] = 8.0;
+n[1] = 0.0;
+n[2] = -8.0*TMath::Tan(13.*TMath::DegToRad());
+//
+new TGeoHalfSpace("cutmmh2", p, n);
+//
+p[0] = 0.0;
+p[1] = 1.85;
+p[2] = -2.8;
+//
+n[0] = 0.0;
+n[1] = -6.1;
+n[2] = 6.1*TMath::Tan(20.*TMath::DegToRad());
+//
+new TGeoHalfSpace("cutmmh3", p, n);
+//
+p[0] = 0.0;
+p[1] = 1.85;
+p[2] = 2.8;
+//
+n[0] = 0.0;
+n[1] = -6.1;
+n[2] = -6.1*TMath::Tan(20*TMath::DegToRad());
+//
+new TGeoHalfSpace("cutmmh4", p, n);
+//
+p[0] = 0.75;
+p[1] = 0.0;
+p[2] = -8.9;
+//
+n[0] = 2.4*TMath::Tan(30*TMath::DegToRad());
+n[1] = 0.0;
+n[2] = 2.4;
+//
+ new TGeoHalfSpace("cutmmh5", p, n);
+//
+p[0] = 0.75;
+p[1] = 0.0;
+p[2] = 8.9;
+//
+n[0] = 2.4*TMath::Tan(30*TMath::DegToRad());
+n[1] = 0.0;
+n[2] = -2.4;
+//
+new TGeoHalfSpace("cutmmh6", p, n);
+
+TGeoCompositeShape *tpcmmhc = new TGeoCompositeShape("TPC_MMHC", "tpcmmhc1-tpcmmhc2-cutmmh1-cutmmh2-cutmmh3-cutmmh4-cutmmh5-cutmmh6");
+
+ TGeoVolume *tpcmmhcv = new TGeoVolume("TPC_MMHC",tpcmmhc,m6);
+ //
+TGeoVolume *tpcmmh = new TGeoVolumeAssembly("TPC_MMH");
+//
+ tpcmmh->AddNode(tpcmmhcv,1,new TGeoTranslation(0.65+1.5, 1.85, 0.0));
+ tpcmmh->AddNode(tpcmmhcv,2,new TGeoCombiTrans(-0.65-1.5, 1.85, 0.0,rot111));
+ tpcmmh->AddNode(tpcmmhs,1,new TGeoTranslation(1.5, 0.0, 0.0));
+ tpcmmh->AddNode(tpcmmhs,2,new TGeoCombiTrans(-1.5, 0.0, 0.0,rot111));
+ //
+
+ //
+
+//--------------------------------------------
//
// guard ring resistor chain
//
TGeoRotation *rotpos[2];
//
TGeoRotation *rotrod1[2];
- TGeoTubeSeg *irh = new TGeoTubeSeg(78.825,79.25,1.5,358.5,1.5);
- TGeoTubeSeg *orh = new TGeoTubeSeg(256.5,257.95,1.5,359.5,0.5);
- TGeoTubeSeg *ohh = new TGeoTubeSeg(256.5,257.95,1.5,9.5,10.5);
- TGeoVolume *irhv = new TGeoVolume("TPC_IRHH",irh,m4);
- TGeoVolume *orhv = new TGeoVolume("TPC_ORHH",orh,m4);
- TGeoVolume *ohhv = new TGeoVolume("TPC_OHVHH",ohh,m4);
+
//v9 - drift gas
+ TGeoRotation rot102("rot102");
+ rot102.RotateY(-90.);
+
for(Int_t i=0;i<18;i++){
Double_t angle,x,y;
Double_t z,r;
angle=TMath::DegToRad()*20.*(Double_t)i;
- TGeoRotation *roth = new TGeoRotation(); //rotation for rod holders
- roth->RotateZ(angle);
//inner rods
r=81.5;
x=r * TMath::Cos(angle);
y=r * TMath::Sin(angle);
- z = 126.1;
- //
- v9->AddNode(irhv,i+1,roth);
- v9->AddNode(orhv,i+1,roth);
- v9->AddNode(ohhv,i+1,roth);
+ z = 126.;
+ TGeoRotation *rot12 = new TGeoRotation();
+ rot12->RotateZ(-90.0+i*20.);
+ v9->AddNode(tpcihpl,i+1,new TGeoCombiTrans(x, y, 0., rot12));
//
if(i==11){//resistor rod inner
rotrod.RotateZ(-90.+angle);
r=254.25;
x=r * TMath::Cos(angle);
y=r * TMath::Sin(angle);
- z=126.3;
+ z=126.;
+ //
+ // outer rod holder + outer left plug
+ //
+ TGeoRotation *rot33 = new TGeoRotation();
+ rot33->RotateZ(-90+i*20.);
+ //
+ v9->AddNode(tpcohpl,i+1,new TGeoCombiTrans(x, y, 0., rot33));
+ //
+ Double_t xxx = 256.297*TMath::Cos((i*20.+10.)*TMath::DegToRad());
+ Double_t yyy = 256.297*TMath::Sin((i*20.+10.)*TMath::DegToRad());
+ //
+ TGeoRotation rot101("rot101");
+ rot101.RotateZ(90.+i*20.+10.);
+ TGeoRotation *rot103 = new TGeoRotation("rot103");
+ *rot103 = rot101*rot102;
+ //
+ TGeoCombiTrans *trh100 = new TGeoCombiTrans(xxx,yyy,0.,rot103);
+ //
+ if(i==2) {
+ //main membrane holder
+ v9->AddNode(tpcmmh,1,trh100);
+ }
+ else{
+ // "normal" membrane holder
+ v9->AddNode(tpcomh,i+1,trh100);
+ }
+
//
if(i==3){//resistor rod outer
rotrod.RotateZ(90.+angle);
}
if(i==15){
v9->AddNode(hvrv,1,new TGeoTranslation(x,y,z+0.7)); //hv->A-side only
+
+
}
} //end of rods positioning
}
}
-//_____________________________________________________________________________
-void AliTPCv2::DrawDetector() const
-{
- //
- // Draw a shaded view of the Time Projection Chamber version 1
- //
-
- // Set everything unseen
- gMC->Gsatt("*", "seen", -1);
- //
- // Set ALIC mother transparent
- gMC->Gsatt("ALIC","SEEN",0);
- //
- // Set the volumes visible
- //
-
- gMC->Gsatt("TPC ","SEEN",0);
- gMC->Gsatt("TOIN","SEEN",1);
- gMC->Gsatt("TOIN","COLO",7);
- gMC->Gsatt("TOCV","SEEN",1);
- gMC->Gsatt("TOCV","COLO",4);
- gMC->Gsatt("TSA1","SEEN",0);
- gMC->Gsatt("TSA2","SEEN",0);
- gMC->Gsatt("TSA3","SEEN",0);
- gMC->Gsatt("TSA4","SEEN",0);
- gMC->Gsatt("TSA5","SEEN",0);
- gMC->Gsatt("TOFC","SEEN",1);
- gMC->Gsatt("TOFC","COLO",4);
- gMC->Gsatt("TSA6","SEEN",0);
- gMC->Gsatt("TSA7","SEEN",0);
- gMC->Gsatt("TSA8","SEEN",0);
- gMC->Gsatt("TIIN","SEEN",1);
- gMC->Gsatt("TIIN","COLO",7);
- gMC->Gsatt("TII1","SEEN",0);
- gMC->Gsatt("TIFC","SEEN",1);
- gMC->Gsatt("TIFC","COLO",4);
- gMC->Gsatt("TSA9","SEEN",0);
- gMC->Gsatt("TS10","SEEN",0);
- gMC->Gsatt("TS11","SEEN",0);
- gMC->Gsatt("TS12","SEEN",0);
- gMC->Gsatt("TS13","SEEN",0);
- gMC->Gsatt("TS14","SEEN",0);
- gMC->Gsatt("TICC","SEEN",0);
- gMC->Gsatt("TICM","SEEN",0);
- gMC->Gsatt("TS15","SEEN",0);
- gMC->Gsatt("TS16","SEEN",0);
- gMC->Gsatt("TS17","SEEN",0);
- gMC->Gsatt("TS18","SEEN",0);
- gMC->Gsatt("TS19","SEEN",0);
- gMC->Gsatt("TPJ1","SEEN",0);
- gMC->Gsatt("TPJ2","SEEN",0);
- gMC->Gsatt("TICS","SEEN",0);
- gMC->Gsatt("TDGN","SEEN",0);
- gMC->Gsatt("TIRC","SEEN",0);
- gMC->Gsatt("TIC1","SEEN",1);
- gMC->Gsatt("TIPP","SEEN",0);
- gMC->Gsatt("TIC3","SEEN",0);
- gMC->Gsatt("TRCE","SEEN",0);
- gMC->Gsatt("TPSC","SEEN",0);
- gMC->Gsatt("TPCC","SEEN",0);
- gMC->Gsatt("TORC","SEEN",0);
- gMC->Gsatt("TOPP","SEEN",0);
- gMC->Gsatt("TOC3","SEEN",0);
- gMC->Gsatt("TOC1","SEEN",1);
- gMC->Gsatt("TSSW","SEEN",1);
- gMC->Gsatt("TSWC","SEEN",1);
- gMC->Gsatt("TSSW","COLO",3);
- gMC->Gsatt("TSWC","COLO",3);
- gMC->Gsatt("TSCE","COLO",6);
- gMC->Gsatt("TSCE","SEEN",1);
- gMC->Gsatt("TWES","SEEN",0);
- gMC->Gsatt("TSWB","SEEN",0);
- gMC->Gsatt("TPEL","SEEN",0);
- gMC->Gsatt("TPMW","SEEN",1);
- gMC->Gsatt("TESR","SEEN",1);
- gMC->Gsatt("TPMW","COLO",12);
- gMC->Gsatt("TIC1","COLO",5);
- gMC->Gsatt("TOC1","COLO",5);
- gMC->Gsatt("TESB","SEEN",0);
- gMC->Gsatt("THVM","SEEN",1);
- gMC->Gsatt("THVM","COLO",11);
- gMC->Gsatt("THVH","SEEN",0);
- gMC->Gsatt("TPSR","SEEN",0);
- gMC->Gsatt("THVL","SEEN",0);
- gMC->Gsatt("THVC","SEEN",0);
- gMC->Gsatt("THVE","SEEN",0);
- gMC->Gsatt("THVR","SEEN",0);
- gMC->Gsatt("TPSS","SEEN",0);
- gMC->Gsatt("TPUS","SEEN",0);
- gMC->Gsatt("TPLS","SEEN",0);
-
- //
- gMC->Gdopt("hide", "on");
- gMC->Gdopt("shad", "on");
- gMC->Gsatt("*", "fill", 7);
- gMC->SetClipBox(".");
- gMC->SetClipBox("TPMW",-300,300,-300,300,254.,270.);
- gMC->SetClipBox("TESR",-300,300,-300,300,254.,270.);
- gMC->SetClipBox("TSSW",-300,300,-300,300,283.,284.);
- gMC->SetClipBox("TSWC",-300,300,-300,300,283.,284.);
- gMC->SetClipBox("*", 0, 300, -300, 300, -290, 290);
- gMC->DefaultRange();
- gMC->Gdraw("alic", 40, 30, 0, 12, 9.5, .025, .025);
- gMC->Gdhead(1111, "Time Projection Chamber");
- gMC->Gdman(18, 4, "MAN");
- gMC->Gdopt("hide","off");
-}
//_____________________________________________________________________________
void AliTPCv2::CreateMaterials()
id = gMC->CurrentVolID(copy); // vol ID and copy number (starts from 1!)
if(id != fIDrift && id != fIdSens) return; // not in the sensitive folume
+ if ( fPrimaryIonisation && id == fIDrift ) {
+ Double_t rnd = gMC->GetRandom()->Rndm();
+ gMC->SetMaxStep(0.2+(2.*rnd-1.)*0.05); // 2 mm +- rndm*0.5mm step
+ }
+
+ //if ( fPrimaryIonisation && id == fIDrift && gMC->IsTrackEntering()) {
+ // gMC->SetMaxStep(0.2); // 2 mm
+ //}
+
gMC->TrackPosition(p);
Double_t r = TMath::Sqrt(p[0]*p[0]+p[1]*p[1]);
//
nel = (Int_t)(((gMC->Edep())-kpoti)/kwIon) + 1;
}
else {
- Float_t edep = gMC->Edep();
- if (edep > 0.) nel = (Int_t)((gMC->Edep()*1.5)/kwIon) + 1;
+ static Double_t deForNextStep = 0.;
+ // Geant4 (the meaning of Edep as in Geant3) - wrong
+ //nel = (Int_t)(((gMC->Edep())-kpoti)/kwIon) + 1;
+
+ // Geant4 (the meaning of Edep as in Geant3) - NEW
+ Double_t eAvailable = gMC->Edep() + deForNextStep;
+ nel = (Int_t)(eAvailable/kwIon);
+ deForNextStep = eAvailable - nel*kwIon;
}
nel=TMath::Min(nel,300); // 300 electrons corresponds to 10 keV
//
// Add this hit
- if (fHitType&&2){
+ // if (fHitType&&2){
+ if(fHitType){
gMC->TrackMomentum(p);
Float_t momentum = TMath::Sqrt(p[0]*p[0]+p[1]*p[1]);
Float_t precision = (momentum>0.1) ? 0.002 :0.01;
git://git.uio.no / u / mrichter / AliRoot.git / blobdiff