From: ivana <ivana@f7af4fe6-9843-0410-8265-dc069ae4e863>
Date: Tue, 11 May 2010 12:43:14 +0000 (+0000)
Subject: In vmctest/*/commonConfig.C:
X-Git-Url: http://git.uio.no/git/?a=commitdiff_plain;ds=sidebyside;h=e56208c282379811d2410f7447b466db87441149;p=u%2Fmrichter%2FAliRoot.git

In vmctest/*/commonConfig.C:
Modified TRD, PHOS and EMCAL setting to be consistent with the official
production macros; the old setting kept as the option (kConfigV0).
(Eva, Ivana)
---

diff --git a/test/vmctest/gun/commonConfig.C b/test/vmctest/gun/commonConfig.C
index 26efb8accaf..0050bbdbd6a 100644
--- a/test/vmctest/gun/commonConfig.C
+++ b/test/vmctest/gun/commonConfig.C
@@ -16,6 +16,11 @@ const char * pprTrigConfName[] = {
     "p-p","Pb-Pb"
 };
 
+enum ConfigVersion_t {
+    kConfigV0,  // default configuration  
+    kConfigV1   // configuration for LHC production
+};
+
 // Options 
 static AliMagF::BMap_t smag = AliMagF::k5kG;
 static PprTrigConf_t strig = kDefaultPPTrig; // default PP trigger configuration
@@ -24,7 +29,8 @@ static TString comment;
 // Functions
 void  LoadPythia();
 
-void commonConfig(Bool_t setRootGeometry = kFALSE)
+void commonConfig(Bool_t setRootGeometry = kFALSE,
+                  ConfigVersion_t configVersion = kConfigV1)
 {
   cout << "Running commonConfig.C ... " << endl;
 
@@ -224,6 +230,22 @@ void commonConfig(Bool_t setRootGeometry = kFALSE)
       //=================== TRD parameters ============================
 
       AliTRD *TRD = new AliTRDv1("TRD", "TRD slow simulator");
+      if ( configVersion == kConfigV1 ) {
+        AliTRDgeometry *geoTRD = TRD->GetGeometry();
+        // Partial geometry: modules at 0,1,7,8,9,16,17
+        // starting at 3h in positive direction
+        geoTRD->SetSMstatus(2,0);
+        geoTRD->SetSMstatus(3,0);
+        geoTRD->SetSMstatus(4,0);
+        geoTRD->SetSMstatus(5,0);
+        geoTRD->SetSMstatus(6,0);
+        geoTRD->SetSMstatus(11,0);
+        geoTRD->SetSMstatus(12,0);
+        geoTRD->SetSMstatus(13,0);
+        geoTRD->SetSMstatus(14,0);
+        geoTRD->SetSMstatus(15,0);
+        geoTRD->SetSMstatus(16,0);
+      }
   }
 
   if (iFMD)
@@ -242,7 +264,10 @@ void commonConfig(Bool_t setRootGeometry = kFALSE)
 
   if (iPHOS)
   {
-      AliPHOS *PHOS = new AliPHOSv1("PHOS", "IHEP");
+     if ( configVersion == kConfigV0 ) 
+       AliPHOS *PHOS = new AliPHOSv1("PHOS", "IHEP");
+     else if ( configVersion == kConfigV1 )  
+       AliPHOS *PHOS = new AliPHOSv1("PHOS", "noCPV_Modules123"); 
   }
 
 
@@ -261,7 +286,10 @@ void commonConfig(Bool_t setRootGeometry = kFALSE)
   if (iEMCAL)
   {
       //=================== EMCAL parameters ============================
+    if ( configVersion == kConfigV0 ) 
       AliEMCAL *EMCAL = new AliEMCALv2("EMCAL", "EMCAL_COMPLETE");
+    else if ( configVersion == kConfigV1 )  
+      AliEMCAL *EMCAL = new AliEMCALv2("EMCAL", "EMCAL_FIRSTYEAR");
   }
 
    if (iACORDE)
