]> git.uio.no Git - u/mrichter/AliRoot.git/commitdiff
Changes for #92479: Request to update ZDC initialization in macros/ConfigRaw2012.C
authorhristov <hristov@f7af4fe6-9843-0410-8265-dc069ae4e863>
Thu, 15 Mar 2012 15:31:53 +0000 (15:31 +0000)
committerhristov <hristov@f7af4fe6-9843-0410-8265-dc069ae4e863>
Thu, 15 Mar 2012 15:31:53 +0000 (15:31 +0000)
19 files changed:
macros/Config.C
macros/ConfigRaw2012.C
test/PbPbbench/Config.C
test/QA/Config.C
test/embedding/Config.C
test/generators/TUHKMgen/Config.C
test/generators/epos/Config.C
test/generators/herwig/Config.C
test/generators/therminator/Config.C
test/genkine/sim/Config.C
test/gun/Config.C
test/merge/backgr/Config.C
test/merge/signal/Config.C
test/pileup/Config.C
test/ppbench/Config.C
test/pploadlibs/Config.C
test/rawmerge/Config.C
test/vmctest/production/Config.C
test/vmctest/production/ConfigG3.C

index 209c4b4fd51f233b9ddb6bf50086218fef904635..e125d9b6e1e94cac6ea20ee4e556bae653f3eba7 100644 (file)
@@ -30,7 +30,7 @@
 #include "TPC/AliTPCv2.h"
 #include "TOF/AliTOFv6T0.h"
 #include "HMPID/AliHMPIDv3.h"
-#include "ZDC/AliZDCv3.h"
+#include "ZDC/AliZDCv4.h"
 #include "TRD/AliTRDv1.h"
 #include "FMD/AliFMDv1.h"
 #include "MUON/AliMUONv1.h"
@@ -302,7 +302,7 @@ void Config()
     {
         //=================== ZDC parameters ============================
 
-        AliZDC *ZDC = new AliZDCv3("ZDC", "normal ZDC");
+        AliZDC *ZDC = new AliZDCv4("ZDC", "normal ZDC");
     }
 
     if (iTRD)
index a08b63177ffa39b9af503c02ed5e5ad6fb69986d..a51a61f5844ffb22c1fd3bc90b835988b1f02243 100644 (file)
@@ -34,7 +34,7 @@
 #include "TPC/AliTPCv2.h"
 #include "TOF/AliTOFv6T0.h"
 #include "HMPID/AliHMPIDv3.h"
-#include "ZDC/AliZDCv3.h"
+#include "ZDC/AliZDCv4.h"
 #include "TRD/AliTRDv1.h"
 #include "TRD/AliTRDgeometry.h"
 #include "FMD/AliFMDv1.h"
@@ -354,7 +354,7 @@ void Config()
     {
         //=================== ZDC parameters ============================
 
-        AliZDC *ZDC = new AliZDCv3("ZDC", "normal ZDC");
+        AliZDC *ZDC = new AliZDCv4("ZDC", "normal ZDC");
     }
 
     if (iTRD)
index 053130d1558086c5faab4aa0d60455d1699faa9e..c1031b9e8ab44af804c5affaa2a2aa38abd068f6 100644 (file)
@@ -44,7 +44,7 @@
 #include "TPC/AliTPCv2.h"
 #include "TOF/AliTOFv6T0.h"
 #include "HMPID/AliHMPIDv3.h"
-#include "ZDC/AliZDCv3.h"
+#include "ZDC/AliZDCv4.h"
 #include "TRD/AliTRDv1.h"
 #include "FMD/AliFMDv1.h"
 #include "MUON/AliMUONv1.h"
@@ -390,7 +390,7 @@ void Config()
     {
         //=================== ZDC parameters ============================
 
-        AliZDC *ZDC = new AliZDCv3("ZDC", "normal ZDC");
+        AliZDC *ZDC = new AliZDCv4("ZDC", "normal ZDC");
     }
 
     if (iTRD)
index 444576fac902216b91508ebb60c9db5d087e432f..0b6b84af73c56a1b1040add6ee41cb1639252779 100644 (file)
@@ -57,7 +57,7 @@
 #include "TPC/AliTPCv2.h"
 #include "TOF/AliTOFv6T0.h"
 #include "HMPID/AliHMPIDv3.h"
-#include "ZDC/AliZDCv3.h"
+#include "ZDC/AliZDCv4.h"
 #include "TRD/AliTRDv1.h"
 #include "FMD/AliFMDv1.h"
 #include "MUON/AliMUONv1.h"
@@ -523,7 +523,7 @@ void Config()
     {
         //=================== ZDC parameters ============================
 
-        AliZDC *ZDC = new AliZDCv3("ZDC", "normal ZDC");
+        AliZDC *ZDC = new AliZDCv4("ZDC", "normal ZDC");
     }
 
    if (iTRD)
