o add options for other gases and Epsilons

diff --git a/TPC/Upgrade/AliToyMCEventGenerator.cxx b/TPC/Upgrade/AliToyMCEventGenerator.cxx
index a8fef3415db1934e853fc50c71b4ae33eb9b9982..a7e742278be5fe41e774cc0d9303f64a8eb91841 100644 (file)
--- a/TPC/Upgrade/AliToyMCEventGenerator.cxx
+++ b/TPC/Upgrade/AliToyMCEventGenerator.cxx
@@ -554,6 +554,9 @@ void AliToyMCEventGenerator::SetSpaceCharge(EEpsilon epsilon, EGasType gasType/*
     case kNeCO2_9010:
       fCorrectionFile.Append("_NeCO2");
       break;
+    case kNeCO2N2_90105:
+      fCorrectionFile.Append("_NeCO2N2");
+      break;
   }
   switch (epsilon) {
     case kEps5:
@@ -565,6 +568,18 @@ void AliToyMCEventGenerator::SetSpaceCharge(EEpsilon epsilon, EGasType gasType/*
     case kEps20:
       fCorrectionFile.Append("_eps20");
       break;
+    case kEps25:
+      fCorrectionFile.Append("_eps25");
+      break;
+    case kEps30:
+      fCorrectionFile.Append("_eps30");
+      break;
+    case kEps35:
+      fCorrectionFile.Append("_eps35");
+      break;
+    case kEps40:
+      fCorrectionFile.Append("_eps40");
+      break;
   }
   switch (collRate) {
     case k50kHz:

diff --git a/TPC/Upgrade/AliToyMCEventGenerator.h b/TPC/Upgrade/AliToyMCEventGenerator.h
index 73becd496fbf5c890b6f46a74df0b0ef1ce9803d..224dd31fc018ad9921c6ace1dbb1789c5fe6affe 100644 (file)
--- a/TPC/Upgrade/AliToyMCEventGenerator.h
+++ b/TPC/Upgrade/AliToyMCEventGenerator.h
@@ -16,13 +16,18 @@ class AliToyMCEvent;
 class AliToyMCEventGenerator : public TObject {
  public:
    enum EGasType {
-     kNeCO2_9010=0
-  };
+     kNeCO2_9010=0,
+     kNeCO2N2_90105
+   };
 
   enum EEpsilon {
     kEps5=0,
     kEps10,
-    kEps20
+    kEps20,
+    kEps25,
+    kEps30,
+    kEps35,
+    kEps40
   };
 
   enum ECollRate {

diff --git a/TPC/Upgrade/macros/runSimRec b/TPC/Upgrade/macros/runSimRec
index b86f074ddbe6608e9dd17302c85039749fba7e96..97a8848f717a179fb731faa6e2c80572edfce6b4 100755 (executable)
--- a/TPC/Upgrade/macros/runSimRec
+++ b/TPC/Upgrade/macros/runSimRec
@@ -7,11 +7,16 @@ SCtype=$4
 nevents=$5
 ntracks=$6
 rate=$7
+gas=$8
 
 if [ "x$rate" == "x" ]; then
   rate=50
 fi
 
+if [ "x$gas" == "x" ]; then
+  gas=0
+fi
+  
 module use /cvmfs/alice.gsi.de/modules
 module purge
 #module load ALICE/${vers}
@@ -21,4 +26,4 @@ module load $mod
 test -d $outDir || mkdir -p $outDir
 cd $outDir
 
-root.exe -l -b -q $ALICE_ROOT/TPC/Upgrade/macros/{loadlibs.C,ConfigOCDB.C} $ALICE_ROOT/TPC/Upgrade/macros/runSimRec.C\($simtype,$SCtype,$nevents,$ntracks,$rate\)
+root.exe -l -b -q $ALICE_ROOT/TPC/Upgrade/macros/{loadlibs.C,ConfigOCDB.C} $ALICE_ROOT/TPC/Upgrade/macros/runSimRec.C\($simtype,$SCtype,$nevents,$ntracks,$rate,$gas\)

diff --git a/TPC/Upgrade/macros/runSimRec.C b/TPC/Upgrade/macros/runSimRec.C
index 1ff502b84ee6566085f6dfff73ee30d7549b6d11..f594ca4fdab953975ce648273de3d5f52f22c72a 100644 (file)
--- a/TPC/Upgrade/macros/runSimRec.C
+++ b/TPC/Upgrade/macros/runSimRec.C
@@ -1,4 +1,4 @@
-void runSimRec(Int_t simtype, Int_t SCtype, Int_t nevents, Int_t ntracks, Int_t rate=50)
+void runSimRec(Int_t simtype, Int_t SCtype, Int_t nevents, Int_t ntracks, Int_t rate=50, Int_t gas=0)
 {
   //rate is in kHz
 
@@ -21,20 +21,49 @@ void runSimRec(Int_t simtype, Int_t SCtype, Int_t nevents, Int_t ntracks, Int_t
       outputFile.Append(Form("_train_%dkHz",rate));
       break;
   }
+
+  AliToyMCEventGeneratorSimple::EGasType gasType=AliToyMCEventGeneratorSimple::kNeCO2_9010;
+  
+  switch (gas) {
+    case 0:
+      gasType=AliToyMCEventGeneratorSimple::kNeCO2_9010;
+      outputFile.Appen("_NeCO2");
+      break;
+    case 1:
+      gasType=AliToyMCEventGeneratorSimple::kNeCO2N2_90105;
+      outputFile.Appen("_NeCO2N2");
+      break;
+  }
   
   switch (SCtype) {
     case 0:
-      s.SetSpaceCharge(AliToyMCEventGeneratorSimple::kEps5);
+      s.SetSpaceCharge(AliToyMCEventGeneratorSimple::kEps5, gasType);
       outputFile.Append("_eps05");
       break;
     case 1:
-      s.SetSpaceCharge(AliToyMCEventGeneratorSimple::kEps10);
+      s.SetSpaceCharge(AliToyMCEventGeneratorSimple::kEps10, gasType);
       outputFile.Append("_eps10");
       break;
     case 2:
-      s.SetSpaceCharge(AliToyMCEventGeneratorSimple::kEps20);
+      s.SetSpaceCharge(AliToyMCEventGeneratorSimple::kEps20, gasType);
       outputFile.Append("_eps20");
       break;
+    case 3:
+      s.SetSpaceCharge(AliToyMCEventGeneratorSimple::kEps25, gasType);
+      outputFile.Append("_eps25");
+      break;
+    case 4:
+      s.SetSpaceCharge(AliToyMCEventGeneratorSimple::kEps30, gasType);
+      outputFile.Append("_eps30");
+      break;
+    case 5:
+      s.SetSpaceCharge(AliToyMCEventGeneratorSimple::kEps35, gasType);
+      outputFile.Append("_eps35");
+      break;
+    case 6:
+      s.SetSpaceCharge(AliToyMCEventGeneratorSimple::kEps40, gasType);
+      outputFile.Append("_eps40");
+      break;
   }
 
   outputFile.Append(Form("_%04dev_%04dtr",nevents,ntracks));