]> 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
coverity fix
[u/mrichter/AliRoot.git] / TPC / AliTPCv2.cxx
diff --git a/TPC/AliTPCv2.cxx b/TPC/AliTPCv2.cxx
index 9550c4f0bc4f6e4e698888df4e600e93b2a206b5..35ff89532f40c5cf3e4f740ae19c4bbce2ca7868 100644 (file)
--- a/TPC/AliTPCv2.cxx
+++ b/TPC/AliTPCv2.cxx
@@ -50,6 +50,7 @@
 #include "TGeoPara.h"
 #include "TGeoPhysicalNode.h"
 #include "TGeoHalfSpace.h"
+#include "TTreeStream.h"
 
 ClassImp(AliTPCv2)
  
@@ -102,37 +103,52 @@ 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.,20); //20 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,68.,278.);
+  tpc->DefineSection(9,-74.0,60.8,278.);
   //
-  tpc->DefineSection(10,-73.3,56.9,278.); 
-  tpc->DefineSection(11,73.3,56.9,278.);
+  tpc->DefineSection(10,-74.0,60.1,278.);
+  tpc->DefineSection(11,-73.3,60.1,278.);
   //
-  tpc->DefineSection(12,73.3,60.1,278.);
-  tpc->DefineSection(13,74.0,60.1,278.);
+  tpc->DefineSection(12,-73.3,56.9,278.); 
+  tpc->DefineSection(13,-68.5,56.9,278.);
   //
-  tpc->DefineSection(14,74.0,60.8,278.);
-  tpc->DefineSection(15,253.6,65.5,278.);
+  tpc->DefineSection(14,-68.5,60.,278.);
+  tpc->DefineSection(15,-64.7,60.,278.);
   //
-  tpc->DefineSection(16,253.6,65.6,278.);
-  tpc->DefineSection(17,259.6,65.6,278.);
+  tpc->DefineSection(16,-64.7,56.9,278.); 
+  tpc->DefineSection(17,73.3,56.9,278.);
   //
-  tpc->DefineSection(18,259.6,70.0,278.);
-  tpc->DefineSection(19,291.,77.,278.);
+  tpc->DefineSection(18,73.3,60.1,278.);
+  tpc->DefineSection(19,74.0,60.1,278.);
+  //
+  tpc->DefineSection(20,74.0,60.8,278.);
+  tpc->DefineSection(21,253.6,65.5,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);
@@ -150,7 +166,7 @@ void AliTPCv2::CreateGeometry()
   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_Ne-CO2-2");
   TGeoVolume *v9 = new TGeoVolume("TPC_Drift",dvol,m5);
   //
   v1->AddNode(v9,1);
@@ -354,11 +370,11 @@ void AliTPCv2::CreateGeometry()
   //
   // segment outermost
   //
-  TGeoTubeSeg *t2 = new TGeoTubeSeg(76.6774,78.845,74.175,350.,109.6); // tedlar 38 microns
-  TGeoTubeSeg *t3 = new TGeoTubeSeg(76.6812,78.8412,74.175,350.,109.6); // prepreg2 500 microns
-  TGeoTubeSeg *t4 = new TGeoTubeSeg(76.7312,78.7912,74.175,350.,109.6); // prepreg3 300 microns
-  TGeoTubeSeg *t5 = new TGeoTubeSeg(76.7612,78.7612,74.175,350.,109.6); // nomex 2 cm
-  TGeoTubeSeg *tepox1 = new TGeoTubeSeg(76.6774,78.845,74.175,109.6,110.);//epoxy
+  TGeoTubeSeg *t2 = new TGeoTubeSeg(76.6774,78.845,74.175,350.,109.4); // tedlar 38 microns
+  TGeoTubeSeg *t3 = new TGeoTubeSeg(76.6812,78.8412,74.175,350.,109.4); // prepreg2 500 microns
+  TGeoTubeSeg *t4 = new TGeoTubeSeg(76.7312,78.7912,74.175,350.,109.4); // prepreg3 300 microns
+  TGeoTubeSeg *t5 = new TGeoTubeSeg(76.7612,78.7612,74.175,350.,109.4); // nomex 2 cm
+  TGeoTubeSeg *tepox1 = new TGeoTubeSeg(76.6774,78.845,74.175,109.4,110.);//epoxy
   TGeoTubeSeg *tpr1 = new TGeoTubeSeg(78.845,78.885,74.175,109.,111.);
   
   // volumes for the outer part  