index 145f9bcac92f2768ccf066ac92bd2df94af7ce2d..1a0ee201dfaf1e3c03e88f17b7129ce9c4db3572 100644 (file)
@@ -34,7 +34,7 @@
 #include "TPC/AliTPCv2.h"
 #include "TOF/AliTOFv6T0.h"
 #include "HMPID/AliHMPIDv3.h"
-#include "ZDC/AliZDCv3.h"
+#include "ZDC/AliZDCv4.h"
 #include "TRD/AliTRDv1.h"
 #include "TRD/AliTRDgeometry.h"
 #include "FMD/AliFMDv1.h"
@@ -409,7 +409,7 @@ void Config()
     {
         //=================== ZDC parameters ============================
 
-        AliZDC *ZDC = new AliZDCv3("ZDC", "normal ZDC");
+        AliZDC *ZDC = new AliZDCv4("ZDC", "normal ZDC");
     }
 
     if (iTRD)
index b00b66e2d0f4893ab7e8f9dc9faa588e3d56eb89..19c5130a75626d12010dc1c8116113de0207d8ca 100644 (file)
@@ -30,7 +30,7 @@
 #include "TPC/AliTPCv2.h"
 #include "TOF/AliTOFv6T0.h"
 #include "HMPID/AliHMPIDv3.h"
-#include "ZDC/AliZDCv3.h"
+#include "ZDC/AliZDCv4.h"
 #include "TRD/AliTRDv1.h"
 #include "FMD/AliFMDv1.h"
 #include "MUON/AliMUONv1.h"
@@ -310,7 +310,7 @@ void Config()
     {
         //=================== ZDC parameters ============================
 
-        AliZDC *ZDC = new AliZDCv3("ZDC", "normal ZDC");
+        AliZDC *ZDC = new AliZDCv4("ZDC", "normal ZDC");
     }
 
     if (iTRD)
index b0ce6d252650ec8abc074e4844bff3309aca7ee2..159e039c5b0f9aa6591d42b02f70bed5f824beb5 100644 (file)
@@ -44,7 +44,7 @@
 #include "TPC/AliTPCv2.h"
 #include "TOF/AliTOFv6T0.h"
 #include "HMPID/AliHMPIDv3.h"
-#include "ZDC/AliZDCv3.h"
+#include "ZDC/AliZDCv4.h"
 #include "TRD/AliTRDv1.h"
 #include "FMD/AliFMDv1.h"
 #include "MUON/AliMUONv1.h"
@@ -316,7 +316,7 @@ void Config()
     {
         //=================== ZDC parameters ============================
 
-        AliZDC *ZDC = new AliZDCv3("ZDC", "normal ZDC");
+        AliZDC *ZDC = new AliZDCv4("ZDC", "normal ZDC");
     }
 
     if (iTRD)
index 9e4160ec17c20fe4788a40ae8ad91f4f44e202bd..5f0ccc07b76283a3966d4b70ee27dc6244523b31 100644 (file)
@@ -35,7 +35,7 @@
 #include "TPC/AliTPCv2.h"
 #include "TOF/AliTOFv6T0.h"
 #include "HMPID/AliHMPIDv3.h"
-#include "ZDC/AliZDCv3.h"
+#include "ZDC/AliZDCv4.h"
 #include "TRD/AliTRDv1.h"
 #include "TRD/AliTRDgeometry.h"
 #include "FMD/AliFMDv1.h"
@@ -350,7 +350,7 @@ void Config()
   {
     //=================== ZDC parameters ============================
 
-    AliZDC *ZDC = new AliZDCv3("ZDC", "normal ZDC");
+    AliZDC *ZDC = new AliZDCv4("ZDC", "normal ZDC");
   }
 
   if (iTRD)
index 674f4ae0122922c0ca4ddf7542ba134950d24aee..56e771ab83ee3e9007c47deffbece2d9f141bfab 100644 (file)
@@ -34,7 +34,7 @@
 #include "TPC/AliTPCv2.h"
 #include "TOF/AliTOFv6T0.h"
 #include "HMPID/AliHMPIDv3.h"
-#include "ZDC/AliZDCv3.h"
+#include "ZDC/AliZDCv4.h"
 #include "TRD/AliTRDv1.h"
 #include "TRD/AliTRDgeometry.h"
 #include "FMD/AliFMDv1.h"
@@ -356,7 +356,7 @@ void Config()
   {
     //=================== ZDC parameters ============================
 
-    AliZDC *ZDC = new AliZDCv3("ZDC", "normal ZDC");
+    AliZDC *ZDC = new AliZDCv4("ZDC", "normal ZDC");
   }
 
   if (iTRD)