@@ -272,7 +300,7 @@ void commonConfig(Bool_t setRootGeometry = kFALSE)
 
    if (iVZERO)
   {
-      //=================== ACORDE parameters ============================
+      //=================== VZERO parameters ============================
       AliVZERO *VZERO = new AliVZEROv7("VZERO", "normal VZERO");
   }
 
diff --git a/test/vmctest/ppbench/commonConfig.C b/test/vmctest/ppbench/commonConfig.C
index 26efb8accaf..0050bbdbd6a 100644
--- a/test/vmctest/ppbench/commonConfig.C
+++ b/test/vmctest/ppbench/commonConfig.C
@@ -16,6 +16,11 @@ const char * pprTrigConfName[] = {
     "p-p","Pb-Pb"
 };
 
+enum ConfigVersion_t {
+    kConfigV0,  // default configuration  
+    kConfigV1   // configuration for LHC production
+};
+
 // Options 
 static AliMagF::BMap_t smag = AliMagF::k5kG;
 static PprTrigConf_t strig = kDefaultPPTrig; // default PP trigger configuration
@@ -24,7 +29,8 @@ static TString comment;
 // Functions
 void  LoadPythia();
 
-void commonConfig(Bool_t setRootGeometry = kFALSE)
+void commonConfig(Bool_t setRootGeometry = kFALSE,
+                  ConfigVersion_t configVersion = kConfigV1)
 {
   cout << "Running commonConfig.C ... " << endl;
 
@@ -224,6 +230,22 @@ void commonConfig(Bool_t setRootGeometry = kFALSE)
       //=================== TRD parameters ============================
 
       AliTRD *TRD = new AliTRDv1("TRD", "TRD slow simulator");
+      if ( configVersion == kConfigV1 ) {
+        AliTRDgeometry *geoTRD = TRD->GetGeometry();
+        // Partial geometry: modules at 0,1,7,8,9,16,17
+        // starting at 3h in positive direction
+        geoTRD->SetSMstatus(2,0);
+        geoTRD->SetSMstatus(3,0);
+        geoTRD->SetSMstatus(4,0);
+        geoTRD->SetSMstatus(5,0);
+        geoTRD->SetSMstatus(6,0);
+        geoTRD->SetSMstatus(11,0);
+        geoTRD->SetSMstatus(12,0);
+        geoTRD->SetSMstatus(13,0);
+        geoTRD->SetSMstatus(14,0);
+        geoTRD->SetSMstatus(15,0);
+        geoTRD->SetSMstatus(16,0);
+      }
   }
 
   if (iFMD)
@@ -242,7 +264,10 @@ void commonConfig(Bool_t setRootGeometry = kFALSE)
 
   if (iPHOS)
   {
-      AliPHOS *PHOS = new AliPHOSv1("PHOS", "IHEP");
+     if ( configVersion == kConfigV0 ) 
+       AliPHOS *PHOS = new AliPHOSv1("PHOS", "IHEP");
+     else if ( configVersion == kConfigV1 )  
+       AliPHOS *PHOS = new AliPHOSv1("PHOS", "noCPV_Modules123"); 
   }
 
 
@@ -261,7 +286,10 @@ void commonConfig(Bool_t setRootGeometry = kFALSE)
   if (iEMCAL)
   {
       //=================== EMCAL parameters ============================
+    if ( configVersion == kConfigV0 ) 
       AliEMCAL *EMCAL = new AliEMCALv2("EMCAL", "EMCAL_COMPLETE");
+    else if ( configVersion == kConfigV1 )  
+      AliEMCAL *EMCAL = new AliEMCALv2("EMCAL", "EMCAL_FIRSTYEAR");
   }
 
    if (iACORDE)
@@ -272,7 +300,7 @@ void commonConfig(Bool_t setRootGeometry = kFALSE)
 
    if (iVZERO)
   {
-      //=================== ACORDE parameters ============================
+      //=================== VZERO parameters ============================
       AliVZERO *VZERO = new AliVZEROv7("VZERO", "normal VZERO");
   }