//
// define reflection matrix
//
- TGeoRotation *ref = new TGeoRotation("ref",90.,0.,90.,270.,180.,0.);
+ TGeoRotation *ref = new TGeoRotation("ref",90.,0.,90.,90.,180.,0.);
//
cd1v->AddNode(cd2v,1); cd2v->AddNode(cd3v,1); cflv->AddNode(cd1v,1);
//
- v1->AddNode(siv,1,new TGeoTranslation(0.,0.,-72.1));
- v1->AddNode(siv,2,new TGeoTranslation(0.,0.,72.1));
+ v1->AddNode(siv,1,new TGeoTranslation(0.,0.,-70.1));
+ v1->AddNode(siv,2,new TGeoTranslation(0.,0.,70.1));
v1->AddNode(sev,1); v1->AddNode(sev,2,ref); v1->AddNode(cflv,1);
//
// central membrane - 2 rings and a mylar membrane - assembly
}
// wheels in the drift volume!
- v9->AddNode(wheel,1,new TGeoTranslation(0.,0.,-256.6));
TGeoCombiTrans *combi3 = new TGeoCombiTrans("combi3",0.,0.,256.6,ref);
- v9->AddNode(wheel,2,combi3);
+ v9->AddNode(wheel,1,combi3);
+ v9->AddNode(wheel,2,new TGeoTranslation(0.,0.,-256.6));
//_____________________________________________________________
// service support wheel
//_____________________________________________________________
sh->DefineSection(1,4.,81.5-shift,250.75-shift);
TGeoVolume *shv = new TGeoVolume("TPC_SWS1",sh,m1); //Air
//
+ TGeoMedium *m9 = gGeoManager->GetMedium("TPC_Si");
+ TGeoPgon *el = new TGeoPgon(0.,20.,1,2);
+ el->DefineSection(0,-1.872,81.5-shift,250.75-shift);
+ el->DefineSection(1,1.872,81.5-shift,250.75-shift);
+ TGeoVolume *elv = new TGeoVolume("TPC_ELEC",el,m9); //Si
+ //
+ shv->AddNode(elv,1);
+ //
+ //
ys = shift*TMath::Sin(OpeningAngle);
xs = shift*TMath::Cos(OpeningAngle);
swv->AddNode(shv,1,new TGeoTranslation(xs,ys,0.));
//
//HV rods - makrolon + 0.58cm (diameter) Cu
- TGeoTube *hvr = new TGeoTube(0.,4.4,126.64);
+ TGeoTube *hvr = new TGeoTube(0.,2.2,126.64);
TGeoTube *hvc = new TGeoTube(0.,0.29,126.64);
//
TGeoVolume *hvrv = new TGeoVolume("TPC_HV_Rod",hvr,m6);
TGeoVolume *hvcv = new TGeoVolume("TPC_HV_Cable",hvc,m7);
hvrv->AddNode(hvcv,1);
- for(Int_t i=0;i<17;i++){
+ for(Int_t i=0;i<18;i++){
Double_t angle,x,y;
Double_t z,r;
angle=TMath::DegToRad()*20.*(Double_t)i;
gGeoManager->Node("TPC_Rod",i+54,"TPC_Drift",x,y,-z,0,kTRUE,upar,3);
}
-
- gMC->Gspos("TPC_M",1,"ALIC",0.,0.,0.,0,"ONLY");
+ TGeoVolume *alice = gGeoManager->GetVolume("ALIC");
+ alice->AddNode(v1,1);
+
} // end of function