From f7882672a1e70bf5fc89a643a9ec3fa319b6d9e7 Mon Sep 17 00:00:00 2001
From: fca <fca@f7af4fe6-9843-0410-8265-dc069ae4e863>
Date: Sat, 23 Aug 2008 20:57:24 +0000
Subject: [PATCH] ACORDEv1 is now the default

---
 ACORDE/macros/Config.C                     | 2 +-
 BCM/Config_BCM.C                           | 2 +-
 EMCAL/macros/Config.C                      | 4 ++--
 EVE/EveHLT/AliEveHOMERSource.cxx           | 1 +
 FMD/Config.C                               | 4 ++--
 FMD/scripts/DummyConfig.C                  | 2 +-
 HMPID/Hconfig.C                            | 2 +-
 HMPID/Hnew.C                               | 2 +-
 MONITOR/galice.C                           | 2 +-
 PHOS/ConfigTestSuite.C                     | 2 +-
 PHOS/macros/AlignmentDB/Config.C           | 4 ++--
 PHOS/macros/testSuite/ConfigTestSuite.C    | 2 +-
 PHOS/macros/testSuite/ConfigTestSuiteHij.C | 2 +-
 STEER/AliHeader.cxx                        | 1 +
 TFluka/macro/FlukaConfig.C                 | 2 +-
 TOF/AliTOFconfig.C                         | 4 ++--
 TPC/ConfigKr.C                             | 4 ++--
 TPHIC/ConfigTPHIC.C                        | 2 +-
 TRD/Macros/AliTRDConfigPID.C               | 4 ++--
 ZDC/ConfigGenZDC.C                         | 2 +-
 macros/ConfigPPR.C                         | 4 ++--
 macros/Config_AliGenCosmicsParam.C         | 4 ++--
 macros/Config_PDC06.C                      | 4 ++--
 macros/g4ConfigCommon.C                    | 2 +-
 test/PbPbbench/Config.C                    | 4 ++--
 test/QA/Config.C                           | 2 +-
 test/genkine/sim/Config.C                  | 4 ++--
 test/gun/Config.C                          | 4 ++--
 test/merge/backgr/Config.C                 | 4 ++--
 test/merge/signal/Config.C                 | 4 ++--
 test/ppbench/Config.C                      | 4 ++--
 test/pploadlibs/Config.C                   | 4 ++--
 32 files changed, 48 insertions(+), 46 deletions(-)

diff --git a/ACORDE/macros/Config.C b/ACORDE/macros/Config.C
index 0892af65fa0..806dc2dccd8 100644
--- a/ACORDE/macros/Config.C
+++ b/ACORDE/macros/Config.C
@@ -924,7 +924,7 @@ void Config()
 
         //=================== ACORDE parameters ============================
 
-        AliACORDE *ACORDE = new AliACORDEv0("ACORDE", "normal ACORDE");
+        AliACORDE *ACORDE = new AliACORDEv1("ACORDE", "normal ACORDE");
 
 	// ACORDE->SetITSGeometry(kTRUE);
 
diff --git a/BCM/Config_BCM.C b/BCM/Config_BCM.C
index 5b898cb5a20..7041c580fd3 100644
--- a/BCM/Config_BCM.C
+++ b/BCM/Config_BCM.C
@@ -394,7 +394,7 @@ void Config()
      if (iACORDE)
     {
         //=================== ACORDE parameters ============================
-        AliACORDE *ACORDE = new AliACORDEv0("ACORDE", "normal ACORDE");
+        AliACORDE *ACORDE = new AliACORDEv1("ACORDE", "normal ACORDE");
     }
 
      if (iVZERO)
diff --git a/EMCAL/macros/Config.C b/EMCAL/macros/Config.C
index 53a34997727..228e40a8d79 100755
--- a/EMCAL/macros/Config.C
+++ b/EMCAL/macros/Config.C
@@ -38,7 +38,7 @@
 #include "PMD/AliPMDv1.h"
 #include "T0/AliT0v1.h"
 #include "EMCAL/AliEMCALv2.h"
-#include "ACORDE/AliACORDEv0.h"
+#include "ACORDE/AliACORDEv1.h"
 #include "VZERO/AliVZEROv7.h"
 #endif
 
