From 3a5fcc75ca21520fe4f0b00f33764ef07ef3aab5 Mon Sep 17 00:00:00 2001 From: hristov Date: Mon, 5 Dec 2011 08:39:03 +0000 Subject: [PATCH] Changes for #89427: Porting modification for material budget issues to the Release: replacing obsolete geometry AliITSv11Hybrid --- FMD/Config.C | 2 +- HMPID/Hconfig.C | 2 +- MUON/Config.C | 6 +++--- MUON/commonConfig.C | 2 +- TFluka/macro/FlukaConfig.C | 4 ++-- TPC/testMC/ConfigCosmic.C | 4 ++-- TPC/testMC/ConfigCosmic0Field.C | 4 ++-- TPC/testMC/ConfigCosmicBox.C | 4 ++-- TPC/testMC/ConfigCosmicField05.C | 4 ++-- TPC/testMC/ConfigHPT.C | 4 ++-- TPC/testMC/ConfigPP.C | 4 ++-- macros/Config.C | 4 ++-- macros/ConfigBeautyPPR.C | 4 ++-- macros/ConfigCharmPPR.C | 4 ++-- macros/ConfigHBT.C | 4 ++-- macros/ConfigPPR.C | 4 ++-- macros/ConfigRaw2010.C | 4 ++-- macros/ConfigRaw2011.C | 4 ++-- macros/Config_AliGenCosmicsParam.C | 4 ++-- macros/Config_PDC06.C | 4 ++-- macros/Config_PDC06_MUON.C | 2 +- macros/Config_PDC07_MBias_MUON.C | 2 +- macros/Config_PythiaHeavyFlavours.C | 4 ++-- macros/g4ConfigCommon.C | 2 +- macros/g4ConfigCommon1.C | 2 +- test/PbPbbench/Config.C | 4 ++-- test/QA/Config.C | 2 +- test/embedding/Config.C | 4 ++-- test/gun/Config.C | 4 ++-- test/pileup/Config.C | 4 ++-- test/ppbench/Config.C | 4 ++-- test/pploadlibs/Config.C | 4 ++-- test/rawmerge/Config.C | 4 ++-- 33 files changed, 59 insertions(+), 59 deletions(-) diff --git a/FMD/Config.C b/FMD/Config.C index 9cf8b0a3b86..f61f53e45d0 100644 --- 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 8907a700bfc..510b059f3de 100644 --- 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 5abda7c44de..56c609b18b6 100644 --- 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 4fd03fc7e06..62b1b8ec07a 100644 --- 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 ab173727a33..33294a5787d 100644 --- 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 faa25ec1750..48e98068687 100644 --- 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 fa6c8154cba..71d2b5c649e 100644 --- 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 6ddd22491d1..3dcbddd86ae 100644 --- 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 b1e7aec208d..c53e8a12ba3 100644 --- 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 64f8b142332..fc8afe600f4 100644 --- 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 7741252525a..4e51353c036 100644 --- 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 278a26a4882..cd78bceeebb 100644 --- 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 f29b0095eb5..a765a8b2d29 100644 --- 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 75666257d73..5f11eed72ef 100644 --- 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 dabc206b3da..f026337b8a8 100644 --- 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 8bb9b015301..6babd08e355 100644 --- 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 0922bc4d42f..f83f2c60050 100644 --- 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 12799a51ff3..7d3dc2fd17f 100644 --- 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 eb7da3ec89d..5deab168c4e 100644 --- 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 3caf5627ad5..9e17d319a5c 100644 --- 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 1ad6754f68f..080f57875e1 100644 --- 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 f1eaee8b1f6..f7d5e80be18 100644 --- 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 a34e0a91c98..b6b25683a18 100644 --- 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 723e2e52297..69b56a48f6a 100644 --- 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 ff9c9bc332c..ac76e79d9ae 100644 --- 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 915e2af7337..053130d1558 100644 --- 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 b91b989d417..444576fac90 100644 --- 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 52474dd315e..145f9bcac92 100644 --- 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 38ef677c2ee..9485ce48992 100644 --- 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 0054e0f33a1..c0707f1cf65 100644 --- 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 a7e11613091..f42008794a5 100644 --- 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 dee328fdb1c..69f0d8d204d 100644 --- 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 f81845bb24a..ec15d65d03c 100644 --- 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) -- 2.43.0