Using by default AliHMPIDv2 instead of AliHMPIDv1

diff --git a/macros/Config.C b/macros/Config.C
index 0c4521a9b6f35a0b2f2b12c827501d4ccaf45924..3edd3ec9eb399945dd397f70d41a14683608e84f 100644 (file)
--- a/macros/Config.C
+++ b/macros/Config.C
@@ -28,7 +28,7 @@
 #include "ITS/AliITSvPPRasymmFMD.h"
 #include "TPC/AliTPCv2.h"
 #include "TOF/AliTOFv6T0.h"
-#include "HMPID/AliHMPIDv1.h"
+#include "HMPID/AliHMPIDv2.h"
 #include "ZDC/AliZDCv2.h"
 #include "TRD/AliTRDv1.h"
 #include "FMD/AliFMDv1.h"
@@ -315,7 +315,7 @@ void Config()
     if (iHMPID)
     {
         //=================== HMPID parameters ===========================
-        AliHMPID *HMPID = new AliHMPIDv1("HMPID", "normal HMPID");
+        AliHMPID *HMPID = new AliHMPIDv2("HMPID", "normal HMPID");
 
     }
 

diff --git a/macros/ConfigBeautyPPR.C b/macros/ConfigBeautyPPR.C
index 13d77db2e91f1f03e5a9376e0d75b0536cf9c5e6..dd79e230c7a17f730d49463bc6aa8b8dc0357b6b 100644 (file)
--- a/macros/ConfigBeautyPPR.C
+++ b/macros/ConfigBeautyPPR.C
@@ -22,7 +22,7 @@
 #include "ITS/AliITSvPPRasymm.h"
 #include "TPC/AliTPCv2.h"
 #include "TOF/AliTOFv6T0.h"
-#include "HMPID/AliHMPIDv1.h"
+#include "HMPID/AliHMPIDv2.h"
 #include "ZDC/AliZDCv1.h"
 #include "TRD/AliTRDv1.h"
 #include "FMD/AliFMDv0.h"
@@ -307,7 +307,7 @@ void Config()
 
   if(iHMPID) {
     //=================== HMPID parameters ===========================
-    AliHMPID *HMPID  = new AliHMPIDv1("HMPID","normal HMPID");    
+    AliHMPID *HMPID  = new AliHMPIDv2("HMPID","normal HMPID");    
 
   }
 

diff --git a/macros/ConfigCharmPPR.C b/macros/ConfigCharmPPR.C
index 2ffd68faf5622960af36d684d42f1bb9d71d7aac..f81081580014c223135f0e5281341c2581c75652 100644 (file)
--- a/macros/ConfigCharmPPR.C
+++ b/macros/ConfigCharmPPR.C
@@ -22,7 +22,7 @@
 #include "ITS/AliITSvPPRasymm.h"
 #include "TPC/AliTPCv2.h"
 #include "TOF/AliTOFv6T0.h"
-#include "HMPID/AliHMPIDv1.h"
+#include "HMPID/AliHMPIDv2.h"
 #include "ZDC/AliZDCv1.h"
 #include "TRD/AliTRDv1.h"
 #include "FMD/AliFMDv0.h"
@@ -306,7 +306,7 @@ void Config()
 
   if(iHMPID) {
     //=================== HMPID parameters ===========================
-    AliHMPID *HMPID  = new AliHMPIDv1("HMPID","normal HMPID");    
+    AliHMPID *HMPID  = new AliHMPIDv2("HMPID","normal HMPID");    
 
   }
 

diff --git a/macros/ConfigHBT.C b/macros/ConfigHBT.C
index f715b2405ac8be6ef3f324555336da39cd6d56e1..4b466701b7955c3effa6d4b0e12e62e45c95e415 100644 (file)
--- a/macros/ConfigHBT.C
+++ b/macros/ConfigHBT.C
@@ -30,7 +30,7 @@
 #include "ITS/AliITSvPPRasymmFMD.h"
 #include "TPC/AliTPCv2.h"
 #include "TOF/AliTOFv6T0.h"
-#include "HMPID/AliHMPIDv1.h"
+#include "HMPID/AliHMPIDv2.h"
 #include "ZDC/AliZDCv1.h"
 #include "TRD/AliTRDv1.h"
 #include "FMD/AliFMDv1.h"
