]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - TPC/AliTPCv2.cxx
git://git.uio.no / u / mrichter / AliRoot.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Updated flags for low flux case (A. Dainese)
[u/mrichter/AliRoot.git] / TPC / AliTPCv2.cxx
diff --git a/TPC/AliTPCv2.cxx b/TPC/AliTPCv2.cxx
index 26e84c5919e9cb492ed994f7d310bb3616432cad..fa3d4c07758067e263b1e3652e7fc8aed502418b 100644 (file)
--- a/TPC/AliTPCv2.cxx
+++ b/TPC/AliTPCv2.cxx
@@ -39,6 +39,7 @@
 #include "AliTPCParam.h"
 #include "AliTPCTrackHitsV2.h"
 #include "AliTPCv2.h"
+#include "AliGeomManager.h"
 #include "TGeoVolume.h"
 #include "TGeoPcon.h"
 #include "TGeoTube.h"
@@ -65,8 +66,8 @@ AliTPCv2::AliTPCv2(const char *name, const char *title) :
   SetBufferSize(128000);
 
 
-  if (fTPCParam)
-     fTPCParam->Write(fTPCParam->GetTitle());
+//   if (fTPCParam)
+//      fTPCParam->Write(fTPCParam->GetTitle());
 }
  
 //_____________________________________________________________________________
@@ -99,33 +100,37 @@ void AliTPCv2::CreateGeometry()
   // here I define a volume TPC
   // retrive the medium name with "TPC_" as a leading string
   //
-  TGeoPcon *tpc = new TGeoPcon(0.,360.,18); //18 sections
-  tpc->DefineSection(0,-290.,77.,278.);
-  tpc->DefineSection(1,-259.6,70.,278.);
+  TGeoPcon *tpc = new TGeoPcon(0.,360.,20); //20 sections
   //
-  tpc->DefineSection(2,-259.6,68.1,278.);
-  tpc->DefineSection(3,-253.6,68.1,278.);
+  tpc->DefineSection(0,-291.,77.,278.);
+  tpc->DefineSection(1,-270,77.,278.);
   //
-  tpc->DefineSection(4,-253.6,68.,278.);
-  tpc->DefineSection(5,-74.0,60.8,278.);
+  tpc->DefineSection(2,-270.,77.,278.);
+  tpc->DefineSection(3,-259.6,70.,278.);
   //
-  tpc->DefineSection(6,-74.0,60.1,278.);
-  tpc->DefineSection(7,-73.3,60.1,278.);
+  tpc->DefineSection(4,-259.6,68.1,278.);
+  tpc->DefineSection(5,-253.6,68.1,278.);
   //
-  tpc->DefineSection(8,-73.3,56.9,278.); 
-  tpc->DefineSection(9,73.3,56.9,278.);
+  tpc->DefineSection(6,-253.6,68.,278.);
+  tpc->DefineSection(7,-74.0,60.8,278.);
   //
-  tpc->DefineSection(10,73.3,60.1,278.);
-  tpc->DefineSection(11,74.0,60.1,278.);
+  tpc->DefineSection(8,-74.0,60.1,278.);
+  tpc->DefineSection(9,-73.3,60.1,278.);
   //
-  tpc->DefineSection(12,74.0,60.8,278.);
-  tpc->DefineSection(13,253.6,65.5,278.);
+  tpc->DefineSection(10,-73.3,56.9,278.); 
+  tpc->DefineSection(11,73.3,56.9,278.);
   //
-  tpc->DefineSection(14,253.6,65.6,278.);
-  tpc->DefineSection(15,259.6,65.6,278.);
+  tpc->DefineSection(12,73.3,60.1,278.);
+  tpc->DefineSection(13,74.0,60.1,278.);
   //
