fixing coverity and compiler warning

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

diff --git a/TPC/AliTPCv4.cxx b/TPC/AliTPCv4.cxx
index dd5b03706acaa2417ae50a0459d9f37e7dec3219..80004c746fd105ce478db708f61ac16c9315071a 100644 (file)
--- a/TPC/AliTPCv4.cxx
+++ b/TPC/AliTPCv4.cxx
@@ -49,6 +49,7 @@ TPC version for the krypton runs (Marek)
 #include "TGeoPcon.h"
 #include "TGeoTube.h"
 #include "TGeoPgon.h"
+#include "TGeoCone.h"
 #include "TGeoTrd1.h"
 #include "TGeoCompositeShape.h"
 #include "TGeoPara.h"
@@ -119,8 +120,8 @@ void AliTPCv4::CreateGeometry()
   tpc->DefineSection(6,-259.6,68.1,278.);
   tpc->DefineSection(7,-253.6,68.1,278.);
   //
-  tpc->DefineSection(8,-253.6,68.,278.);
-  tpc->DefineSection(9,-74.0,60.8,278.);
+  tpc->DefineSection(8,-253.6,67.88,278.);//hs
+  tpc->DefineSection(9,-74.0,60.68,278.);// hs
   //
   tpc->DefineSection(10,-74.0,60.1,278.);
   tpc->DefineSection(11,-73.3,60.1,278.);
@@ -137,8 +138,8 @@ void AliTPCv4::CreateGeometry()
   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(20,74.0,60.68,278.);// hs
+  tpc->DefineSection(21,253.6,65.38,278.);// hs
   //
   tpc->DefineSection(22,253.6,65.6,278.);
   tpc->DefineSection(23,259.6,65.6,278.);
@@ -220,6 +221,8 @@ void AliTPCv4::CreateGeometry()
   TGeoVolume *tov2 = new TGeoVolume("TPC_OCV2",to2,sm2);
   TGeoVolume *tov3 = new TGeoVolume("TPC_OCV3",to3,sm3);
   TGeoVolume *tov4 = new TGeoVolume("TPC_OCV4",to4,sm4);
+  TGeoMedium *mhs = gGeoManager->GetMedium("TPC_Steel");
+  TGeoMedium *m12 =  gGeoManager->GetMedium("TPC_Water");
  //-------------------------------------------------------
   //  Tpc Outer Field Cage
   //  daughters - composite (sandwich)
@@ -301,6 +304,16 @@ void AliTPCv4::CreateGeometry()
   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
   //-----------------------------------------------
@@ -322,6 +335,15 @@ void AliTPCv4::CreateGeometry()
   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
@@ -381,6 +403,8 @@ void AliTPCv4::CreateGeometry()
   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 
@@ -870,7 +894,7 @@ void AliTPCv4::CreateGeometry()
   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;
@@ -1270,7 +1294,8 @@ void AliTPCv4::StepManager()
 
     // 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;