@@ -383,7 +383,7 @@ void Config()
     if (iHMPID)
     {
         //=================== HMPID parameters ===========================
-        AliHMPID *HMPID = new AliHMPIDv1("HMPID", "normal HMPID");
+        AliHMPID *HMPID = new AliHMPIDv2("HMPID", "normal HMPID");
 
     }
 

diff --git a/macros/ConfigPPR.C b/macros/ConfigPPR.C
index ffa611f76a9e737a1b7f5417a7ce1863b538f155..2419c6f278981d10eb95af18751309d65a0aa1c3 100644 (file)
--- a/macros/ConfigPPR.C
+++ b/macros/ConfigPPR.C
@@ -43,7 +43,7 @@
 #include "ITS/AliITSvPPRasymmFMD.h"
 #include "TPC/AliTPCv2.h"
 #include "TOF/AliTOFv6T0.h"
-#include "HMPID/AliHMPIDv1.h"
+#include "HMPID/AliHMPIDv2.h"
 #include "ZDC/AliZDCv2.h"
 #include "TRD/AliTRDv1.h"
 #include "FMD/AliFMDv1.h"
@@ -434,7 +434,7 @@ void Config()
     if (iHMPID)
     {
         //=================== HMPID parameters ===========================
-        AliHMPID *HMPID = new AliHMPIDv1("HMPID", "normal HMPID");
+        AliHMPID *HMPID = new AliHMPIDv2("HMPID", "normal HMPID");
 
     }
 

diff --git a/macros/Config_PDC06.C b/macros/Config_PDC06.C
index ee4854bc1e7ecc470c771df942e879115be8611d..ba27e13fdb3aa674c82cd01967241b1dbed943be 100644 (file)
--- a/macros/Config_PDC06.C
+++ b/macros/Config_PDC06.C
@@ -36,7 +36,7 @@
 #include "ITS/AliITSvPPRasymmFMD.h"
 #include "TPC/AliTPCv2.h"
 #include "TOF/AliTOFv6T0.h"
-#include "HMPID/AliHMPIDv1.h"
+#include "HMPID/AliHMPIDv2.h"
 #include "ZDC/AliZDCv2.h"
 #include "TRD/AliTRDv1.h"
 #include "FMD/AliFMDv1.h"
@@ -510,7 +510,7 @@ void Config()
     if (iHMPID)
     {
         //=================== HMPID parameters ===========================
-        AliHMPID *HMPID = new AliHMPIDv1("HMPID", "normal HMPID");
+        AliHMPID *HMPID = new AliHMPIDv2("HMPID", "normal HMPID");
 
     }
 

diff --git a/macros/Config_PythiaHeavyFlavours.C b/macros/Config_PythiaHeavyFlavours.C
index 49d48150259ad6cd349b8469ba335db26eefd47b..2b9436c78b1cd443474e788beba459226e02bfb2 100644 (file)
--- a/macros/Config_PythiaHeavyFlavours.C
+++ b/macros/Config_PythiaHeavyFlavours.C
@@ -35,7 +35,7 @@
 #include "ITS/AliITSvPPRasymmFMD.h"
 #include "TPC/AliTPCv2.h"
 #include "TOF/AliTOFv6T0.h"
-#include "HMPID/AliHMPIDv1.h"
+#include "HMPID/AliHMPIDv2.h"
 #include "ZDC/AliZDCv1.h"
 #include "TRD/AliTRDv1.h"
 #include "FMD/AliFMDv0.h"
@@ -451,7 +451,7 @@ void Config()
 
   if(iHMPID) {
     //=================== HMPID parameters ===========================
-    AliHMPID *HMPID  = new AliHMPIDv1("HMPID","normal HMPID");    
+    AliHMPID *HMPID  = new AliHMPIDv2("HMPID","normal HMPID");    
 
   }
 