-  tpc->DefineSection(16,259.6,70.0,278.);
-  tpc->DefineSection(17,290.,77.,278.);
+  tpc->DefineSection(14,74.0,60.8,278.);
+  tpc->DefineSection(15,253.6,65.5,278.);
+  //
+  tpc->DefineSection(16,253.6,65.6,278.);
+  tpc->DefineSection(17,259.6,65.6,278.);
+  //
+  tpc->DefineSection(18,259.6,70.0,278.);
+  tpc->DefineSection(19,291.,77.,278.);
   //
   TGeoMedium *m1 = gGeoManager->GetMedium("TPC_Air");
   TGeoVolume *v1 = new TGeoVolume("TPC_M",tpc,m1);
@@ -387,8 +392,8 @@ void AliTPCv2::CreateGeometry()
   TGeoTube *cs = new TGeoTube(56.9,61.2,0.1);
   TGeoMedium *sm7 = gGeoManager->GetMedium("TPC_Mylar");
   TGeoVolume *csv = new TGeoVolume("TPC_CDRS",cs,sm7);
-  v1->AddNode(csv,1,new TGeoTranslation(0.,0.,-71.));
-  v1->AddNode(csv,2,new TGeoTranslation(0.,0.,71.));
+  v1->AddNode(csv,1,new TGeoTranslation(0.,0.,-71.2));
+  v1->AddNode(csv,2,new TGeoTranslation(0.,0.,71.2));
   //
   // seal collars 
   TGeoPcon *se = new TGeoPcon(0.,360.,6);
@@ -842,6 +847,9 @@ void AliTPCv2::CreateGeometry()
   //----------------------------------------------------------
   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");
   // upper and lower rods differ in length!
   delete [] upar;
   upar=NULL;
@@ -858,7 +866,55 @@ void AliTPCv2::CreateGeometry()
   TGeoVolume *hvrv = new TGeoVolume("TPC_HV_Rod",hvr,m6);
   TGeoVolume *hvcv = new TGeoVolume("TPC_HV_Cable",hvc,m7);
   hvrv->AddNode(hvcv,1);