@@ -319,7 +319,7 @@ void Config()
      if (iACORDE)
     {
         //=================== ACORDE parameters ============================
-        AliACORDE *ACORDE = new AliACORDEv0("ACORDE", "normal ACORDE");
+        AliACORDE *ACORDE = new AliACORDEv1("ACORDE", "normal ACORDE");
     }
 
      if (iVZERO)
diff --git a/EVE/EveHLT/AliEveHOMERSource.cxx b/EVE/EveHLT/AliEveHOMERSource.cxx
index b02c10c06be..2095d4ae305 100644
--- a/EVE/EveHLT/AliEveHOMERSource.cxx
+++ b/EVE/EveHLT/AliEveHOMERSource.cxx
@@ -34,4 +34,5 @@ Bool_t AliEveHOMERSource::SetRnrState(Bool_t rnr)
     fSrcState->fState = rnr;
 
   return TEveElement::SetRnrState(rnr);
+  return kTRUE;
 }
diff --git a/FMD/Config.C b/FMD/Config.C
index 0460c490047..88efeace803 100644
--- a/FMD/Config.C
+++ b/FMD/Config.C
@@ -58,7 +58,7 @@
 #include "PMD/AliPMDv1.h"
 #include "T0/AliT0v1.h"
 #include "EMCAL/AliEMCALv2.h"
-#include "ACORDE/AliACORDEv0.h"
+#include "ACORDE/AliACORDEv1.h"
 #include "VZERO/AliVZEROv2.h"
 #endif
 