diff --git a/macros/g4ConfigCommon.C b/macros/g4ConfigCommon.C
index 9cb8c0c12c81a6b6529b699d33a032b8e9e5b04a..f8ccfc3161127133fb7c8345c76dcf9beb237881 100644 (file)
--- a/macros/g4ConfigCommon.C
+++ b/macros/g4ConfigCommon.C
@@ -226,7 +226,7 @@ void ConfigCommon()
     if (iHMPID)
     {
         //=================== HMPID parameters ===========================
-        AliHMPID *HMPID = new AliHMPIDv1("HMPID", "normal HMPID");
+        AliHMPID *HMPID = new AliHMPIDv2("HMPID", "normal HMPID");
 
     }
 

diff --git a/test/PbPbbench/Config.C b/test/PbPbbench/Config.C
index 87291245f6f04b42baa5892fd205609cb704f3e9..af3cf0c70486a4f2c3c0c768df7ada9615255bbc 100644 (file)
--- a/test/PbPbbench/Config.C
+++ b/test/PbPbbench/Config.C
@@ -43,7 +43,7 @@
 #include "ITS/AliITSvPPRasymmFMD.h"
 #include "TPC/AliTPCv2.h"
 #include "TOF/AliTOFv6T0.h"
-#include "HMPID/AliHMPIDv1.h"
+#include "HMPID/AliHMPIDv2.h"
 #include "ZDC/AliZDCv2.h"
 #include "TRD/AliTRDv1.h"
 #include "FMD/AliFMDv1.h"
@@ -425,7 +425,7 @@ void Config()
     if (iHMPID)
     {
         //=================== HMPID parameters ===========================
-        AliHMPID *HMPID = new AliHMPIDv1("HMPID", "normal HMPID");
+        AliHMPID *HMPID = new AliHMPIDv2("HMPID", "normal HMPID");
 
     }
 

diff --git a/test/genkine/sim/Config.C b/test/genkine/sim/Config.C
index ffcc6f32f3d46122280f0d232076c7021067cc39..80413286ea48a6dea88e2796c936ffb2991b6126 100644 (file)
--- a/test/genkine/sim/Config.C
+++ b/test/genkine/sim/Config.C
@@ -43,7 +43,7 @@
 #include "ITS/AliITSvPPRasymmFMD.h"
 #include "TPC/AliTPCv2.h"
 #include "TOF/AliTOFv6T0.h"
-#include "HMPID/AliHMPIDv1.h"
+#include "HMPID/AliHMPIDv2.h"
 #include "ZDC/AliZDCv2.h"
 #include "TRD/AliTRDv1.h"
 #include "FMD/AliFMDv1.h"
@@ -381,7 +381,7 @@ void Config()
     if (iHMPID)
     {
         //=================== HMPID parameters ===========================
-        AliHMPID *HMPID = new AliHMPIDv1("HMPID", "normal HMPID");
+        AliHMPID *HMPID = new AliHMPIDv2("HMPID", "normal HMPID");
 
     }
 

diff --git a/test/gun/Config.C b/test/gun/Config.C
index d1e1d2d20874419f7eb4c8676bcb791c5f1ca523..48fee728bb6af7339e42a7b12ff88cff8b98b16c 100644 (file)
--- a/test/gun/Config.C
+++ b/test/gun/Config.C
@@ -30,7 +30,7 @@
 #include "ITS/AliITSvPPRasymmFMD.h"
 #include "TPC/AliTPCv2.h"
 #include "TOF/AliTOFv6T0.h"
-#include "HMPID/AliHMPIDv1.h"
+#include "HMPID/AliHMPIDv2.h"
 #include "ZDC/AliZDCv2.h"
 #include "TRD/AliTRDv1.h"
 #include "TRD/AliTRDgeometry.h"
@@ -426,7 +426,7 @@ void Config()
     if (iHMPID)
     {
         //=================== HMPID parameters ===========================
-        AliHMPID *HMPID = new AliHMPIDv1("HMPID", "normal HMPID");
+        AliHMPID *HMPID = new AliHMPIDv2("HMPID", "normal HMPID");
 
     }
 

diff --git a/test/merge/backgr/Config.C b/test/merge/backgr/Config.C
index ac5f8ca1fe4eee29b52a860c52bc52252af8d9a2..fef061ba618e9e67fdd860605fdc6c728ecc664e 100644 (file)
--- a/test/merge/backgr/Config.C
+++ b/test/merge/backgr/Config.C
@@ -44,7 +44,7 @@
 #include "ITS/AliITSvPPRasymmFMD.h"
 #include "TPC/AliTPCv2.h"
 #include "TOF/AliTOFv6T0.h"
