Changes for #89427: Porting modification for material budget issues to the Release...

diff --git a/FMD/Config.C b/FMD/Config.C
index 9cf8b0a3b86a4c1bfe1c39750d7d3534bce9eb38..f61f53e45d0333d3bd49ee5b11343cffa013a141 100644 (file)
--- a/FMD/Config.C
+++ b/FMD/Config.C
@@ -414,7 +414,7 @@ Config()
   }
   if (useSHIL)   AliSHIL   *SHIL   = new AliSHILv3("SHIL", "Shielding v3");
   if (usePIPE)   AliPIPE   *PIPE   = new AliPIPEv3("PIPE", "Beam Pipe");
-  if (useITS)    AliITS    *ITS    = new AliITSv11Hybrid("ITS","ITS v11Hybrid");
+  if (useITS)    AliITS    *ITS    = new AliITSv11("ITS","ITS v11");
   if (useTPC)    AliTPC    *TPC    = new AliTPCv2("TPC", "Default");
   if (useTOF)    AliTOF    *TOF    = new AliTOFv6T0("TOF", "normal TOF");
   if (useHMPID)  AliHMPID  *HMPID  = new AliHMPIDv1("HMPID", "normal HMPID");

diff --git a/HMPID/Hconfig.C b/HMPID/Hconfig.C
index 8907a700bfc27d3365b8fcb2cb5d3c293b1d6499..510b059f3de9a6139d47adc6d1a18d2c6de92056 100644 (file)
--- a/HMPID/Hconfig.C
+++ b/HMPID/Hconfig.C
@@ -453,7 +453,7 @@ void HmpConfig::WriteDet(FILE *pF)
 //CORE detectors                  
   if(fDetBG->GetButton(kPIPE )->GetState()) fprintf(pF,"\n  new AliPIPEv3(\"PIPE\",\"Beam Pipe\");\n");
   if(fDetBG->GetButton(kSHILD)->GetState()) fprintf(pF,"\n  new AliSHILv3(\"SHIL\",\"Shielding Version 2\");\n");  
-  if(fDetBG->GetButton(kITS  )->GetState()) fprintf(pF,"\n  new AliITSv11Hybrid(\"ITS\",\"ITS v11Hybrid\");\n");
+  if(fDetBG->GetButton(kITS  )->GetState()) fprintf(pF,"\n  new AliITSv11(\"ITS\",\"ITS v11\");\n");
   
   if(fDetBG->GetButton(kTPC  )->GetState())  fprintf(pF,"\n  new AliTPCv2(\"TPC\",\"Default\");\n");
   if(fDetBG->GetButton(kFRAME)->GetState())  fprintf(pF,"\n  AliFRAMEv2 *pFrame=new AliFRAMEv2(\"FRAME\",\"Space Frame\"); pFrame->SetHoles(1);\n");

diff --git a/MUON/Config.C b/MUON/Config.C
index 5abda7c44deda77ef18d8c0c08c4ab1a3f51dba5..56c609b18b6b15c1def88d4aed8350e5ce155052 100644 (file)
--- a/MUON/Config.C
+++ b/MUON/Config.C
@@ -43,7 +43,7 @@
 #include "AliGenParam.h"
 #include "AliGenScan.h"
 #include "AliHALLv3.h"
-#include "AliITSv11Hybrid.h"
+#include "AliITSv11.h"
 #include "AliMAG.h"
 #include "AliMagF.h"
 #include "AliMUONv1.h"
@@ -280,11 +280,11 @@ void Config(const char* directory="",
     MUON->SetDigitizerWithNoise(0);
                MUON->SetConvertTrigger(true);
     
-    new AliITSv11Hybrid("ITS","ITS v11Hybrid");    
+    new AliITSv11("ITS","ITS v11");    
   }
   else if (forRealistic)
   {
-    new AliITSv11Hybrid("ITS","ITS v11Hybrid");        
+    new AliITSv11("ITS","ITS v11");        
   }
   
   // Use non-high performance raw data decoder 

diff --git a/MUON/commonConfig.C b/MUON/commonConfig.C
index 4fd03fc7e06e92a2fb3fe618eaaa2faad4cf0b11..62b1b8ec07a19ed2c6726af9e7175853c40be995 100644 (file)
--- a/MUON/commonConfig.C
+++ b/MUON/commonConfig.C
@@ -118,7 +118,7 @@ void commonConfig(const char* directory="",
     MUON->SetDigitizerWithNoise(0);
                MUON->SetConvertTrigger(true);
     
-    new AliITSv11Hybrid("ITS","ITS v11Hybrid");
+    new AliITSv11("ITS","ITS v11");
     
   }
 

