AliTPCcalibPulser added (repalcing AliTPCCalibSignal)

[u/mrichter/AliRoot.git] / TPC / AliTPCv1.cxx

diff --git a/TPC/AliTPCv1.cxx b/TPC/AliTPCv1.cxx
index a62723e5c0df48fd7ebea2cc78a6e0b4fa021ac7..42c386ca18756b79e41058678d3afb64c4e6e9ca 100644 (file)
--- a/TPC/AliTPCv1.cxx
+++ b/TPC/AliTPCv1.cxx
@@ -61,7 +61,8 @@ ClassImp(AliTPCv1)
 
 //_____________________________________________________________________________
 
-  AliTPCv1::AliTPCv1(){
+  AliTPCv1::AliTPCv1():AliTPC(),fIdSens(0)
+{
 
   fHitType = 1;
 
@@ -69,11 +70,11 @@ ClassImp(AliTPCv1)
  
 //_____________________________________________________________________________
 AliTPCv1::AliTPCv1(const char *name, const char *title) 
-  :AliTPC(name, title) {
+  :AliTPC(name, title),fIdSens(0)
+ {
   //
   // Standard constructor for Time Projection Chamber
   //
-  fIdSens=0;
 
 
   if (fTPCParam)
@@ -430,8 +431,8 @@ void AliTPCv1::CreateGeometry()
   //
   cd1v->AddNode(cd2v,1); cd2v->AddNode(cd3v,1); cflv->AddNode(cd1v,1);
   //
-  v1->AddNode(siv,1,new TGeoTranslation(0.,0.,-70.1));
-  v1->AddNode(siv,2,new TGeoTranslation(0.,0.,70.1));
+  v1->AddNode(siv,1,new TGeoTranslation(0.,0.,-69.9));
+  v1->AddNode(siv,2,new TGeoTranslation(0.,0.,69.9));
   v1->AddNode(sev,1); v1->AddNode(sev,2,ref); v1->AddNode(cflv,1);
   //
   // central membrane - 2 rings and a mylar membrane - assembly
@@ -452,25 +453,25 @@ void AliTPCv1::CreateGeometry()
   // end caps - they are make as an assembly of single segments
   // containing both readout chambers
   //
-  Double_t OpeningAngle = 10.*TMath::DegToRad();
+  Double_t openingAngle = 10.*TMath::DegToRad();
   Double_t thick=1.5; // rib
-  Double_t shift = thick/TMath::Sin(OpeningAngle);
+  Double_t shift = thick/TMath::Sin(openingAngle);
   //
-  Double_t LowEdge = 86.3; // hole in the wheel
-  Double_t UpEdge = 240.4; // hole in the wheel
+  Double_t lowEdge = 86.3; // hole in the wheel
+  Double_t upEdge = 240.4; // hole in the wheel
   //
   new TGeoTubeSeg("sec",74.5,264.4,3.,0.,20.);
   //
   TGeoPgon *hole = new TGeoPgon("hole",0.,20.,1,4);
   //
-  hole->DefineSection(0,-3.5,LowEdge-shift,UpEdge-shift);
-  hole->DefineSection(1,-1.5,LowEdge-shift,UpEdge-shift);
+  hole->DefineSection(0,-3.5,lowEdge-shift,upEdge-shift);
+  hole->DefineSection(1,-1.5,lowEdge-shift,upEdge-shift);
   //
-  hole->DefineSection(2,-1.5,LowEdge-shift,UpEdge+3.-shift);
-  hole->DefineSection(3,3.5,LowEdge-shift,UpEdge+3.-shift);
+  hole->DefineSection(2,-1.5,lowEdge-shift,upEdge+3.-shift);
+  hole->DefineSection(3,3.5,lowEdge-shift,upEdge+3.-shift);
   //
-  Double_t ys = shift*TMath::Sin(OpeningAngle); 
-  Double_t xs = shift*TMath::Cos(OpeningAngle);
+  Double_t ys = shift*TMath::Sin(openingAngle); 
+  Double_t xs = shift*TMath::Cos(openingAngle);
   TGeoTranslation *tr = new TGeoTranslation("tr",xs,ys,0.);  
   tr->RegisterYourself();
   TGeoCompositeShape *chamber = new TGeoCompositeShape("sec-hole:tr");
@@ -688,7 +689,8 @@ void AliTPCv1::CreateGeometry()
    // 
    // now iroc and oroc are placed into a sector...
    //
-   TGeoVolumeAssembly *sect = new TGeoVolumeAssembly("TPC_SECT");
+   TGeoVolumeAssembly *secta = new TGeoVolumeAssembly("TPC_SECT"); // a-side
+   TGeoVolumeAssembly *sectc = new TGeoVolumeAssembly("TPC_SECT"); // c-side
    TGeoRotation rot1("rot1",90.,90.,0.);
    TGeoRotation rot2("rot2");
    rot2.RotateY(10.);
@@ -696,33 +698,44 @@ void AliTPCv1::CreateGeometry()
    *rot=rot1*rot2;
    //
    Double_t x0,y0;
-   x0=110.2*TMath::Cos(OpeningAngle);
-   y0=110.2*TMath::Sin(OpeningAngle);
-   TGeoCombiTrans *combi1 = new TGeoCombiTrans("combi1",x0,y0,1.09,rot);
-   x0=188.45*TMath::Cos(OpeningAngle);
-   y0=188.45*TMath::Sin(OpeningAngle);
-   TGeoCombiTrans *combi2 = new TGeoCombiTrans("combi2",x0,y0,0.99,rot);
+   x0=110.2*TMath::Cos(openingAngle);
+   y0=110.2*TMath::Sin(openingAngle);
+   TGeoCombiTrans *combi1a = new TGeoCombiTrans("combi1",x0,y0,1.09+0.222,rot); //a-side 
+   TGeoCombiTrans *combi1c = new TGeoCombiTrans("combi1",x0,y0,1.09+0.195,rot); //c-side
+   x0=188.45*TMath::Cos(openingAngle);
+   y0=188.45*TMath::Sin(openingAngle);
+   TGeoCombiTrans *combi2a = new TGeoCombiTrans("combi2",x0,y0,0.99+0.222,rot); //a-side
+   TGeoCombiTrans *combi2c = new TGeoCombiTrans("combi2",x0,y0,0.99+0.195,rot); //c-side
+   //
+   // A-side
+   //
+   secta->AddNode(ch,1);
+   secta->AddNode(iroc,1,combi1a);
+   secta->AddNode(oroc,1,combi2a);
+   //
+   // C-side
    //
-   sect->AddNode(ch,1);
-   sect->AddNode(iroc,1,combi1);
-   sect->AddNode(oroc,1,combi2);
+   sectc->AddNode(ch,1);
+   sectc->AddNode(iroc,1,combi1c);
+   sectc->AddNode(oroc,1,combi2c);
    //
-   // segment is ready...
-   // now I try to make a wheel...
+   // now I try to make  wheels...
    //
-   TGeoVolumeAssembly *wheel = new TGeoVolumeAssembly("TPC_ENDCAP");
+   TGeoVolumeAssembly *wheela = new TGeoVolumeAssembly("TPC_ENDCAP");
+   TGeoVolumeAssembly *wheelc = new TGeoVolumeAssembly("TPC_ENDCAP");
    //
    for(Int_t i =0;i<18;i++){
      Double_t phi = (20.*i);
      TGeoRotation *r = new TGeoRotation();
      r->RotateZ(phi);
-     wheel->AddNode(sect,i+1,r);
+     wheela->AddNode(secta,i+1,r);
+     wheelc->AddNode(sectc,i+1,r); 
     
    }
    // wheels in the drift volume!
    TGeoCombiTrans *combi3 = new TGeoCombiTrans("combi3",0.,0.,256.6,ref);
-   v9->AddNode(wheel,1,combi3);
-   v9->AddNode(wheel,2,new TGeoTranslation(0.,0.,-256.6));
+   v9->AddNode(wheela,1,combi3);
+   v9->AddNode(wheelc,2,new TGeoTranslation(0.,0.,-256.6));
    
    //_____________________________________________________________
    // service support wheel
@@ -733,7 +746,7 @@ void AliTPCv1::CreateGeometry()
   TGeoVolume *swv = new TGeoVolume("TPC_SWSEG",sw,m3); //Al
   //
   thick=1.;
-  shift = thick/TMath::Sin(OpeningAngle);
+  shift = thick/TMath::Sin(openingAngle);
   TGeoPgon *sh = new TGeoPgon(0.,20.,1,2);
   sh->DefineSection(0,-4.,81.5-shift,250.75-shift);
   sh->DefineSection(1,4.,81.5-shift,250.75-shift);
@@ -748,8 +761,8 @@ void AliTPCv1::CreateGeometry()
   shv->AddNode(elv,1);
   //
   //
-  ys = shift*TMath::Sin(OpeningAngle);
-  xs = shift*TMath::Cos(OpeningAngle);
+  ys = shift*TMath::Sin(openingAngle);
+  xs = shift*TMath::Cos(openingAngle);
   swv->AddNode(shv,1,new TGeoTranslation(xs,ys,0.));
   // cover
   TGeoPgon *co = new TGeoPgon(0.,20.,1,2);
@@ -758,14 +771,14 @@ void AliTPCv1::CreateGeometry()
   TGeoVolume *cov = new TGeoVolume("TPC_SWC1",co,m3);//Al
   // hole in a cover
   TGeoPgon *coh = new TGeoPgon(0.,20.,1,2);
-  shift=4./TMath::Sin(OpeningAngle);
+  shift=4./TMath::Sin(openingAngle);
   coh->DefineSection(0,-0.5,85.-shift,247.25-shift);
   coh->DefineSection(1,0.5,85.-shift,247.25-shift);  
   //
   TGeoVolume *cohv = new TGeoVolume("TPC_SWC2",coh,m1);
   //
-  ys = shift*TMath::Sin(OpeningAngle);
-  xs = shift*TMath::Cos(OpeningAngle);  
+  ys = shift*TMath::Sin(openingAngle);
+  xs = shift*TMath::Cos(openingAngle);  
   cov->AddNode(cohv,1,new TGeoTranslation(xs,ys,0.));
   //
   // Sector as an Assembly