@@ -703,7 +703,7 @@ Config()
 
   if (useACORDE) {
     // =================== ACORDE parameters ============================
-    AliACORDE *ACORDE = new AliACORDEv0("ACORDE", "normal ACORDE");
+    AliACORDE *ACORDE = new AliACORDEv1("ACORDE", "normal ACORDE");
   }
 
   if (useVZERO) {
diff --git a/FMD/scripts/DummyConfig.C b/FMD/scripts/DummyConfig.C
index de3fb0fea9c..fd66eaca8e9 100644
--- a/FMD/scripts/DummyConfig.C
+++ b/FMD/scripts/DummyConfig.C
@@ -649,7 +649,7 @@ Config()
 
   if (useACORDE) {
     // =================== ACORDE parameters ============================
-    AliACORDE *ACORDE = new AliACORDEv0("ACORDE", "normal ACORDE");
+    AliACORDE *ACORDE = new AliACORDEv1("ACORDE", "normal ACORDE");
   }
 
   if (useVZERO) {
diff --git a/HMPID/Hconfig.C b/HMPID/Hconfig.C
index d23882838da..594ae588a50 100644
--- a/HMPID/Hconfig.C
+++ b/HMPID/Hconfig.C
@@ -507,7 +507,7 @@ void HmpConfig::WriteDet(FILE *pF)
 //different phase space detectors  
   if(fDetBG->GetButton(kPHOS )->GetState()) fprintf(pF,"\n  AliPHOS *PHOS = new AliPHOSv1(\"PHOS\",\"IHEP\");\n");
   if(fDetBG->GetButton(kEMCAL)->GetState()) fprintf(pF,"\n  AliEMCAL *EMCAL = new AliEMCALv2(\"EMCAL\",\"SHISH_77_TRD1_2X2_FINAL_110DEG\");\n");
-  if(fDetBG->GetButton(kACORDE  )->GetState()) fprintf(pF,"\n  AliACORDE *ACORDE = new AliACORDEv0(\"ACORDE\",\"normal ACORDE\");\n");
+  if(fDetBG->GetButton(kACORDE  )->GetState()) fprintf(pF,"\n  AliACORDE *ACORDE = new AliACORDEv1(\"ACORDE\",\"normal ACORDE\");\n");
 }
 //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 void HmpConfig::GuiBatch(TGHorizontalFrame *pMainF)
diff --git a/HMPID/Hnew.C b/HMPID/Hnew.C
index 4e944650af9..47b394f4cb7 100644
--- a/HMPID/Hnew.C
+++ b/HMPID/Hnew.C
@@ -352,7 +352,7 @@ void HmpGui::CreateConfigC()
   if(fDetBG->GetButton(kZDC  )->GetState()) f<<Form("\n  new AliZDCv2          (\"ZDC\"   ,\"normal ZDC\");");
   if(fDetBG->GetButton(kPHOS )->GetState()) f<<Form("\n  new AliPHOSv1         (\"PHOS\"  ,\"IHEP\");");              
   if(fDetBG->GetButton(kEMCAL)->GetState()) f<<Form("\n  new AliEMCALv2        (\"EMCAL\" ,\"SHISH_77_TRD1_2X2_FINAL_110DEG\");");
-  if(fDetBG->GetButton(kACRD )->GetState()) f<<Form("\n  new AliACORDEv0       (\"ACORDE\",\"normal ACORDE\");");
+  if(fDetBG->GetButton(kACRD )->GetState()) f<<Form("\n  new AliACORDEv1       (\"ACORDE\",\"normal ACORDE\");");
   
   f<<Form("\n  ::Info(\"----------> HMPID private config\",\"Stop\\n\\n\\n\");\n");   f<<Form("}\n");  //end of Config.C file:  
   f.close(); 
diff --git a/MONITOR/galice.C b/MONITOR/galice.C
index eebd7b42e4f..60b1e07b98c 100644
--- a/MONITOR/galice.C
+++ b/MONITOR/galice.C
@@ -287,7 +287,7 @@ void Config()
      if (iACORDE)
     {
         //=================== ACORDE parameters ============================
-        AliACORDE *ACORDE = new AliACORDEv0("ACORDE", "normal ACORDE");
+        AliACORDE *ACORDE = new AliACORDEv1("ACORDE", "normal ACORDE");
     }
 
      if (iVZERO)
diff --git a/PHOS/ConfigTestSuite.C b/PHOS/ConfigTestSuite.C
index 5f564df6052..027ab17e371 100644
--- a/PHOS/ConfigTestSuite.C
+++ b/PHOS/ConfigTestSuite.C
@@ -399,7 +399,7 @@ void Config()
      if (iACORDE)
     {
         //=================== ACORDE parameters ============================
-        AliACORDE *ACORDE = new AliACORDEv0("ACORDE", "normal ACORDE");
+        AliACORDE *ACORDE = new AliACORDEv1("ACORDE", "normal ACORDE");
     }
 
      if (iVZERO)
diff --git a/PHOS/macros/AlignmentDB/Config.C b/PHOS/macros/AlignmentDB/Config.C
index ef087308157..a22bd90eb86 100644
--- a/PHOS/macros/AlignmentDB/Config.C
+++ b/PHOS/macros/AlignmentDB/Config.C
@@ -42,7 +42,7 @@
 #include "PMD/AliPMDv1.h"
 #include "T0/AliT0v1.h"
 #include "EMCAL/AliEMCALv2.h"
-#include "ACORDE/AliACORDEv0.h"
+#include "ACORDE/AliACORDEv1.h"
 #include "VZERO/AliVZEROv5.h"
 #endif
 
@@ -391,7 +391,7 @@ void Config()
      if (iACORDE)
     {
         //=================== ACORDE parameters ============================
-        AliACORDE *ACORDE = new AliACORDEv0("ACORDE", "normal ACORDE");
+        AliACORDE *ACORDE = new AliACORDEv1("ACORDE", "normal ACORDE");
     }
 
      if (iVZERO)
diff --git a/PHOS/macros/testSuite/ConfigTestSuite.C b/PHOS/macros/testSuite/ConfigTestSuite.C
index a25533dbcc9..37df54f7e18 100644
--- a/PHOS/macros/testSuite/ConfigTestSuite.C
+++ b/PHOS/macros/testSuite/ConfigTestSuite.C
@@ -400,7 +400,7 @@ void Config()
      if (iACORDE)
     {
         //=================== ACORDE parameters ============================
-        AliACORDE *ACORDE = new AliACORDEv0("ACORDE", "normal ACORDE");
+        AliACORDE *ACORDE = new AliACORDEv1("ACORDE", "normal ACORDE");
     }
 
      if (iVZERO)
diff --git a/PHOS/macros/testSuite/ConfigTestSuiteHij.C b/PHOS/macros/testSuite/ConfigTestSuiteHij.C
index 46a4e78d2e6..b7f32896c47 100644
--- a/PHOS/macros/testSuite/ConfigTestSuiteHij.C
+++ b/PHOS/macros/testSuite/ConfigTestSuiteHij.C
@@ -376,7 +376,7 @@ void Config()
      if (iACORDE)
     {
         //=================== ACORDE parameters ============================
-        AliACORDE *ACORDE = new AliACORDEv0("ACORDE", "normal ACORDE");
+        AliACORDE *ACORDE = new AliACORDEv1("ACORDE", "normal ACORDE");
     }
 
      if (iVZERO)
diff --git a/STEER/AliHeader.cxx b/STEER/AliHeader.cxx
index 9e1a49ab309..c376797acf7 100644
--- a/STEER/AliHeader.cxx
+++ b/STEER/AliHeader.cxx
@@ -49,6 +49,7 @@ AliHeader::AliHeader():
   //
   // Default constructor
   //
+  printf("I was here\n");
 }
 
 //_______________________________________________________________________