diff --git a/TFluka/macro/FlukaConfig.C b/TFluka/macro/FlukaConfig.C
index ab173727a33919f8f46b7d3d2a0a23265a1eeb85..33294a5787dfbdd7e6df1114ca8e0d005e7b7141 100644 (file)
--- a/TFluka/macro/FlukaConfig.C
+++ b/TFluka/macro/FlukaConfig.C
@@ -26,7 +26,7 @@
 #include "STRUCT/AliFRAMEv2.h"
 #include "STRUCT/AliSHILv3.h"
 #include "STRUCT/AliPIPEv3.h"
-#include "ITS/AliITSv11Hybrid.h"
+#include "ITS/AliITSv11.h"
 #include "TPC/AliTPCv2.h"
 #include "TOF/AliTOFv6T0.h"
 #include "HMPID/AliHMPIDv3.h"
@@ -284,7 +284,7 @@ void Config()
     {
         //=================== ITS parameters ============================
 
-       AliITS *ITS  = new AliITSv11Hybrid("ITS","ITS v11Hybrid");
+       AliITS *ITS  = new AliITSv11("ITS","ITS v11");
     }
 
     if (iTPC)

diff --git a/TPC/testMC/ConfigCosmic.C b/TPC/testMC/ConfigCosmic.C
index faa25ec1750d8ac435eeae477eb55389479fe2ed..48e9806868763e2feebfcb08e4465d6650734c40 100644 (file)
--- a/TPC/testMC/ConfigCosmic.C
+++ b/TPC/testMC/ConfigCosmic.C
@@ -40,7 +40,7 @@
 #include "STRUCT/AliFRAMEv2.h"
 #include "STRUCT/AliSHILv3.h"
 #include "STRUCT/AliPIPEv3.h"
-#include "ITS/AliITSv11Hybrid.h"
+#include "ITS/AliITSv11.h"
 #include "TPC/AliTPCv2.h"
 #include "TOF/AliTOFv6T0.h"
 #include "HMPID/AliHMPIDv3.h"
@@ -358,7 +358,7 @@ void Config()
     {
         //=================== ITS parameters ============================
 
-       AliITS *ITS  = new AliITSv11Hybrid("ITS","ITS v11Hybrid");
+       AliITS *ITS  = new AliITSv11("ITS","ITS v11");
     }
 
     if (iTPC)

diff --git a/TPC/testMC/ConfigCosmic0Field.C b/TPC/testMC/ConfigCosmic0Field.C
index fa6c8154cba2126c026359b983703a8e53a2d3b0..71d2b5c649e7211c6493812414d107c336cb942d 100644 (file)
--- a/TPC/testMC/ConfigCosmic0Field.C
+++ b/TPC/testMC/ConfigCosmic0Field.C
@@ -26,7 +26,7 @@
 #include "STRUCT/AliFRAMEv2.h"
 #include "STRUCT/AliSHILv3.h"
 #include "STRUCT/AliPIPEv3.h"
-#include "ITS/AliITSv11Hybrid.h"
+#include "ITS/AliITSv11.h"
 #include "TPC/AliTPCv2.h"
 #include "TOF/AliTOFv6T0.h"
 #include "HMPID/AliHMPIDv3.h"
@@ -268,7 +268,7 @@ void Config()
     {
         //=================== ITS parameters ============================
 
-       AliITS *ITS  = new AliITSv11Hybrid("ITS","ITS v11Hybrid");
+       AliITS *ITS  = new AliITSv11("ITS","ITS v11");
     }
 
     if (iTPC)

diff --git a/TPC/testMC/ConfigCosmicBox.C b/TPC/testMC/ConfigCosmicBox.C
index 6ddd22491d144140409181f58167df303e040a09..3dcbddd86ae70348b0e9443a2d0f49f68612059f 100644 (file)
--- a/TPC/testMC/ConfigCosmicBox.C
+++ b/TPC/testMC/ConfigCosmicBox.C
@@ -40,7 +40,7 @@
 #include "STRUCT/AliFRAMEv2.h"
 #include "STRUCT/AliSHILv3.h"
 #include "STRUCT/AliPIPEv3.h"
-#include "ITS/AliITSv11Hybrid.h"
+#include "ITS/AliITSv11.h"
 #include "TPC/AliTPCv2.h"
 #include "TOF/AliTOFv6T0.h"
 #include "HMPID/AliHMPIDv3.h"