index 74df18dc5b117f99614308c40a084cf2239eb0ab..3a2b4a888e1a53539c8fbb6f02949fd76a98f635 100644 (file)
@@ -44,7 +44,7 @@
 #include "TPC/AliTPCv2.h"
 #include "TOF/AliTOFv6T0.h"
 #include "HMPID/AliHMPIDv3.h"
-#include "ZDC/AliZDCv3.h"
+#include "ZDC/AliZDCv4.h"
 #include "TRD/AliTRDv1.h"
 #include "FMD/AliFMDv1.h"
 #include "MUON/AliMUONv1.h"
@@ -340,7 +340,7 @@ void Config()
     {
         //=================== ZDC parameters ============================
 
-        AliZDC *ZDC = new AliZDCv3("ZDC", "normal ZDC");
+        AliZDC *ZDC = new AliZDCv4("ZDC", "normal ZDC");
     }
 
     if (iTRD)
index 3eaf40a508f2b330b25b0a7f85fc9f527248799a..c37cbcf80d58ff6d788505e9c0f196818ddb1121 100644 (file)
@@ -33,7 +33,7 @@
 #include "TPC/AliTPCv2.h"
 #include "TOF/AliTOFv6T0.h"
 #include "HMPID/AliHMPIDv3.h"
-#include "ZDC/AliZDCv3.h"
+#include "ZDC/AliZDCv4.h"
 #include "TRD/AliTRDv1.h"
 #include "TRD/AliTRDgeometry.h"
 #include "FMD/AliFMDv1.h"
@@ -501,7 +501,7 @@ void Config()
     {
         //=================== ZDC parameters ============================
 
-        AliZDC *ZDC = new AliZDCv3("ZDC", "normal ZDC");
+        AliZDC *ZDC = new AliZDCv4("ZDC", "normal ZDC");
     }
 
     if (iTRD)
index bc9e6901188645e31a2d98d24288442dd57b255b..e11e238a71ba0a350ef12e8676e2953e2bd473d7 100644 (file)
@@ -46,7 +46,7 @@
 #include "TPC/AliTPCv2.h"
 #include "TOF/AliTOFv6T0.h"
 #include "HMPID/AliHMPIDv3.h"
-#include "ZDC/AliZDCv3.h"
+#include "ZDC/AliZDCv4.h"
 #include "TRD/AliTRDv1.h"
 #include "FMD/AliFMDv1.h"
 #include "MUON/AliMUONv1.h"
@@ -392,7 +392,7 @@ void Config()
     {
         //=================== ZDC parameters ============================
 
-        AliZDC *ZDC = new AliZDCv3("ZDC", "normal ZDC");
+        AliZDC *ZDC = new AliZDCv4("ZDC", "normal ZDC");
     }
 
     if (iTRD)
index 1ad69d234a4f08d2ebb9fa916ab9eda1ab22c260..373f6702739a8c036a883666ea0c87e059956749 100644 (file)
@@ -46,7 +46,7 @@
 #include "TPC/AliTPCv2.h"
 #include "TOF/AliTOFv6T0.h"
 #include "HMPID/AliHMPIDv3.h"
-#include "ZDC/AliZDCv3.h"
+#include "ZDC/AliZDCv4.h"
 #include "TRD/AliTRDv1.h"
 #include "FMD/AliFMDv1.h"
 #include "MUON/AliMUONv1.h"
@@ -392,7 +392,7 @@ void Config()
     {
         //=================== ZDC parameters ============================
 
-        AliZDC *ZDC = new AliZDCv3("ZDC", "normal ZDC");
+        AliZDC *ZDC = new AliZDCv4("ZDC", "normal ZDC");
     }
 
     if (iTRD)
index c0707f1cf65543dc91e52d44f820db8fcd3d101b..4b38cb175396fc249839a018d3d8743fa767ede1 100644 (file)
@@ -34,7 +34,7 @@
 #include "TPC/AliTPCv2.h"
 #include "TOF/AliTOFv6T0.h"
 #include "HMPID/AliHMPIDv3.h"
-#include "ZDC/AliZDCv3.h"
+#include "ZDC/AliZDCv4.h"
 #include "TRD/AliTRDv1.h"
 #include "TRD/AliTRDgeometry.h"
 #include "FMD/AliFMDv1.h"
@@ -366,7 +366,7 @@ void Config()
     {
         //=================== ZDC parameters ============================
 
-        AliZDC *ZDC = new AliZDCv3("ZDC", "normal ZDC");
+        AliZDC *ZDC = new AliZDCv4("ZDC", "normal ZDC");
     }
 
     if (iTRD)