diff --git a/TFluka/macro/FlukaConfig.C b/TFluka/macro/FlukaConfig.C
index c41cde79179..19b6905cbba 100644
--- a/TFluka/macro/FlukaConfig.C
+++ b/TFluka/macro/FlukaConfig.C
@@ -380,7 +380,7 @@ void Config()
      if (iACORDE)
     {
         //=================== ACORDE parameters ============================
-        AliACORDE *ACORDE = new AliACORDEv0("ACORDE", "normal ACORDE");
+        AliACORDE *ACORDE = new AliACORDEv1("ACORDE", "normal ACORDE");
     }
 
      if (iVZERO)
diff --git a/TOF/AliTOFconfig.C b/TOF/AliTOFconfig.C
index 31fb6941fd3..8170a5e6407 100644
--- a/TOF/AliTOFconfig.C
+++ b/TOF/AliTOFconfig.C
@@ -36,7 +36,7 @@
 #include "PMD/AliPMDv1.h"
 #include "T0/AliT0v1.h"
 #include "EMCAL/AliEMCALv1.h"
-#include "ACORDE/AliACORDEv0.h"
+#include "ACORDE/AliACORDEv1.h"
 #include "VZERO/AliVZEROv3.h"
 #endif
 
@@ -453,7 +453,7 @@ void Config()
      if (iACORDE)
     {
         //=================== ACORDE parameters ============================
-        AliACORDE *ACORDE = new AliACORDEv0("ACORDE", "normal ACORDE");
+        AliACORDE *ACORDE = new AliACORDEv1("ACORDE", "normal ACORDE");
     }
 
      if (iVZERO)
diff --git a/TPC/ConfigKr.C b/TPC/ConfigKr.C
index dd4826834be..948c38774ad 100644
--- a/TPC/ConfigKr.C
+++ b/TPC/ConfigKr.C
@@ -37,7 +37,7 @@
 #include "PMD/AliPMDv1.h"
 #include "T0/AliT0v1.h"
 #include "EMCAL/AliEMCALv2.h"
-#include "ACORDE/AliACORDEv0.h"
+#include "ACORDE/AliACORDEv1.h"
 #include "VZERO/AliVZEROv7.h"
 #endif
 
@@ -347,7 +347,7 @@ void Config()
      if (iACORDE)
     {
         //=================== ACORDE parameters ============================
-        AliACORDE *ACORDE = new AliACORDEv0("ACORDE", "normal ACORDE");
+        AliACORDE *ACORDE = new AliACORDEv1("ACORDE", "normal ACORDE");
     }
 
      if (iVZERO)
diff --git a/TPHIC/ConfigTPHIC.C b/TPHIC/ConfigTPHIC.C
index 395e3c11b16..9945d524e16 100644
--- a/TPHIC/ConfigTPHIC.C
+++ b/TPHIC/ConfigTPHIC.C
@@ -358,7 +358,7 @@ void Config()
      if (iACORDE)
     {
         //=================== ACORDE parameters ============================
-        AliACORDE *ACORDE = new AliACORDEv0("ACORDE", "normal ACORDE");
+        AliACORDE *ACORDE = new AliACORDEv1("ACORDE", "normal ACORDE");
     }
 
      if (iVZERO)