@@ -373,11 +389,11 @@ void AliTPCv2::CreateGeometry()
   //
   // segment middle
   //
-  TGeoTubeSeg *t6 = new TGeoTubeSeg(76.6774,78.795,5.,350.,109.6); // tedlar 38 microns
-  TGeoTubeSeg *t7 = new TGeoTubeSeg(76.6812,78.7912,5.,350.,109.6); // prepreg2 250 microns
-  TGeoTubeSeg *t8 = new TGeoTubeSeg(76.7062,78.7662,5.,350.,109.6); // prepreg3 300 microns
-  TGeoTubeSeg *t9 = new TGeoTubeSeg(76.7362,78.7362,5.,350.,109.6); // nomex 2 cm
-  TGeoTubeSeg *tepox2 = new TGeoTubeSeg(76.6774,78.795,5.,109.6,110.);//epoxy
+  TGeoTubeSeg *t6 = new TGeoTubeSeg(76.6774,78.795,5.,350.,109.4); // tedlar 38 microns
+  TGeoTubeSeg *t7 = new TGeoTubeSeg(76.6812,78.7912,5.,350.,109.4); // prepreg2 250 microns
+  TGeoTubeSeg *t8 = new TGeoTubeSeg(76.7062,78.7662,5.,350.,109.4); // prepreg3 300 microns
+  TGeoTubeSeg *t9 = new TGeoTubeSeg(76.7362,78.7362,5.,350.,109.4); // nomex 2 cm
+  TGeoTubeSeg *tepox2 = new TGeoTubeSeg(76.6774,78.795,5.,109.4,110.);//epoxy
   TGeoTubeSeg *tpr2 = new TGeoTubeSeg(78.795,78.835,5.,109.,111.);
   // volumes for the middle part
   TGeoVolume *tv6 = new TGeoVolume("TPC_IFC7",t6,sm2);
@@ -390,10 +406,10 @@ void AliTPCv2::CreateGeometry()
   // 
   // segment central part
   //
-  TGeoTubeSeg *t10 = new TGeoTubeSeg(76.6774,78.785,93.75,350.,109.6); // tedlar 38 microns 
-  TGeoTubeSeg *t11 = new TGeoTubeSeg(76.6812,78.7812,93.75,350.,109.6); // prepreg3 500 microns
-  TGeoTubeSeg *t12 = new TGeoTubeSeg(76.7312,78.7312,93.75,350.,109.6); // nomex 2 cm 
-  TGeoTubeSeg *tepox3 = new TGeoTubeSeg(76.6774,78.785,93.75,109.6,110.);//epoxy
+  TGeoTubeSeg *t10 = new TGeoTubeSeg(76.6774,78.785,93.75,350.,109.4); // tedlar 38 microns 
+  TGeoTubeSeg *t11 = new TGeoTubeSeg(76.6812,78.7812,93.75,350.,109.4); // prepreg3 500 microns
+  TGeoTubeSeg *t12 = new TGeoTubeSeg(76.7312,78.7312,93.75,350.,109.4); // nomex 2 cm 
+  TGeoTubeSeg *tepox3 = new TGeoTubeSeg(76.6774,78.785,93.75,109.4,110.);//epoxy
   TGeoTubeSeg *tpr3 = new TGeoTubeSeg(78.785,78.825,93.75,109.,111.);
   // volumes for the central part
   TGeoVolume *tv10 = new TGeoVolume("TPC_IFC11",t10,sm2);