@@ -358,7 +358,7 @@ void Config()
     {
         //=================== ITS parameters ============================
 
-       AliITS *ITS  = new AliITSv11Hybrid("ITS","ITS v11Hybrid");
+       AliITS *ITS  = new AliITSv11("ITS","ITS v11");
     }
 
     if (iTPC)

diff --git a/TPC/testMC/ConfigCosmicField05.C b/TPC/testMC/ConfigCosmicField05.C
index b1e7aec208da4b9437e9b1b585cab256c3105c4b..c53e8a12ba3ff0b355010ce0fbbf1d5912157d0f 100644 (file)
--- a/TPC/testMC/ConfigCosmicField05.C
+++ b/TPC/testMC/ConfigCosmicField05.C
@@ -26,7 +26,7 @@
 #include "STRUCT/AliFRAMEv2.h"
 #include "STRUCT/AliSHILv3.h"
 #include "STRUCT/AliPIPEv3.h"
-#include "ITS/AliITSv11Hybrid.h"
+#include "ITS/AliITSv11.h"
 #include "TPC/AliTPCv2.h"
 #include "TOF/AliTOFv6T0.h"
 #include "HMPID/AliHMPIDv3.h"
@@ -268,7 +268,7 @@ void Config()
     {
         //=================== ITS parameters ============================
 
-       AliITS *ITS  = new AliITSv11Hybrid("ITS","ITS v11Hybrid");
+       AliITS *ITS  = new AliITSv11("ITS","ITS v11");
     }
 
     if (iTPC)

diff --git a/TPC/testMC/ConfigHPT.C b/TPC/testMC/ConfigHPT.C
index 64f8b14233211b967c076abb820f7acbba319350..fc8afe600f44f1888d51e4aa6ae712d1d282fedc 100644 (file)
--- a/TPC/testMC/ConfigHPT.C
+++ b/TPC/testMC/ConfigHPT.C
@@ -40,7 +40,7 @@
 #include "STRUCT/AliFRAMEv2.h"
 #include "STRUCT/AliSHILv3.h"
 #include "STRUCT/AliPIPEv3.h"
-#include "ITS/AliITSv11Hybrid.h"
+#include "ITS/AliITSv11.h"
 #include "TPC/AliTPCv2.h"
 #include "TOF/AliTOFv6T0.h"
 #include "HMPID/AliHMPIDv3.h"
@@ -361,7 +361,7 @@ void Config()
     {
         //=================== ITS parameters ============================
 
-       AliITS *ITS  = new AliITSv11Hybrid("ITS","ITS v11Hybrid");
+       AliITS *ITS  = new AliITSv11("ITS","ITS v11");
     }
 
     if (iTPC)

diff --git a/TPC/testMC/ConfigPP.C b/TPC/testMC/ConfigPP.C
index 7741252525a436f7dc24550ae20b7af1cc41a8d9..4e51353c0360d3dda79e23cedc2a27649c3bee15 100644 (file)
--- a/TPC/testMC/ConfigPP.C
+++ b/TPC/testMC/ConfigPP.C
@@ -40,7 +40,7 @@
 #include "STRUCT/AliFRAMEv2.h"
 #include "STRUCT/AliSHILv3.h"
 #include "STRUCT/AliPIPEv3.h"
-#include "ITS/AliITSv11Hybrid.h"
+#include "ITS/AliITSv11.h"
 #include "TPC/AliTPCv2.h"
 #include "TOF/AliTOFv6T0.h"
 #include "HMPID/AliHMPIDv3.h"
@@ -355,7 +355,7 @@ void Config()
     {
         //=================== ITS parameters ============================
 
-       AliITS *ITS  = new AliITSv11Hybrid("ITS","ITS v11Hybrid");
+       AliITS *ITS  = new AliITSv11("ITS","ITS v11");
     }
 
     if (iTPC)

diff --git a/macros/Config.C b/macros/Config.C
index 278a26a488247ebdf278753cfbfc7f5ff88655de..cd78bceeebb831770dff521a8593225defe73a51 100644 (file)
--- a/macros/Config.C
+++ b/macros/Config.C
@@ -26,7 +26,7 @@
 #include "STRUCT/AliFRAMEv2.h"
 #include "STRUCT/AliSHILv3.h"
 #include "STRUCT/AliPIPEv3.h"