diff --git a/TRD/Macros/AliTRDConfigPID.C b/TRD/Macros/AliTRDConfigPID.C
index 0d4703e19d2..c463b488081 100644
--- a/TRD/Macros/AliTRDConfigPID.C
+++ b/TRD/Macros/AliTRDConfigPID.C
@@ -50,7 +50,7 @@
 #include "PMD/AliPMDv1.h"
 #include "T0/AliT0v1.h"
 #include "EMCAL/AliEMCALv2.h"
-#include "ACORDE/AliACORDEv0.h"
+#include "ACORDE/AliACORDEv1.h"
 #include "VZERO/AliVZEROv6.h"
 #endif
 
@@ -584,7 +584,7 @@ void Config()
      if (iACORDE)
     {
         //=================== ACORDE parameters ============================
-        AliACORDE *ACORDE = new AliACORDEv0("ACORDE", "normal ACORDE");
+        AliACORDE *ACORDE = new AliACORDEv1("ACORDE", "normal ACORDE");
     }
 
      if (iVZERO)
diff --git a/ZDC/ConfigGenZDC.C b/ZDC/ConfigGenZDC.C
index 93b2cd2a5e5..18acc8541ac 100644
--- a/ZDC/ConfigGenZDC.C
+++ b/ZDC/ConfigGenZDC.C
@@ -377,7 +377,7 @@ void Config()
      if (iACORDE)
     {
         //=================== ACORDE parameters ============================
-        AliACORDE *ACORDE = new AliACORDEv0("ACORDE", "normal ACORDE");
+        AliACORDE *ACORDE = new AliACORDEv1("ACORDE", "normal ACORDE");
     }
 
      if (iVZERO)
diff --git a/macros/ConfigPPR.C b/macros/ConfigPPR.C
index 046bdbcf42c..cf788ead2ca 100644
--- a/macros/ConfigPPR.C
+++ b/macros/ConfigPPR.C
@@ -52,7 +52,7 @@
 #include "PMD/AliPMDv1.h"
 #include "T0/AliT0v1.h"
 #include "EMCAL/AliEMCALv2.h"
-#include "ACORDE/AliACORDEv0.h"
+#include "ACORDE/AliACORDEv1.h"
 #include "VZERO/AliVZEROv7.h"
 #endif
 
@@ -449,7 +449,7 @@ void Config()
      if (iACORDE)
     {
         //=================== ACORDE parameters ============================
-        AliACORDE *ACORDE = new AliACORDEv0("ACORDE", "normal ACORDE");
+        AliACORDE *ACORDE = new AliACORDEv1("ACORDE", "normal ACORDE");
     }
 
      if (iVZERO)
diff --git a/macros/Config_AliGenCosmicsParam.C b/macros/Config_AliGenCosmicsParam.C
index 9dc6a54c45b..fcd1ee033c7 100644
--- a/macros/Config_AliGenCosmicsParam.C
+++ b/macros/Config_AliGenCosmicsParam.C
@@ -38,7 +38,7 @@
 #include "PMD/AliPMDv1.h"
 #include "START/AliSTARTv1.h"
 #include "EMCAL/AliEMCALv2.h"
-#include "ACORDE/AliACORDEv0.h"
+#include "ACORDE/AliACORDEv1.h"
 #include "VZERO/AliVZEROv7.h"
 #endif
 
@@ -334,7 +334,7 @@ void Config()
      if (iACORDE)
     {
         //=================== ACORDE parameters ============================
-        AliACORDE *ACORDE = new AliACORDEv0("ACORDE", "normal ACORDE");
+        AliACORDE *ACORDE = new AliACORDEv1("ACORDE", "normal ACORDE");
     }
 
      if (iVZERO)
diff --git a/macros/Config_PDC06.C b/macros/Config_PDC06.C
index 67af6919673..35493852e31 100644
--- a/macros/Config_PDC06.C
+++ b/macros/Config_PDC06.C
@@ -45,7 +45,7 @@
 #include "PMD/AliPMDv1.h"
 #include "T0/AliT0v1.h"
 #include "EMCAL/AliEMCALv2.h"
-#include "ACORDE/AliACORDEv0.h"
+#include "ACORDE/AliACORDEv1.h"
 #include "VZERO/AliVZEROv7.h"
 #endif
 
