Drift gas selection via title in the AliTPC constructor

diff --git a/TPC/AliTPC.cxx b/TPC/AliTPC.cxx
index b7aa8998cdd3b9277f01948c68a08500adc14092..1d2e048a7abbb670ad943a33a0532bcceafe25cd 100644 (file)
--- a/TPC/AliTPC.cxx
+++ b/TPC/AliTPC.cxx
@@ -181,12 +181,12 @@ AliTPC::AliTPC(const char *name, const char *title)
   //
 
 
-  if (!strcmp(title,"Default")) {       
-    //fTPCParam = new AliTPCParamSR;
-    fTPCParam = AliTPCcalibDB::Instance()->GetParameters();
+  if (!strcmp(title,"Ne-CO2") || !strcmp(title,"Ne-CO2-N") || !strcmp(title,"Default") ) {       
+      fTPCParam = AliTPCcalibDB::Instance()->GetParameters();
   } else {
+      
     AliWarning("In Config.C you must set non-default parameters.");
-    fTPCParam=0;
+    fTPCParam=0;    
   }
 
 }
@@ -295,34 +295,51 @@ void AliTPC::CreateMaterials()
   //----------------------------------------------------------------
 
   //
-  // Drift gases 1 - nonsensitive, 2 - sensitive
-  // 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
-  
+  // Drift gases 1 - nonsensitive, 2 - sensitive, 3 - for Kr
+  //  Composition by % of volume, values at 20deg and 1 atm.
+  //
+  //  get the geometry title - defined in Config.C
+  //
 
+  TString title(GetTitle());
+  
+  //
   amat[0]= 20.18;
   amat[1]=12.011;
   amat[2]=15.9994;
-  // amat[3]=14.007;
+
 
   zmat[0]= 10.; 
   zmat[1]=6.;
   zmat[2]=8.;
-  // 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.0009393;
 
-  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);
+  if(title == TString("Ne-CO2")){
+    wmat[0]=0.8038965;
+    wmat[1]= 0.053519;
+    wmat[2]= 0.1425743;
+    density=0.0009393;
+    //
+    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);
+  }
+  else if (title == TString("Ne-CO2-N")){
+     amat[3]=14.007;
+     zmat[3]=7.; 
+     wmat[0]=0.756992632;
+     wmat[1]=0.056235789; 
+     wmat[2]=0.128469474; 
+     wmat[3]=0.058395789;
+     density=0.000904929;
+     //
+     AliMixture(12,"Ne-CO2-N-1",amat,zmat,density,4,wmat);
+     AliMixture(13,"Ne-CO2-N-2",amat,zmat,density,4,wmat);
+     AliMixture(30,"Ne-CO2-N-3",amat,zmat,density,4,wmat);
+  
+  }
+
+
+
   //----------------------------------------------------------------------
   //               solid materials
   //----------------------------------------------------------------------
@@ -685,10 +702,10 @@ void AliTPC::CreateMaterials()
   //----------------------------------------------------------
 
   AliMedium(0, "Air", 11, 0, iSXFLD, sXMGMX, 10., 999., .1, .01, .1);
-  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(1, "DriftGas1", 12, 0, iSXFLD, sXMGMX, 10., 999.,.1,.001, .001);
+  AliMedium(2, "DriftGas2", 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-3", 35, 1, iSXFLD, sXMGMX, 10., 999.,.1,.001, .001);
+  AliMedium(20, "DriftGas3", 35, 1, iSXFLD, sXMGMX, 10., 999.,.1,.001, .001);
   //-----------------------------------------------------------  
   // tracking media for solids
   //-----------------------------------------------------------

diff --git a/TPC/AliTPCv0.cxx b/TPC/AliTPCv0.cxx
index 1130e14660c60fd9e4515073f59ec1c0f5647740..9bb0e5371b6669c6a5b8330797a586eafe7c1334 100644 (file)
--- a/TPC/AliTPCv0.cxx
+++ b/TPC/AliTPCv0.cxx
@@ -164,7 +164,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-1");
+  TGeoMedium *m5 = gGeoManager->GetMedium("TPC_DriftGasS1");
   TGeoVolume *v9 = new TGeoVolume("TPC_Drift",dvol,m5);
   //
   v1->AddNode(v9,1);

diff --git a/TPC/AliTPCv2.cxx b/TPC/AliTPCv2.cxx
index c3dddce6c99d2b7e5d5733a00e78383681bb7ee3..edd27669b6feee6618fa7029dddaef84b1912892 100644 (file)
--- a/TPC/AliTPCv2.cxx
+++ b/TPC/AliTPCv2.cxx
@@ -169,7 +169,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-2");
+  TGeoMedium *m5 = gGeoManager->GetMedium("TPC_DriftGas2");
   TGeoVolume *v9 = new TGeoVolume("TPC_Drift",dvol,m5);
   //
   v1->AddNode(v9,1);

diff --git a/TPC/AliTPCv3.cxx b/TPC/AliTPCv3.cxx
index 072c8ecf13df1558644ac8329f43a393589078e5..ea957ceda5f3c87d3ab5a73ad666d9d2222fe3a7 100644 (file)
--- a/TPC/AliTPCv3.cxx
+++ b/TPC/AliTPCv3.cxx
@@ -181,7 +181,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-2");
+  TGeoMedium *m5 = gGeoManager->GetMedium("TPC_DriftGas2");
   TGeoVolume *v9 = new TGeoVolume("TPC_Drift",dvol,m5);
   //
   v1->AddNode(v9,1);

diff --git a/TPC/AliTPCv4.cxx b/TPC/AliTPCv4.cxx
index e6968cea625dcdcce5155a025b46b86b07e5b9e5..8d65128d8736d2024a0b0bb52701682dd92c6ce2 100644 (file)
--- a/TPC/AliTPCv4.cxx
+++ b/TPC/AliTPCv4.cxx
@@ -172,7 +172,7 @@ void AliTPCv4::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-3");
+  TGeoMedium *m5 = gGeoManager->GetMedium("TPC_DriftGas3");
   TGeoVolume *v9 = new TGeoVolume("TPC_Drift",dvol,m5);
   //
   v1->AddNode(v9,1);