-#include "ITS/AliITSv11Hybrid.h"
+#include "ITS/AliITSv11.h"
 #include "TPC/AliTPCv2.h"
 #include "TOF/AliTOFv6T0.h"
 #include "HMPID/AliHMPIDv3.h"
@@ -274,7 +274,7 @@ void Config()
     {
         //=================== ITS parameters ============================
 
-       AliITS *ITS  = new AliITSv11Hybrid("ITS","ITS v11Hybrid");
+       AliITS *ITS  = new AliITSv11("ITS","ITS v11");
     }
 
     if (iTPC)

diff --git a/macros/ConfigBeautyPPR.C b/macros/ConfigBeautyPPR.C
index f29b0095eb56e27bcbd97aaba6cf5420e9f3b9de..a765a8b2d29db7278981703fdedf5a87582eaab8 100644 (file)
--- a/macros/ConfigBeautyPPR.C
+++ b/macros/ConfigBeautyPPR.C
@@ -19,7 +19,7 @@
 #include "STRUCT/AliFRAMEv2.h"
 #include "STRUCT/AliSHILv3.h"
 #include "STRUCT/AliPIPEv3.h"
-#include "ITS/AliITSv11Hybrid.h"
+#include "ITS/AliITSv11.h"
 #include "TPC/AliTPCv2.h"
 #include "TOF/AliTOFv6T0.h"
 #include "HMPID/AliHMPIDv3.h"
@@ -243,7 +243,7 @@ void Config()
   if(iITS) {
     //=================== ITS parameters ============================
 
-    AliITS *ITS  = new AliITSv11Hybrid("ITS","ITS v11Hybrid");
+    AliITS *ITS  = new AliITSv11("ITS","ITS v11");
   }
   
 

diff --git a/macros/ConfigCharmPPR.C b/macros/ConfigCharmPPR.C
index 75666257d73beff87d650b2f6b35ecab6a29f09c..5f11eed72ef22a194b0fca69fd244c87b2bfd99a 100644 (file)
--- a/macros/ConfigCharmPPR.C
+++ b/macros/ConfigCharmPPR.C
@@ -19,7 +19,7 @@
 #include "STRUCT/AliFRAMEv2.h"
 #include "STRUCT/AliSHILv3.h"
 #include "STRUCT/AliPIPEv3.h"
-#include "ITS/AliITSv11Hybrid.h"
+#include "ITS/AliITSv11.h"
 #include "TPC/AliTPCv2.h"
 #include "TOF/AliTOFv6T0.h"
 #include "HMPID/AliHMPIDv3.h"
@@ -243,7 +243,7 @@ void Config()
   {
     //=================== ITS parameters ============================
 
-    AliITS *ITS  = new AliITSv11Hybrid("ITS","ITS v11Hybrid");
+    AliITS *ITS  = new AliITSv11("ITS","ITS v11");
   }
   
 

diff --git a/macros/ConfigHBT.C b/macros/ConfigHBT.C
index dabc206b3da51be9aed2680f2a3b68226208ff76..f026337b8a8fef07a7719746204210a527062d4f 100644 (file)
--- a/macros/ConfigHBT.C
+++ b/macros/ConfigHBT.C
@@ -28,7 +28,7 @@
 #include "STRUCT/AliFRAMEv2.h"
 #include "STRUCT/AliSHILv3.h"
 #include "STRUCT/AliPIPEv3.h"
-#include "ITS/AliITSv11Hybrid.h"
+#include "ITS/AliITSv11.h"
 #include "TPC/AliTPCv2.h"
 #include "TOF/AliTOFv6T0.h"
 #include "HMPID/AliHMPIDv3.h"
@@ -315,7 +315,7 @@ void Config()
     {
         //=================== ITS parameters ============================
 
-        AliITS *ITS  = new AliITSv11Hybrid("ITS","ITS v11Hybrid");
+        AliITS *ITS  = new AliITSv11("ITS","ITS v11");
     }
   
 

diff --git a/macros/ConfigPPR.C b/macros/ConfigPPR.C
index 8bb9b01530138b501210b9a43508a0a0c62c2ecf..6babd08e355deb7dd05314dbdb192f3122d8c54a 100644 (file)
--- a/macros/ConfigPPR.C
+++ b/macros/ConfigPPR.C
@@ -40,7 +40,7 @@
 #include "STRUCT/AliFRAMEv2.h"
 #include "STRUCT/AliSHILv3.h"
 #include "STRUCT/AliPIPEv3.h"