@@ -533,7 +533,7 @@ void Config()
      if (iACORDE)
     {
         //=================== ACORDE parameters ============================
-        AliACORDE *ACORDE = new AliACORDEv0("ACORDE", "normal ACORDE");
+        AliACORDE *ACORDE = new AliACORDEv1("ACORDE", "normal ACORDE");
     }
 
      if (iVZERO)
diff --git a/macros/g4ConfigCommon.C b/macros/g4ConfigCommon.C
index d59e6f0d7cd..0791ba8df2a 100644
--- a/macros/g4ConfigCommon.C
+++ b/macros/g4ConfigCommon.C
@@ -273,7 +273,7 @@ void ConfigCommon(Bool_t setRootGeometry = kTRUE)
      if (iACORDE)
     {
         //=================== ACORDE parameters ============================
-        AliACORDE *ACORDE = new AliACORDEv0("ACORDE", "normal ACORDE");
+        AliACORDE *ACORDE = new AliACORDEv1("ACORDE", "normal ACORDE");
     }
 
      if (iVZERO)
diff --git a/test/PbPbbench/Config.C b/test/PbPbbench/Config.C
index a0de414bc7f..c9acfffb562 100644
--- a/test/PbPbbench/Config.C
+++ b/test/PbPbbench/Config.C
@@ -52,7 +52,7 @@
 #include "PMD/AliPMDv1.h"
 #include "T0/AliT0v1.h"
 #include "EMCAL/AliEMCALv2.h"
-#include "ACORDE/AliACORDEv0.h"
+#include "ACORDE/AliACORDEv1.h"
 #include "VZERO/AliVZEROv7.h"
 #endif
 
@@ -441,7 +441,7 @@ void Config()
      if (iACORDE)
     {
         //=================== ACORDE parameters ============================
-        AliACORDE *ACORDE = new AliACORDEv0("ACORDE", "normal ACORDE");
+        AliACORDE *ACORDE = new AliACORDEv1("ACORDE", "normal ACORDE");
     }
 
      if (iVZERO)
diff --git a/test/QA/Config.C b/test/QA/Config.C
index 18260f273aa..dff54330b1e 100644
--- a/test/QA/Config.C
+++ b/test/QA/Config.C
@@ -65,7 +65,7 @@
 #include "PMD/AliPMDv1.h"
 #include "T0/AliT0v1.h"
 #include "EMCAL/AliEMCALv2.h"
-#include "ACORDE/AliACORDEv0.h"
+#include "ACORDE/AliACORDEv1.h"
 #include "VZERO/AliVZEROv7.h"
 #endif
 
diff --git a/test/genkine/sim/Config.C b/test/genkine/sim/Config.C
index 8c993f7ce9e..46296006389 100644
--- a/test/genkine/sim/Config.C
+++ b/test/genkine/sim/Config.C
@@ -53,7 +53,7 @@
 #include "PMD/AliPMDv1.h"
 #include "T0/AliT0v1.h"
 #include "EMCAL/AliEMCALv2.h"
-#include "ACORDE/AliACORDEv0.h"
+#include "ACORDE/AliACORDEv1.h"
 #include "VZERO/AliVZEROv7.h"
 #include "EVGEN/AliGenExtFile.h"
 #include "EVGEN/AliGenReaderTreeK.h"
@@ -398,7 +398,7 @@ void Config()
      if (iACORDE)
     {
         //=================== ACORDE parameters ============================
-        AliACORDE *ACORDE = new AliACORDEv0("ACORDE", "normal ACORDE");
+        AliACORDE *ACORDE = new AliACORDEv1("ACORDE", "normal ACORDE");
     }
 
      if (iVZERO)
diff --git a/test/gun/Config.C b/test/gun/Config.C
index 795447debde..e2e0ed47bbb 100644
--- a/test/gun/Config.C
+++ b/test/gun/Config.C
@@ -41,7 +41,7 @@
 #include "PMD/AliPMDv1.h"
 #include "T0/AliT0v1.h"
 #include "EMCAL/AliEMCALv2.h"
-#include "ACORDE/AliACORDEv0.h"
+#include "ACORDE/AliACORDEv1.h"
 #include "VZERO/AliVZEROv7.h"
 #endif
 