-  
+  //
+  // resistor rods
+  //
+  TGeoTube *cri = new TGeoTube(0.,0.45,126.64); //inner 
+  TGeoTube *cro = new TGeoTube(0.,0.45,126.54); //outer 
+  TGeoTube *cwi = new TGeoTube(0.,0.15,126.64); // water inner
+  TGeoTube *cwo = new TGeoTube(0.,0.15,126.54); // water outer
+  //
+  TGeoVolume *criv = new TGeoVolume("TPC_CR_I",cri,m10);
+  TGeoVolume *crov = new TGeoVolume("TPC_CR_O",cro,m10);    
+  TGeoVolume *cwiv = new TGeoVolume("TPC_W_I",cwi,m11);
+  TGeoVolume *cwov = new TGeoVolume("TPC_W_O",cwo,m11);   
+  //
+  // ceramic rod with water
+  //
+  criv->AddNode(cwiv,1); 
+  crov->AddNode(cwov,1);
+  //
+  TGeoTube *pri =new TGeoTube(0.2,0.35,126.64); //inner 
+  TGeoTube *pro = new TGeoTube(0.2,0.35,126.54); //outer    
+  //
+  // peek rod
+  //
+  TGeoVolume *priv = new TGeoVolume("TPC_PR_I",pri,m12);
+  TGeoVolume *prov = new TGeoVolume("TPC_PR_O",pro,m12); 
+  //
+  // resistor rods assembly
+  //
+   TGeoRotation* rotr = new TGeoRotation("rotr");
+   rotr->RotateZ(-21.);
+  //
+  TGeoTube *rri = new TGeoTube(1.8,2.2,126.64);//inner
+  TGeoTube *rro = new TGeoTube(1.8,2.2,126.54);//inner
+  //
+  TGeoVolume *rriv = new TGeoVolume("TPC_RR_I",rri,m6);
+  TGeoVolume *rrov = new TGeoVolume("TPC_RR_O",rro,m6);  
+  //
+  TGeoVolumeAssembly *rrin = new TGeoVolumeAssembly("TPC_RROD_I");
+  TGeoVolumeAssembly *rrou = new TGeoVolumeAssembly("TPC_RROD_O");
+  rrin->AddNode(rriv,1);
+  rrin->AddNode(criv,1,new TGeoTranslation(0.5,0.866, 0.));
+  rrin->AddNode(criv,2,new TGeoTranslation(0.5,-0.866, 0.)); 
+  rrin->AddNode(priv,1); 
+  //
+  rrou->AddNode(rrov,1);
+  rrou->AddNode(crov,1,new TGeoTranslation(0.5,0.866, 0.));
+  rrou->AddNode(crov,2,new TGeoTranslation(0.5,-0.866, 0.)); 
+  rrou->AddNode(prov,1); 
+  //
   for(Int_t i=0;i<18;i++){
     Double_t angle,x,y;
     Double_t z,r; 
@@ -868,21 +924,38 @@ void AliTPCv2::CreateGeometry()
     y=r * TMath::Sin(angle);
     upar[2]=126.64; //lower
     z= 126.96;
-    if(i==15){
-      v9->AddNode(hvrv,1,new TGeoTranslation(x,y,z));
-      v9->AddNode(hvrv,2,new TGeoTranslation(x,y,-z));
-    }
-    else{
-     gGeoManager->Node("TPC_Rod",i+1,"TPC_Drift",x,y,z,0,kTRUE,upar,3);//shaft
-     gGeoManager->Node("TPC_Rod",i+19,"TPC_Drift",x,y,-z,0,kTRUE,upar,3);//muon
+    //
+    if(i==3){
+       v9->AddNode(rrin,1,new TGeoCombiTrans(x,y, z, rotr)); //A
+       v9->AddNode(rrin,2,new TGeoCombiTrans(x,y,-z, rotr)); //C      
+    } 
+    else { 
+      gGeoManager->Node("TPC_Rod",i+1,"TPC_Drift",x,y,z,0,kTRUE,upar,3);//shaft
+      gGeoManager->Node("TPC_Rod",i+19,"TPC_Drift",x,y,-z,0,kTRUE,upar,3);//muon
     }
+   
+
+    //
     r=254.25;
     x=r * TMath::Cos(angle);
     y=r * TMath::Sin(angle);
     upar[2]=126.54; //upper
     z=127.06;
-    gGeoManager->Node("TPC_Rod",i+37,"TPC_Drift",x,y,z,0,kTRUE,upar,3);
-    gGeoManager->Node("TPC_Rod",i+55,"TPC_Drift",x,y,-z,0,kTRUE,upar,3);
+    //
+    if(i==15){
+      //v9->AddNode(hvrv,1,new TGeoTranslation(x,y,z));//A-side only
+        v9->AddNode(hvrv,1,new TGeoTranslation(x,y,127.14));//A-side only
+       gGeoManager->Node("TPC_Rod",i+55,"TPC_Drift",x,y,-z,0,kTRUE,upar,3);
+    }
+    else if(i==11){
+       v9->AddNode(rrou,1,new TGeoCombiTrans(x,y, z, rotr));  //A
+       v9->AddNode(rrou,2,new TGeoCombiTrans(x,y,-z, rotr));  //C
+    }
+    else{
+    //
+      gGeoManager->Node("TPC_Rod",i+37,"TPC_Drift",x,y,z,0,kTRUE,upar,3);
+      gGeoManager->Node("TPC_Rod",i+55,"TPC_Drift",x,y,-z,0,kTRUE,upar,3);
+    }
   }
 
   delete [] upar;
@@ -908,7 +981,8 @@ void AliTPCv2::AddAlignableVolumes() const
 void AliTPCv2::SetInnerChambersAlignable() const
 {
   //
-  Int_t modnum = 0;
+  AliGeomManager::ELayerID idTPC1 = AliGeomManager::kTPC1;
+  Int_t modUID, modnum = 0;
   TString vpstr1 = "ALIC_1/TPC_M_1/TPC_Drift_1/TPC_ENDCAP_1/TPC_SECT_";
   TString vpstr2 = "ALIC_1/TPC_M_1/TPC_Drift_1/TPC_ENDCAP_2/TPC_SECT_";
   TString vpappend = "/TPC_IROC_1";
@@ -918,42 +992,35 @@ void AliTPCv2::SetInnerChambersAlignable() const
   TString volpath, symname;
   
   for(Int_t cnt=1; cnt<=18; cnt++){
+    modUID = AliGeomManager::LayerToVolUID(idTPC1,modnum++);
     volpath = vpstr1;
     volpath += cnt;
     volpath += vpappend;
     symname = snstr1;
     symname += cnt;
     symname += snappend;
-    if(!gGeoManager->SetAlignableEntry(symname.Data(),volpath.Data()))
+    if(!gGeoManager->SetAlignableEntry(symname.Data(),volpath.Data(),modUID))
       AliFatal(Form("Alignable entry %s not created. Volume path %s not valid", symname.Data(),volpath.Data()));
-    //
-    TGeoPNEntry *alignableEntry = gGeoManager->GetAlignableEntry(symname.Data());
-    const char *path = alignableEntry->GetTitle();
-    if (!gGeoManager->cd(path))
-      AliFatal(Form("Volume path %s not valid!",path));
-    TGeoHMatrix* globMatrix = gGeoManager->GetCurrentMatrix();
+    TGeoPNEntry *alignableEntry = gGeoManager->GetAlignableEntryByUID(modUID);
+    TGeoHMatrix* globMatrix = alignableEntry->GetGlobalOrig();
     TGeoHMatrix* matTtoL = fTPCParam->Tracking2LocalMatrix(globMatrix,cnt-1);
     alignableEntry->SetMatrix(matTtoL);
-    modnum++;
   }
 
   for(Int_t cnt=1; cnt<=18; cnt++){
+    modUID = AliGeomManager::LayerToVolUID(idTPC1,modnum++);
     volpath = vpstr2;
     volpath += cnt;
     volpath += vpappend;
     symname = snstr2;
     symname += cnt;
     symname += snappend;
-    if(!gGeoManager->SetAlignableEntry(symname.Data(),volpath.Data()))
+    if(!gGeoManager->SetAlignableEntry(symname.Data(),volpath.Data(),modUID))
       AliFatal(Form("Alignable entry %s not created. Volume path %s not valid", symname.Data(),volpath.Data()));
-    TGeoPNEntry *alignableEntry = gGeoManager->GetAlignableEntry(symname.Data());
-    const char *path = alignableEntry->GetTitle();
-    if (!gGeoManager->cd(path))
-      AliFatal(Form("Volume path %s not valid!",path));
-    TGeoHMatrix* globMatrix = gGeoManager->GetCurrentMatrix();
+    TGeoPNEntry *alignableEntry = gGeoManager->GetAlignableEntryByUID(modUID);
+    TGeoHMatrix* globMatrix = alignableEntry->GetGlobalOrig();
     TGeoHMatrix* matTtoL = fTPCParam->Tracking2LocalMatrix(globMatrix,18+cnt-1);
     alignableEntry->SetMatrix(matTtoL);
-    modnum++;
   }
 }
 
@@ -961,7 +1028,8 @@ void AliTPCv2::SetInnerChambersAlignable() const
 void AliTPCv2::SetOuterChambersAlignable() const
 {
   //
-  Int_t modnum = 0;
+  AliGeomManager::ELayerID idTPC2 = AliGeomManager::kTPC2;
+  Int_t modUID, modnum = 0;
   TString vpstr1 = "ALIC_1/TPC_M_1/TPC_Drift_1/TPC_ENDCAP_1/TPC_SECT_";
   TString vpstr2 = "ALIC_1/TPC_M_1/TPC_Drift_1/TPC_ENDCAP_2/TPC_SECT_";
   TString vpappend = "/TPC_OROC_1";
@@ -971,41 +1039,35 @@ void AliTPCv2::SetOuterChambersAlignable() const
   TString volpath, symname;
   
   for(Int_t cnt=1; cnt<=18; cnt++){
+    modUID = AliGeomManager::LayerToVolUID(idTPC2,modnum++);
     volpath = vpstr1;
     volpath += cnt;
     volpath += vpappend;
     symname = snstr1;
     symname += cnt;
     symname += snappend;
-    if(!gGeoManager->SetAlignableEntry(symname.Data(),volpath.Data()))
+    if(!gGeoManager->SetAlignableEntry(symname.Data(),volpath.Data(),modUID))
       AliFatal(Form("Alignable entry %s not created. Volume path %s not valid", symname.Data(),volpath.Data()));
-    TGeoPNEntry *alignableEntry = gGeoManager->GetAlignableEntry(symname.Data());
-    const char *path = alignableEntry->GetTitle();
-    if (!gGeoManager->cd(path))
-      AliFatal(Form("Volume path %s not valid!",path));
-    TGeoHMatrix* globMatrix = gGeoManager->GetCurrentMatrix();
+    TGeoPNEntry *alignableEntry = gGeoManager->GetAlignableEntryByUID(modUID);
+    TGeoHMatrix* globMatrix = alignableEntry->GetGlobalOrig();
     TGeoHMatrix* matTtoL = fTPCParam->Tracking2LocalMatrix(globMatrix,36+cnt-1);
     alignableEntry->SetMatrix(matTtoL);
-    modnum++;
   }
 
   for(Int_t cnt=1; cnt<=18; cnt++){
+    modUID = AliGeomManager::LayerToVolUID(idTPC2,modnum++);
     volpath = vpstr2;
     volpath += cnt;
     volpath += vpappend;
     symname = snstr2;
     symname += cnt;
     symname += snappend;
-    if(!gGeoManager->SetAlignableEntry(symname.Data(),volpath.Data()))
+    if(!gGeoManager->SetAlignableEntry(symname.Data(),volpath.Data(),modUID))
       AliFatal(Form("Alignable entry %s not created. Volume path %s not valid", symname.Data(),volpath.Data()));
-     TGeoPNEntry *alignableEntry = gGeoManager->GetAlignableEntry(symname.Data());
-    const char *path = alignableEntry->GetTitle();
-    if (!gGeoManager->cd(path))
-      AliFatal(Form("Volume path %s not valid!",path));
-    TGeoHMatrix* globMatrix = gGeoManager->GetCurrentMatrix();
+    TGeoPNEntry *alignableEntry = gGeoManager->GetAlignableEntryByUID(modUID);
+    TGeoHMatrix* globMatrix = alignableEntry->GetGlobalOrig();
     TGeoHMatrix* matTtoL = fTPCParam->Tracking2LocalMatrix(globMatrix,36+18+cnt-1);
     alignableEntry->SetMatrix(matTtoL);
-    modnum++;
   }
 }
 
@@ -1151,6 +1213,7 @@ void AliTPCv2::Init()
  
       gMC->Gstpar(idtmed[2],"PRIMIO_N", 14.35);
       gMC->Gstpar(idtmed[2],"LOSS", 14); // specific energy loss
+      gMC->Gstpar(idtmed[2],"STRA",4);
   } else {
       gMC->Gstpar(idtmed[2],"LOSS", 5); // specific energy loss
   }
@@ -1217,8 +1280,8 @@ void AliTPCv2::StepManager()
   fTPCParam->AdjustCosSin(sector,cos,sin);
   Float_t x1=p[0]*cos + p[1]*sin;
   // check if within sector's limits
-  if(x1>=fTPCParam->GetInnerRadiusLow()&&x1<=fTPCParam->GetInnerRadiusUp()
-     ||x1>=fTPCParam->GetOuterRadiusLow()&&x1<=fTPCParam->GetOuterRadiusUp()){
+  if((x1>=fTPCParam->GetInnerRadiusLow()&&x1<=fTPCParam->GetInnerRadiusUp())
+     ||(x1>=fTPCParam->GetOuterRadiusLow()&&x1<=fTPCParam->GetOuterRadiusUp())){
   // calculate real sector number...
   if (x1>fTPCParam->GetOuterRadiusLow()){
     sector = TMath::Nint((angle-fTPCParam->GetOuterAngleShift())/