@@ -510,10 +526,15 @@ void AliTPCv2::CreateGeometry()
   //
   TGeoVolume *cflv = new TGeoVolume("TPC_CDR",cfl,m3);
   // sandwich
-  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.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);  
   //
   TGeoMedium *sm6 = gGeoManager->GetMedium("TPC_Prepreg1");
   TGeoMedium *sm8 = gGeoManager->GetMedium("TPC_Epoxyfm");
@@ -521,6 +542,7 @@ void AliTPCv2::CreateGeometry()
   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);
 
   //
   // seals for central drum 2 copies
@@ -551,7 +573,17 @@ void AliTPCv2::CreateGeometry()
   //
   TGeoRotation *ref = new TGeoRotation("ref",90.,0.,90.,90.,180.,0.);
   //
-  cd1v->AddNode(cd2v,1); cd2v->AddNode(cd3v,1); cd3v->AddNode(cd4v,1); cflv->AddNode(cd1v,1); 
+  cd1v->AddNode(cd2v,1); cd2v->AddNode(cd3v,1); cd3v->AddNode(cd4v,1); //sandwich
+  // first segment  
+  cflv->AddNode(cd1v,1); cflv->AddNode(tvep4,1);
+  // second segment
+  segrot = new TGeoRotation();
+  segrot->RotateZ(120.);
+  cflv->AddNode(cd1v,2,segrot); cflv->AddNode(tvep4,2,segrot);
+  // third segment
+  segrot = new TGeoRotation();
+  segrot->RotateZ(240.);
+  cflv->AddNode(cd1v,3,segrot); cflv->AddNode(tvep4,3,segrot);
   //
   v1->AddNode(siv,1,new TGeoTranslation(0.,0.,-69.9));
   v1->AddNode(siv,2,new TGeoTranslation(0.,0.,69.9));
@@ -561,7 +593,7 @@ void AliTPCv2::CreateGeometry()
   //
   TGeoTube *ih = new TGeoTube(81.05,84.05,0.3);
   TGeoTube *oh = new TGeoTube(250.,256.,0.5);
-  TGeoTube *mem = new TGeoTube(84.05,250.,0.01);
+  TGeoTube *mem = new TGeoTube(84.05,250.,0.00115);
 
   //
   TGeoMedium *m4 = gGeoManager->GetMedium("TPC_G10");
@@ -1042,20 +1074,23 @@ void AliTPCv2::CreateGeometry()
   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
@@ -1488,113 +1523,6 @@ void AliTPCv2::SetOuterChambersAlignable() const
   }
 }
 
-//_____________________________________________________________________________
-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()
@@ -1680,6 +1608,15 @@ void AliTPCv2::StepManager()
   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]);
   //
@@ -1798,7 +1735,27 @@ void AliTPCv2::StepManager()
     hits[4]=gMC->TrackTime();
  
     AddHit(gAlice->GetMCApp()->GetCurrentTrackNumber(), vol,hits);
-
+    if (fDebugStreamer){   
+      // You can dump here what you need
+      // function  CreateDebugStremer() to be called in the Config.C  macro
+      // if you want to enable it
+      // By default debug streaemer is OFF
+      Float_t edep = gMC->Edep();
+      Float_t tstep = gMC->TrackStep();
+      Int_t pid=gMC->TrackPid();
+      (*fDebugStreamer)<<"hit"<<      
+       "x="<<hits[0]<<  // hit position
+       "y="<<hits[1]<<
+       "z="<<hits[2]<<
+       "nel="<<hits[3]<<  // number of electorns
+       "tof="<<hits[4]<<  // hit TOF
+       "edep="<<edep<<    // energy deposit
+       "pid="<<pid<<      // pid
+       "step="<<tstep<<
+       "p.="<<&p<<
+       "\n";
+    }
+    
   } // step>0 
   } //within sector's limits
   // Stemax calculation for the next step