-#include "ITS/AliITSv11Hybrid.h"
+#include "ITS/AliITSv11.h"
 #include "TPC/AliTPCv2.h"
 #include "TOF/AliTOFv6T0.h"
 #include "HMPID/AliHMPIDv3.h"
@@ -364,7 +364,7 @@ void Config()
     {
        //=================== ITS parameters ============================
 
-       AliITS *ITS  = new AliITSv11Hybrid("ITS","ITS v11Hybrid");
+       AliITS *ITS  = new AliITSv11("ITS","ITS v11");
     }
 
     if (iTPC)

diff --git a/macros/ConfigRaw2010.C b/macros/ConfigRaw2010.C
index 0922bc4d42f5636c2b08ae38648723e85565ab5a..f83f2c600503d2fe70d8c43a3013c485bdc0af91 100644 (file)
--- a/macros/ConfigRaw2010.C
+++ b/macros/ConfigRaw2010.C
@@ -30,7 +30,7 @@
 #include "STRUCT/AliFRAMEv2.h"
 #include "STRUCT/AliSHILv3.h"
 #include "STRUCT/AliPIPEv3.h"
-#include "ITS/AliITSv11Hybrid.h"
+#include "ITS/AliITSv11.h"
 #include "TPC/AliTPCv2.h"
 #include "TOF/AliTOFv6T0.h"
 #include "HMPID/AliHMPIDv3.h"
@@ -323,7 +323,7 @@ void Config()
     {
         //=================== ITS parameters ============================
 
-       AliITS *ITS  = new AliITSv11Hybrid("ITS","ITS v11Hybrid");
+       AliITS *ITS  = new AliITSv11("ITS","ITS v11");
     }
 
     if (iTPC)

diff --git a/macros/ConfigRaw2011.C b/macros/ConfigRaw2011.C
index 12799a51ff37fe099b130828d64a31cf2357a5a8..7d3dc2fd17fd46ad27cd31fad6b52f1ea56f6ae0 100644 (file)
--- a/macros/ConfigRaw2011.C
+++ b/macros/ConfigRaw2011.C
@@ -30,7 +30,7 @@
 #include "STRUCT/AliFRAMEv2.h"
 #include "STRUCT/AliSHILv3.h"
 #include "STRUCT/AliPIPEv3.h"
-#include "ITS/AliITSv11Hybrid.h"
+#include "ITS/AliITSv11.h"
 #include "TPC/AliTPCv2.h"
 #include "TOF/AliTOFv6T0.h"
 #include "HMPID/AliHMPIDv3.h"
@@ -323,7 +323,7 @@ void Config()
     {
         //=================== ITS parameters ============================
 
-       AliITS *ITS  = new AliITSv11Hybrid("ITS","ITS v11Hybrid");
+       AliITS *ITS  = new AliITSv11("ITS","ITS v11");
     }
 
     if (iTPC)

diff --git a/macros/Config_AliGenCosmicsParam.C b/macros/Config_AliGenCosmicsParam.C
index eb7da3ec89d2f06400b880c4f51b80dbd987e197..5deab168c4ed75b99234179f94146a5d0b778ed3 100644 (file)
--- a/macros/Config_AliGenCosmicsParam.C
+++ b/macros/Config_AliGenCosmicsParam.C
@@ -26,7 +26,7 @@
 #include "STRUCT/AliFRAMEv2.h"
 #include "STRUCT/AliSHILv2.h"
 #include "STRUCT/AliPIPEv0.h"
-#include "ITS/AliITSv11Hybrid.h"
+#include "ITS/AliITSv11.h"
 #include "TPC/AliTPCv2.h"
 #include "TOF/AliTOFv5T0.h"
 #include "HMPID/AliHMPIDv3.h"
@@ -248,7 +248,7 @@ void Config()
     {
         //=================== ITS parameters ============================
 
-       AliITS *ITS  = new AliITSv11Hybrid("ITS","ITS v11Hybrid");
+       AliITS *ITS  = new AliITSv11("ITS","ITS v11");
     }
 
     if (iTPC)

diff --git a/macros/Config_PDC06.C b/macros/Config_PDC06.C
index 3caf5627ad56e63e4a214bf6b0a9e927a618ba1d..9e17d319a5cd27b6c038b52b11f98261ae91d244 100644 (file)
--- a/macros/Config_PDC06.C
+++ b/macros/Config_PDC06.C
@@ -33,7 +33,7 @@
 #include "STRUCT/AliSHILv3.h"
 #include "STRUCT/AliPIPEv3.h"
 #include "ITS/AliITSgeom.h"