index f42008794a523b284a09777df50009d57318c7f4..7b520d4621d86ae7401de605ed35ad8fd599529d 100644 (file)
@@ -44,7 +44,7 @@
 #include "TPC/AliTPCv2.h"
 #include "TOF/AliTOFv6T0.h"
 #include "HMPID/AliHMPIDv3.h"
-#include "ZDC/AliZDCv3.h"
+#include "ZDC/AliZDCv4.h"
 #include "TRD/AliTRDv1.h"
 #include "FMD/AliFMDv1.h"
 #include "MUON/AliMUONv1.h"
@@ -382,7 +382,7 @@ void Config()
     {
         //=================== ZDC parameters ============================
 
-        AliZDC *ZDC = new AliZDCv3("ZDC", "normal ZDC");
+        AliZDC *ZDC = new AliZDCv4("ZDC", "normal ZDC");
     }
 
     if (iTRD)
index 69f0d8d204d2196ba74bca4a07628969a00d4dc3..13b3c54c2b72d67b281124bfa555ab9e8f8f30f9 100644 (file)
@@ -37,7 +37,7 @@
 #include "TPC/AliTPCv2.h"
 #include "TOF/AliTOFv6T0.h"
 #include "HMPID/AliHMPIDv3.h"
-#include "ZDC/AliZDCv3.h"
+#include "ZDC/AliZDCv4.h"
 #include "TRD/AliTRDv1.h"
 #include "FMD/AliFMDv1.h"
 #include "MUON/AliMUONv1.h"
@@ -451,7 +451,7 @@ void Config()
     {
         //=================== ZDC parameters ============================
 
-        AliZDC *ZDC = new AliZDCv3("ZDC", "normal ZDC");
+        AliZDC *ZDC = new AliZDCv4("ZDC", "normal ZDC");
     }
 
     if (iTRD)
index ec15d65d03c9b57fac9c559ecef25cef8e9e5bd6..fcf3a8bdc236599073981f41353644843b9d627f 100644 (file)
@@ -34,7 +34,7 @@
 #include "TPC/AliTPCv2.h"
 #include "TOF/AliTOFv6T0.h"
 #include "HMPID/AliHMPIDv3.h"
-#include "ZDC/AliZDCv3.h"
+#include "ZDC/AliZDCv4.h"
 #include "TRD/AliTRDv1.h"
 #include "TRD/AliTRDgeometry.h"
 #include "FMD/AliFMDv1.h"
@@ -410,7 +410,7 @@ void Config()
     {
         //=================== ZDC parameters ============================
 
-        AliZDC *ZDC = new AliZDCv3("ZDC", "normal ZDC");
+        AliZDC *ZDC = new AliZDCv4("ZDC", "normal ZDC");
     }
 
     if (iTRD)
index a5ce006b39b7e26d81c5fb146b7ea980068c6b3c..825525213d46b389d7e59e26d8e74d4d322866cf 100644 (file)
@@ -30,7 +30,7 @@
 #include "TPC/AliTPCv2.h"
 #include "TOF/AliTOFv6T0.h"
 #include "HMPID/AliHMPIDv3.h"
-#include "ZDC/AliZDCv3.h"
+#include "ZDC/AliZDCv4.h"
 #include "TRD/AliTRDv1.h"
 #include "TRD/AliTRDgeometry.h"
 #include "FMD/AliFMDv1.h"
@@ -277,7 +277,7 @@ void Config()
     {
       //=================== ZDC parameters ============================
        
-      AliZDC *ZDC = new AliZDCv3("ZDC", "normal ZDC");
+      AliZDC *ZDC = new AliZDCv4("ZDC", "normal ZDC");
       //Collimators aperture
       ZDC->SetVCollSideCAperture(0.85);
       ZDC->SetVCollSideCCentre(0.);
index a3cc6e744fc86c8fff3cc677004cdc85049242cd..36fa41d07e15ebea28e42174389cbf47514c1750 100644 (file)
@@ -29,7 +29,7 @@
 #include "TPC/AliTPCv2.h"
 #include "TOF/AliTOFv6T0.h"
 #include "HMPID/AliHMPIDv3.h"
-#include "ZDC/AliZDCv3.h"
+#include "ZDC/AliZDCv4.h"
 #include "TRD/AliTRDv1.h"
 #include "TRD/AliTRDgeometry.h"
 #include "FMD/AliFMDv1.h"
@@ -360,7 +360,7 @@ void Config()
     {
       //=================== ZDC parameters ============================
        
-      AliZDC *ZDC = new AliZDCv3("ZDC", "normal ZDC");
+      AliZDC *ZDC = new AliZDCv4("ZDC", "normal ZDC");
       //Collimators aperture
       ZDC->SetVCollSideCAperture(0.85);
       ZDC->SetVCollSideCCentre(0.);