-#include "HMPID/AliHMPIDv1.h"
+#include "HMPID/AliHMPIDv2.h"
 #include "ZDC/AliZDCv2.h"
 #include "TRD/AliTRDv1.h"
 #include "FMD/AliFMDv1.h"
@@ -429,7 +429,7 @@ void Config()
     if (iHMPID)
     {
         //=================== HMPID parameters ===========================
-        AliHMPID *HMPID = new AliHMPIDv1("HMPID", "normal HMPID");
+        AliHMPID *HMPID = new AliHMPIDv2("HMPID", "normal HMPID");
 
     }
 

diff --git a/test/merge/signal/Config.C b/test/merge/signal/Config.C
index 786b77fea119e1fd9152ce8626794108ebc38914..2c78df65466dbffe73ae3fffbe81fde7c92d2615 100644 (file)
--- a/test/merge/signal/Config.C
+++ b/test/merge/signal/Config.C
@@ -44,7 +44,7 @@
 #include "ITS/AliITSvPPRasymmFMD.h"
 #include "TPC/AliTPCv2.h"
 #include "TOF/AliTOFv6T0.h"
-#include "HMPID/AliHMPIDv1.h"
+#include "HMPID/AliHMPIDv2.h"
 #include "ZDC/AliZDCv2.h"
 #include "TRD/AliTRDv1.h"
 #include "FMD/AliFMDv1.h"
@@ -429,7 +429,7 @@ void Config()
     if (iHMPID)
     {
         //=================== HMPID parameters ===========================
-        AliHMPID *HMPID = new AliHMPIDv1("HMPID", "normal HMPID");
+        AliHMPID *HMPID = new AliHMPIDv2("HMPID", "normal HMPID");
 
     }
 

diff --git a/test/ppbench/Config.C b/test/ppbench/Config.C
index 2fe18e277d4eefe99a40065a2fab3e683ede1792..457186bbaaf5fc37fda7ef9a4ec8f508d53e4f00 100644 (file)
--- a/test/ppbench/Config.C
+++ b/test/ppbench/Config.C
@@ -43,7 +43,7 @@
 #include "ITS/AliITSvPPRasymmFMD.h"
 #include "TPC/AliTPCv2.h"
 #include "TOF/AliTOFv6T0.h"
-#include "HMPID/AliHMPIDv1.h"
+#include "HMPID/AliHMPIDv2.h"
 #include "ZDC/AliZDCv2.h"
 #include "TRD/AliTRDv1.h"
 #include "FMD/AliFMDv1.h"
@@ -425,7 +425,7 @@ void Config()
     if (iHMPID)
     {
         //=================== HMPID parameters ===========================
-        AliHMPID *HMPID = new AliHMPIDv1("HMPID", "normal HMPID");
+        AliHMPID *HMPID = new AliHMPIDv2("HMPID", "normal HMPID");
 
     }
 

diff --git a/test/pploadlibs/Config.C b/test/pploadlibs/Config.C
index 90b14eb0bbde3a6449d42e6eb8429cb598d4f646..f79b3e479105afcd73e0be7b31562e9afc09ad95 100644 (file)
--- a/test/pploadlibs/Config.C
+++ b/test/pploadlibs/Config.C
@@ -36,7 +36,7 @@
 #include "ITS/AliITSvPPRasymmFMD.h"
 #include "TPC/AliTPCv2.h"
 #include "TOF/AliTOFv6T0.h"
-#include "HMPID/AliHMPIDv1.h"
+#include "HMPID/AliHMPIDv2.h"
 #include "ZDC/AliZDCv2.h"
 #include "TRD/AliTRDv1.h"
 #include "FMD/AliFMDv1.h"
@@ -503,7 +503,7 @@ void Config()
     if (iHMPID)
     {
         //=================== HMPID parameters ===========================
-        AliHMPID *HMPID = new AliHMPIDv1("HMPID", "normal HMPID");
+        AliHMPID *HMPID = new AliHMPIDv2("HMPID", "normal HMPID");
 
     }