@@ -493,7 +493,7 @@ void Config()
      if (iACORDE)
     {
         //=================== ACORDE parameters ============================
-        AliACORDE *ACORDE = new AliACORDEv0("ACORDE", "normal ACORDE");
+        AliACORDE *ACORDE = new AliACORDEv1("ACORDE", "normal ACORDE");
     }
 
      if (iVZERO)
diff --git a/test/merge/backgr/Config.C b/test/merge/backgr/Config.C
index 78d3bdda1e9..c6e6d80390f 100644
--- a/test/merge/backgr/Config.C
+++ b/test/merge/backgr/Config.C
@@ -53,7 +53,7 @@
 #include "PMD/AliPMDv1.h"
 #include "T0/AliT0v1.h"
 #include "EMCAL/AliEMCALv2.h"
-#include "ACORDE/AliACORDEv0.h"
+#include "ACORDE/AliACORDEv1.h"
 #include "VZERO/AliVZEROv7.h"
 #endif
 
@@ -445,7 +445,7 @@ void Config()
      if (iACORDE)
     {
         //=================== ACORDE parameters ============================
-        AliACORDE *ACORDE = new AliACORDEv0("ACORDE", "normal ACORDE");
+        AliACORDE *ACORDE = new AliACORDEv1("ACORDE", "normal ACORDE");
     }
 
      if (iVZERO)
diff --git a/test/merge/signal/Config.C b/test/merge/signal/Config.C
index fae0f5ec54d..eb78fcdffc7 100644
--- a/test/merge/signal/Config.C
+++ b/test/merge/signal/Config.C
@@ -53,7 +53,7 @@
 #include "PMD/AliPMDv1.h"
 #include "T0/AliT0v1.h"
 #include "EMCAL/AliEMCALv2.h"
-#include "ACORDE/AliACORDEv0.h"
+#include "ACORDE/AliACORDEv1.h"
 #include "VZERO/AliVZEROv7.h"
 #endif
 
@@ -445,7 +445,7 @@ void Config()
      if (iACORDE)
     {
         //=================== ACORDE parameters ============================
-        AliACORDE *ACORDE = new AliACORDEv0("ACORDE", "normal ACORDE");
+        AliACORDE *ACORDE = new AliACORDEv1("ACORDE", "normal ACORDE");
     }
 
      if (iVZERO)
diff --git a/test/ppbench/Config.C b/test/ppbench/Config.C
index a1cdfc82707..4474041db24 100644
--- a/test/ppbench/Config.C
+++ b/test/ppbench/Config.C
@@ -52,7 +52,7 @@
 #include "PMD/AliPMDv1.h"
 #include "T0/AliT0v1.h"
 #include "EMCAL/AliEMCALv2.h"
-#include "ACORDE/AliACORDEv0.h"
+#include "ACORDE/AliACORDEv1.h"
 #include "VZERO/AliVZEROv7.h"
 #endif
 
@@ -441,7 +441,7 @@ void Config()
      if (iACORDE)
     {
         //=================== ACORDE parameters ============================
-        AliACORDE *ACORDE = new AliACORDEv0("ACORDE", "normal ACORDE");
+        AliACORDE *ACORDE = new AliACORDEv1("ACORDE", "normal ACORDE");
     }
 
      if (iVZERO)
diff --git a/test/pploadlibs/Config.C b/test/pploadlibs/Config.C
index b9f2d1b3528..998b43fb4f2 100644
--- a/test/pploadlibs/Config.C
+++ b/test/pploadlibs/Config.C
@@ -45,7 +45,7 @@
 #include "PMD/AliPMDv1.h"
 #include "T0/AliT0v1.h"
 #include "EMCAL/AliEMCALv2.h"
-#include "ACORDE/AliACORDEv0.h"
+#include "ACORDE/AliACORDEv1.h"
 #include "VZERO/AliVZEROv7.h"
 #endif
 
@@ -525,7 +525,7 @@ void Config()
      if (iACORDE)
     {
         //=================== ACORDE parameters ============================
-        AliACORDE *ACORDE = new AliACORDEv0("ACORDE", "normal ACORDE");
+        AliACORDE *ACORDE = new AliACORDEv1("ACORDE", "normal ACORDE");
     }
 
      if (iVZERO)
-- 
2.43.0