-#include "ITS/AliITSv11Hybrid.h"
+#include "ITS/AliITSv11.h"
 #include "TPC/AliTPCv2.h"
 #include "TOF/AliTOFv6T0.h"
 #include "HMPID/AliHMPIDv3.h"
@@ -432,7 +432,7 @@ void Config()
     {
         //=================== ITS parameters ============================
 
-       AliITS *ITS  = new AliITSv11Hybrid("ITS","ITS v11Hybrid");
+       AliITS *ITS  = new AliITSv11("ITS","ITS v11");
     }
 
     if (iTPC)

diff --git a/macros/Config_PDC06_MUON.C b/macros/Config_PDC06_MUON.C
index 1ad6754f68f115730efb8af5d6edbbb6b58607c1..080f57875e18749d6429dcc157d0015e3b7b597d 100644 (file)
--- a/macros/Config_PDC06_MUON.C
+++ b/macros/Config_PDC06_MUON.C
@@ -182,7 +182,7 @@ void Config(char directory[100]="", char option[6]="trg1mu")
   AliSHIL *SHIL = new AliSHILv3("SHIL", "Shielding Version 3");
   //=================== ITS parameters =============================
   if(iITS) {
-      AliITS *ITS  = new AliITSv11Hybrid("ITS","ITS v11Hybrid");
+      AliITS *ITS  = new AliITSv11("ITS","ITS v11");
   }
  //=================== ZDC parameters =============================
   if(iZDC) {

diff --git a/macros/Config_PDC07_MBias_MUON.C b/macros/Config_PDC07_MBias_MUON.C
index f1eaee8b1f6b40d087fff2776e7cd1ea014cc542..f7d5e80be18347825054361adda8e97aa860dca9 100644 (file)
--- a/macros/Config_PDC07_MBias_MUON.C
+++ b/macros/Config_PDC07_MBias_MUON.C
@@ -196,7 +196,7 @@ void Config(char directory[100]="", char option[6]="trgAll")
     AliSHIL *SHIL = new AliSHILv3("SHIL", "Shielding Version 3");
   //=================== ITS parameters =============================
     if(iITS) {
-       AliITS *ITS  = new AliITSv11Hybrid("ITS","ITS v11Hybrid");
+       AliITS *ITS  = new AliITSv11("ITS","ITS v11");
     }      
  //=================== FMD parameters =============================
     if(iFMD) {

diff --git a/macros/Config_PythiaHeavyFlavours.C b/macros/Config_PythiaHeavyFlavours.C
index a34e0a91c98acccd6c2a43960594247508624902..b6b25683a1856ed459ca866fff94779ed53aa292 100644 (file)
--- a/macros/Config_PythiaHeavyFlavours.C
+++ b/macros/Config_PythiaHeavyFlavours.C
@@ -32,7 +32,7 @@
 #include "STRUCT/AliFRAMEv2.h"
 #include "STRUCT/AliSHILv3.h"
 #include "STRUCT/AliPIPEv3.h"
-#include "ITS/AliITSv11Hybrid.h"
+#include "ITS/AliITSv11.h"
 #include "TPC/AliTPCv2.h"
 #include "TOF/AliTOFv6T0.h"
 #include "HMPID/AliHMPIDv3.h"
@@ -383,7 +383,7 @@ void Config()
   if(iITS) {
     //=================== ITS parameters ============================
 
-    AliITS *ITS  = new AliITSv11Hybrid("ITS","ITS v11Hybrid");
+    AliITS *ITS  = new AliITSv11("ITS","ITS v11");
   }
   
 

diff --git a/macros/g4ConfigCommon.C b/macros/g4ConfigCommon.C
index 723e2e522975405eb8ca9b9e193e65c38da2f690..69b56a48f6a712e0a31d49211049fff9e0fc19ff 100644 (file)
--- a/macros/g4ConfigCommon.C
+++ b/macros/g4ConfigCommon.C
@@ -193,7 +193,7 @@ void ConfigCommon(Bool_t setRootGeometry = kTRUE)
     {
         //=================== ITS parameters ============================
 
-       AliITS *ITS  = new AliITSv11Hybrid("ITS","ITS v11Hybrid");
+       AliITS *ITS  = new AliITSv11("ITS","ITS v11");
     }
 
     if (iTPC)

diff --git a/macros/g4ConfigCommon1.C b/macros/g4ConfigCommon1.C
index ff9c9bc332c417b67e1f7d0312ef6ea1a95e583f..ac76e79d9aeb772224854b639620fee905239878 100644 (file)
--- a/macros/g4ConfigCommon1.C
+++ b/macros/g4ConfigCommon1.C
@@ -181,7 +181,7 @@ void ConfigCommon1(Bool_t setRootGeometry = kTRUE)
   {
       //=================== ITS parameters ============================
 
-      AliITS *ITS  = new AliITSv11Hybrid("ITS","ITS v11Hybrid");
+      AliITS *ITS  = new AliITSv11("ITS","ITS v11");
   }
 
   if (iTPC)

diff --git a/test/PbPbbench/Config.C b/test/PbPbbench/Config.C
index 915e2af73372d9adec0ea55668cc547b75d72cc4..053130d1558086c5faab4aa0d60455d1699faa9e 100644 (file)
--- a/test/PbPbbench/Config.C
+++ b/test/PbPbbench/Config.C
@@ -40,7 +40,7 @@
 #include "STRUCT/AliFRAMEv2.h"
 #include "STRUCT/AliSHILv3.h"
 #include "STRUCT/AliPIPEv3.h"
-#include "ITS/AliITSv11Hybrid.h"
+#include "ITS/AliITSv11.h"
 #include "TPC/AliTPCv2.h"
 #include "TOF/AliTOFv6T0.h"
 #include "HMPID/AliHMPIDv3.h"
@@ -362,7 +362,7 @@ void Config()
     {
         //=================== ITS parameters ============================
 
-       AliITS *ITS  = new AliITSv11Hybrid("ITS","ITS v11Hybrid");
+       AliITS *ITS  = new AliITSv11("ITS","ITS v11");
     }
 
     if (iTPC)

diff --git a/test/QA/Config.C b/test/QA/Config.C
index b91b989d41771c354e028e180e27d62b9b91d596..444576fac902216b91508ebb60c9db5d087e432f 100644 (file)
--- a/test/QA/Config.C
+++ b/test/QA/Config.C
@@ -494,7 +494,7 @@ void Config()
     //=================== ITS parameters ============================
     //
 
-      AliITS *ITS  = new AliITSv11Hybrid("ITS","ITS v11Hybrid");
+      AliITS *ITS  = new AliITSv11("ITS","ITS v11");
     }
 
 

diff --git a/test/embedding/Config.C b/test/embedding/Config.C
index 52474dd315ecd2ba1cbafbd56c3bf50d6a2c662c..145f9bcac92f2768ccf066ac92bd2df94af7ce2d 100644 (file)
--- a/test/embedding/Config.C
+++ b/test/embedding/Config.C
@@ -30,7 +30,7 @@
 #include "STRUCT/AliFRAMEv2.h"
 #include "STRUCT/AliSHILv3.h"
 #include "STRUCT/AliPIPEv3.h"
-#include "ITS/AliITSv11Hybrid.h"
+#include "ITS/AliITSv11.h"
 #include "TPC/AliTPCv2.h"
 #include "TOF/AliTOFv6T0.h"
 #include "HMPID/AliHMPIDv3.h"
@@ -378,7 +378,7 @@ void Config()
     {
         //=================== ITS parameters ============================
 
-       AliITS *ITS  = new AliITSv11Hybrid("ITS","ITS v11Hybrid");
+       AliITS *ITS  = new AliITSv11("ITS","ITS v11");
     }
 
     if (iTPC)

diff --git a/test/gun/Config.C b/test/gun/Config.C
index 38ef677c2ee134646e998594729b94d2f496ee06..9485ce48992264ee541c47662031cbb630fca97f 100644 (file)
--- a/test/gun/Config.C
+++ b/test/gun/Config.C
@@ -29,7 +29,7 @@
 #include "STRUCT/AliFRAMEv2.h"
 #include "STRUCT/AliSHILv3.h"
 #include "STRUCT/AliPIPEv3.h"
-#include "ITS/AliITSv11Hybrid.h"
+#include "ITS/AliITSv11.h"
 #include "TPC/AliTPCv2.h"
 #include "TOF/AliTOFv6T0.h"
 #include "HMPID/AliHMPIDv3.h"
@@ -470,7 +470,7 @@ void Config()
     {
         //=================== ITS parameters ============================
 
-       AliITS *ITS  = new AliITSv11Hybrid("ITS","ITS v11Hybrid");
+       AliITS *ITS  = new AliITSv11("ITS","ITS v11");
     }
 
     if (iTPC)

diff --git a/test/pileup/Config.C b/test/pileup/Config.C
index 0054e0f33a15ae1303378b4205a9eb5d5dfb7b7e..c0707f1cf65543dc91e52d44f820db8fcd3d101b 100644 (file)
--- a/test/pileup/Config.C
+++ b/test/pileup/Config.C
@@ -30,7 +30,7 @@
 #include "STRUCT/AliFRAMEv2.h"
 #include "STRUCT/AliSHILv3.h"
 #include "STRUCT/AliPIPEv3.h"
-#include "ITS/AliITSv11Hybrid.h"
+#include "ITS/AliITSv11.h"
 #include "TPC/AliTPCv2.h"
 #include "TOF/AliTOFv6T0.h"
 #include "HMPID/AliHMPIDv3.h"
@@ -335,7 +335,7 @@ void Config()
     {
         //=================== ITS parameters ============================
 
-       AliITS *ITS  = new AliITSv11Hybrid("ITS","ITS v11Hybrid");
+       AliITS *ITS  = new AliITSv11("ITS","ITS v11");
     }
 
     if (iTPC)

diff --git a/test/ppbench/Config.C b/test/ppbench/Config.C
index a7e11613091dac097874b19e4e87f3a5b318477a..f42008794a523b284a09777df50009d57318c7f4 100644 (file)
--- a/test/ppbench/Config.C
+++ b/test/ppbench/Config.C
@@ -40,7 +40,7 @@
 #include "STRUCT/AliFRAMEv2.h"
 #include "STRUCT/AliSHILv3.h"
 #include "STRUCT/AliPIPEv3.h"
-#include "ITS/AliITSv11Hybrid.h"
+#include "ITS/AliITSv11.h"
 #include "TPC/AliTPCv2.h"
 #include "TOF/AliTOFv6T0.h"
 #include "HMPID/AliHMPIDv3.h"
@@ -354,7 +354,7 @@ void Config()
     {
         //=================== ITS parameters ============================
 
-       AliITS *ITS  = new AliITSv11Hybrid("ITS","ITS v11Hybrid");
+       AliITS *ITS  = new AliITSv11("ITS","ITS v11");
     }
 
     if (iTPC)

diff --git a/test/pploadlibs/Config.C b/test/pploadlibs/Config.C
index dee328fdb1c67c367e64e2cbe00d1fa284278072..69f0d8d204d2196ba74bca4a07628969a00d4dc3 100644 (file)
--- a/test/pploadlibs/Config.C
+++ b/test/pploadlibs/Config.C
@@ -33,7 +33,7 @@
 #include "STRUCT/AliSHILv3.h"
 #include "STRUCT/AliPIPEv3.h"
 #include "ITS/AliITSgeom.h"
-#include "ITS/AliITSv11Hybrid.h"
+#include "ITS/AliITSv11.h"
 #include "TPC/AliTPCv2.h"
 #include "TOF/AliTOFv6T0.h"
 #include "HMPID/AliHMPIDv3.h"
@@ -423,7 +423,7 @@ void Config()
     {
         //=================== ITS parameters ============================
 
-       AliITS *ITS  = new AliITSv11Hybrid("ITS","ITS v11Hybrid");
+       AliITS *ITS  = new AliITSv11("ITS","ITS v11");
     }
 
     if (iTPC)

diff --git a/test/rawmerge/Config.C b/test/rawmerge/Config.C
index f81845bb24ac64cd2dacc371af8bf55c0a142206..ec15d65d03c9b57fac9c559ecef25cef8e9e5bd6 100644 (file)
--- a/test/rawmerge/Config.C
+++ b/test/rawmerge/Config.C
@@ -30,7 +30,7 @@
 #include "STRUCT/AliFRAMEv2.h"
 #include "STRUCT/AliSHILv3.h"
 #include "STRUCT/AliPIPEv3.h"
-#include "ITS/AliITSv11Hybrid.h"
+#include "ITS/AliITSv11.h"
 #include "TPC/AliTPCv2.h"
 #include "TOF/AliTOFv6T0.h"
 #include "HMPID/AliHMPIDv3.h"
@@ -379,7 +379,7 @@ void Config()
     {
         //=================== ITS parameters ============================
 
-       AliITS *ITS  = new AliITSv11Hybrid("ITS","ITS v11Hybrid");
+       AliITS *ITS  = new AliITSv11("ITS","ITS v11");
     }
 
     if (iTPC)