Default shish-kebab geometry for EMCAL

diff --git a/macros/Config.C b/macros/Config.C
index 3e53b6587f2391fbf506ec6e18ec6f0ef9a8febd..493481f2c72ecdf4d8068ae512fae528cfa21c30 100644 (file)
--- a/macros/Config.C
+++ b/macros/Config.C
@@ -40,7 +40,7 @@
 #include "PHOS/AliPHOSv1.h"
 #include "PMD/AliPMDv1.h"
 #include "START/AliSTARTv1.h"
-#include "EMCAL/AliEMCALv1.h"
+#include "EMCAL/AliEMCALv2.h"
 #include "CRT/AliCRTv0.h"
 #include "VZERO/AliVZEROv5.h"
 #endif
@@ -409,7 +409,7 @@ void Config()
     if (iEMCAL)
     {
         //=================== EMCAL parameters ============================
-        AliEMCAL *EMCAL = new AliEMCALv1("EMCAL", "EMCAL_55_25");
+        AliEMCAL *EMCAL = new AliEMCALv2("EMCAL", "SHISH");
     }
 
      if (iCRT)

diff --git a/macros/ConfigHBT.C b/macros/ConfigHBT.C
index b7a6836f2114d1f15d9d18dc642960aa9777d591..ba5c32a2b9360eb7a43099a961a8f533078aa77b 100644 (file)
--- a/macros/ConfigHBT.C
+++ b/macros/ConfigHBT.C
@@ -42,7 +42,7 @@
 #include "PHOS/AliPHOSv1.h"
 #include "PMD/AliPMDv1.h"
 #include "START/AliSTARTv1.h"
-#include "EMCAL/AliEMCALv1.h"
+#include "EMCAL/AliEMCALv2.h"
 #include "CRT/AliCRTv1.h"
 #endif
 
@@ -485,7 +485,7 @@ void Config()
     if (iEMCAL && !iRICH)
     {
         //=================== EMCAL parameters ============================
-        AliEMCAL *EMCAL = new AliEMCALv1("EMCAL", "EMCAL_55_25");
+        AliEMCAL *EMCAL = new AliEMCALv2("EMCAL", "SHISH");
     }
 
     if (iSTART)

diff --git a/macros/ConfigPPR.C b/macros/ConfigPPR.C
index 75d25221eccf964252f3d419527c26f59344c035..c37d30ee60e8500f20d8dd6d293c322cccbc7e23 100644 (file)
--- a/macros/ConfigPPR.C
+++ b/macros/ConfigPPR.C
@@ -55,7 +55,7 @@
 #include "PHOS/AliPHOSv1.h"
 #include "PMD/AliPMDv1.h"
 #include "START/AliSTARTv1.h"
-#include "EMCAL/AliEMCALv1.h"
+#include "EMCAL/AliEMCALv2.h"
 #include "CRT/AliCRTv0.h"
 #include "VZERO/AliVZEROv5.h"
 #endif
@@ -527,7 +527,7 @@ void Config()
     if (iEMCAL)
     {
         //=================== EMCAL parameters ============================
-        AliEMCAL *EMCAL = new AliEMCALv1("EMCAL", "EMCAL_55_25");
+        AliEMCAL *EMCAL = new AliEMCALv2("EMCAL", "SHISH");
     }
 
      if (iCRT)

diff --git a/macros/g4ConfigCommon.C b/macros/g4ConfigCommon.C
index 5c09b8995e30fe51ec8a4c91e898a8263c21d56e..e5a2dce3dfd55bbc0f05ffe759e0f8571d2ad284 100644 (file)
--- a/macros/g4ConfigCommon.C
+++ b/macros/g4ConfigCommon.C
@@ -375,7 +375,7 @@ void ConfigCommon(Bool_t interactiveSetup)
     if (iEMCAL)
     {
         //=================== EMCAL parameters ============================
-        AliEMCAL *EMCAL = new AliEMCALv1("EMCAL", "EMCAL_55_25");
+        AliEMCAL *EMCAL = new AliEMCALv2("EMCAL", "SHISH");
     }
 
     if (iCRT)