author kowal2 Wed, 13 Apr 2011 14:57:52 +0000 (14:57 +0000) committer kowal2 Wed, 13 Apr 2011 14:57:52 +0000 (14:57 +0000)
 TPC/AliTPC.cxx patch | blob | blame | history TPC/AliTPCv0.cxx patch | blob | blame | history TPC/AliTPCv1.cxx patch | blob | blame | history TPC/AliTPCv2.cxx patch | blob | blame | history TPC/AliTPCv3.cxx patch | blob | blame | history TPC/AliTPCv4.cxx patch | blob | blame | history

index ed24ff8..34487b6 100644 (file)
@@ -294,30 +294,33 @@ void AliTPC::CreateMaterials()

//
// Drift gases 1 - nonsensitive, 2 - sensitive
-  // Ne-CO2-N2 (90-10-5) (volume) values at 20deg and 1 atm.
-  // rho(Ne) = 0.839 g/cm^3, rho(CO2) = 1.842 g/cm^3, rho(N2) = 1.165 g/cm^3
-  // for the calculation - everything is normalized to 1
+  // Ne-CO2 (90-10) (volume) values at 20deg and 1 atm.
+  // rho(Ne) = 0.839 g/cm^3, rho(CO2) = 1.842 g/cm^3
+

amat[0]= 20.18;
amat[1]=12.011;
amat[2]=15.9994;
-  amat[3]=14.007;
+  // amat[3]=14.007;

zmat[0]= 10.;
zmat[1]=6.;
zmat[2]=8.;
-  zmat[3]=7.;
-
-  wmat[0]=0.756992632;
-  wmat[1]=0.056235789;
-  wmat[2]=0.128469474;
-  wmat[3]=0.058395789;
+  // zmat[3]=7.;
+
+  //wmat[0]=0.756992632;
+  wmat[0]=0.8038965;
+  //wmat[1]=0.056235789;
+  wmat[1]= 0.053519;
+  //wmat[2]=0.128469474;
+  wmat[2]= 0.1425743;
+  // wmat[3]=0.058395789;

-  density=0.000904929;
+  density=0.0009393;

-  AliMixture(12,"Ne-CO2-N-1",amat,zmat,density,4,wmat);
-  AliMixture(13,"Ne-CO2-N-2",amat,zmat,density,4,wmat);
-  AliMixture(35,"Ne-CO2-N-3",amat,zmat,density,4,wmat);
+  AliMixture(12,"Ne-CO2-1",amat,zmat,density,3,wmat);
+  AliMixture(13,"Ne-CO2-2",amat,zmat,density,3,wmat);
+  AliMixture(35,"Ne-CO2-3",amat,zmat,density,3,wmat);
//----------------------------------------------------------------------
//               solid materials
//----------------------------------------------------------------------
@@ -680,10 +683,10 @@ void AliTPC::CreateMaterials()
//----------------------------------------------------------

AliMedium(0, "Air", 11, 0, iSXFLD, sXMGMX, 10., 999., .1, .01, .1);
-  AliMedium(1, "Ne-CO2-N-1", 12, 0, iSXFLD, sXMGMX, 10., 999.,.1,.001, .001);
-  AliMedium(2, "Ne-CO2-N-2", 13, 1, iSXFLD, sXMGMX, 10., 999.,.1,.001, .001);
+  AliMedium(1, "Ne-CO2-1", 12, 0, iSXFLD, sXMGMX, 10., 999.,.1,.001, .001);
+  AliMedium(2, "Ne-CO2-2", 13, 1, iSXFLD, sXMGMX, 10., 999.,.1,.001, .001);
AliMedium(3,"CO2",10,0, iSXFLD, sXMGMX, 10., 999.,.1, .001, .001);
-  AliMedium(20, "Ne-CO2-N-3", 35, 1, iSXFLD, sXMGMX, 10., 999.,.1,.001, .001);
+  AliMedium(20, "Ne-CO2-3", 35, 1, iSXFLD, sXMGMX, 10., 999.,.1,.001, .001);
//-----------------------------------------------------------
// tracking media for solids
//-----------------------------------------------------------
index 9095c23..7f93446 100644 (file)
@@ -144,7 +144,7 @@ void AliTPCv0::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-1");
+  TGeoMedium *m5 = gGeoManager->GetMedium("TPC_Ne-CO2-1");
TGeoVolume *v9 = new TGeoVolume("TPC_Drift",dvol,m5);
//
index ed625d3..a93d186 100644 (file)
@@ -160,7 +160,7 @@ void AliTPCv1::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-1");
+  TGeoMedium *m5 = gGeoManager->GetMedium("TPC_Ne-CO2-1");
TGeoVolume *v9 = new TGeoVolume("TPC_Drift",dvol,m5);
//
//
@@ -801,7 +801,7 @@ void AliTPCv1::CreateGeometry()

// sensitive strips
-   TGeoMedium *m8 = gGeoManager->GetMedium("TPC_Ne-CO2-N-2");
+   TGeoMedium *m8 = gGeoManager->GetMedium("TPC_Ne-CO2-2");
Int_t totrows;
totrows = fTPCParam->GetNRowLow() + fTPCParam->GetNRowUp();
Double_t *upar;
index e962ac4..a373c4f 100644 (file)
@@ -157,7 +157,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);
//
index 2edeaea..61c577b 100644 (file)
@@ -162,7 +162,7 @@ void AliTPCv3::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);
//