update for new geant4 production

diff --git a/test/vmctest/production/Config.C b/test/vmctest/production/Config.C
index 758d4ce7c20e8d337514576e52ca284c815a37d8..10c32233f62dadd48bae837ed6540954a929effc 100644 (file)
--- a/test/vmctest/production/Config.C
+++ b/test/vmctest/production/Config.C
@@ -73,6 +73,15 @@ const char * physicsListName[] = {
   "QGSP_BERT_EMV_OPTICAL", "CHIPS_OPTICAL", "QGSP_BERT_CHIPS_OPTICAL"
 };
 
+enum PprTrigConf_t
+{
+    kDefaultPPTrig, kDefaultPbPbTrig
+};
+
+const char * pprTrigConfName[] = {
+    "p-p","Pb-Pb"
+};
+
 //--- Functions ---
 class AliGenPythia;
 AliGenerator *MbPythia();
@@ -85,6 +94,8 @@ static PDC06Proc_t   proc         = kPhojet;
 static Mag_t         mag          = k5kG;
 static Float_t       energy       = 10000; // energy in CMS
 static PhysicsList_t physicslist  = QGSP_BERT_EMV;
+static PprTrigConf_t strig = kDefaultPPTrig; // default pp trigger configuration
+
 //========================//
 // Set Random Number seed //
 //========================//
@@ -143,8 +154,8 @@ void Config()
   // gAlice->SetGeometryFromCDB();
   
   // Set the trigger configuration: proton-proton
-  gAlice->SetTriggerDescriptor("p-p");
-  //  AliSimulation::Instance()->SetTriggerConfig("p-p");
+  AliSimulation::Instance()->SetTriggerConfig(pprTrigConfName[strig]);
+  cout<<"Trigger configuration is set to  "<<pprTrigConfName[strig]<<endl;
 
   printf("\n \n Comment: %s \n \n", comment.Data());
  

diff --git a/test/vmctest/production/simrun.C b/test/vmctest/production/simrun.C
index 8e83339e0f0ab667d644c3189cd1fe99d39325cf..63ae8c72b546679e215b622466d1f0d0f6ebbb1f 100644 (file)
--- a/test/vmctest/production/simrun.C
+++ b/test/vmctest/production/simrun.C
@@ -6,8 +6,8 @@
 // Set job and simulation variables as :\r
 // root.exe -b -q simrun.C  --run <x> --event <y> --process <kPythia6/kPhojet/kPythia6ATLAS_Flat/kPythia6D6T> --field <kNoField/k5kG> --energy <900/2360/10000> --physicslist <QGSP_BERT_CHIPS/CHIPS/QGSP_BERT_EMV>\r
 //\r
-// For LHC10c9 production test:\r
-// root.exe -b -q simrun.C  --run 119846 --event 1 --process kPythia6D6T --field k5kG --energy 7000 --physicslist QGSP_BERT_CHIPS_OPTICAL\r
+// For production test:\r
+// root.exe -b -q simrun.C  --run 126088 --event 1 --process kPythia6D6T --field k5kG --energy 7000 --physicslist QGSP_BERT_EMV_OPTICAL\r
 //\r
 // By E. Sicking, CERN\r
 {\r