This is a backward incompatible change in AliRoot. The following methods have been...

-   const char*   AliRun:: GetTriggerDescriptor() const {return fTriggerDescriptor.Data();}
-   void                AliRun::SetTriggerDescriptor(const char *name) {fTriggerDescriptor = name;}

as their only function was to store temporarily the beam type in AliRun to be transferred to AliSimulation. This information is used for the trigger configuration. Instead, we have introduced the two methods

+  void                   AliSimulation::SetTriggerConfig(TString conf) {fTriggerConfig=conf;}
+  const Char_t*  AliSimulation::GetTriggerConfig() const {return fTriggerConfig.Data();}

To store and get directly this info from the AliSimulation class. This change is completely transparent, however what is NOT transparent is the setting of the beam type which is done in the Config.C. Typically the change is the following

-    gAlice->SetTriggerDescriptor("Pb-Pb");
+    AliSimulation::Instance()->SetTriggerConfig("Pb-Pb");

All the macros in AliRoot have been changed, but also all private macros will have to be changed. The symptom will be very easy to detect, as CINT will complain that there is no method SetTriggerConfig in AliRun.

One subtle point here is that with this change Config.C will require the presence of AliSimulation. If it is not there, it will be created by the Instance() call. This is not a problem in normal usage, but if Config.C is not used for simulation, it will create an instance of AliSimulation, that will not be used. Again, this should not be a problem, but users might as well be aware o fit.

diff --git a/ACORDE/macros/Config.C b/ACORDE/macros/Config.C
index f30d86ec3cf97ae86758d3a2f7b4de6b175af8ff..40ec975f057b30aba330345170bebbd7ced5bb80 100644 (file)
--- a/ACORDE/macros/Config.C
+++ b/ACORDE/macros/Config.C
@@ -108,7 +108,7 @@ void Config()
   gAlice->SetRunLoader(rl);
   
   // Set the trigger configuration
-  gAlice->SetTriggerDescriptor(TrigConfName[trig]);
+  AliSimulation::Instance()->SetTriggerConfig(TrigConfName[trig]);
   cout<<"Trigger configuration is set to  "<<TrigConfName[trig]<<endl;
   //
   //=======================================================================

diff --git a/BCM/Config_BCM.C b/BCM/Config_BCM.C
index 952273a4be1448d6f80f80ebe903a2505443ed7c..1b200954c03ad4547a809255341d45753d5cf7fb 100644 (file)
--- a/BCM/Config_BCM.C
+++ b/BCM/Config_BCM.C
@@ -87,7 +87,7 @@ void Config()
     man->SetDefaultStorage("local://$(ALICE_ROOT)/");
 
     // Set the trigger configuration
-    gAlice->SetTriggerDescriptor("Pb-Pb");
+    AliSimulation::Instance()->SetTriggerConfig("Pb-Pb");
     cout<<"Trigger configuration is set to  Pb-Pb"<<endl;
 
     //

diff --git a/EMCAL/macros/Config.C b/EMCAL/macros/Config.C
index 2d5d9e20887fcc46aa2e230501e048082af1bf8e..7e4be8bde66845e87f0f0a26680adb6630355cf1 100755 (executable)
--- a/EMCAL/macros/Config.C
+++ b/EMCAL/macros/Config.C
@@ -83,7 +83,7 @@ void Config()
     gAlice->SetRunLoader(rl);
 
     // Set the trigger configuration
-    gAlice->SetTriggerDescriptor("Pb-Pb");
+    AliSimulation::Instance()->SetTriggerConfig("Pb-Pb");
     cout<<"Trigger configuration is set to  Pb-Pb"<<endl;
 
     //

diff --git a/FMD/scripts/pdc06_config.C b/FMD/scripts/pdc06_config.C
index bfc624c3ebe56d988c5a32252afcbaa05b5a8e51..d8babff6c2d45c82a851264119034f5585b9ba0f 100644 (file)
--- a/FMD/scripts/pdc06_config.C
+++ b/FMD/scripts/pdc06_config.C
@@ -198,7 +198,7 @@ void Config()
   gAlice->SetRunNumber(runNumber);
   
   // Set the trigger configuration
-  gAlice->SetTriggerDescriptor(TrigConfName[trig]);
+  AliSimulation::Instance()->SetTriggerConfig(TrigConfName[trig]);
   cout<<"Trigger configuration is set to  "<<TrigConfName[trig]<<endl;
 
   //

diff --git a/GRP/UpdateCDBGRPEntryMC.C b/GRP/UpdateCDBGRPEntryMC.C
index 4416ca34db4375868f3ea69ec1fd6126403f8971..8c6cd25244b01f479ff8bde0331519a3b5687306 100644 (file)
--- a/GRP/UpdateCDBGRPEntryMC.C
+++ b/GRP/UpdateCDBGRPEntryMC.C
@@ -40,7 +40,7 @@ TString ParseConfig(char * option)
        if (soption.Contains("system") || soption.Contains("fAliceBeamType")){
                while (getline(in, line)) { 
                        sline = line ;          
-                       if (sline.Contains("gAlice->SetTriggerDescriptor")) 
+                       if (sline.Contains("AliSimulation::Instance()->SetTriggerConfig")) 
                                break ;
                }
                TString sarg1 = sline(sline.Index("[")+1, sline.Index("]") - sline.Index("[")-1) ; 

diff --git a/STEER/AliRun.cxx b/STEER/AliRun.cxx
index bc0ce65b44b6c686175b17a49073ecadaec13002..bd38e1ac27fd1faadb33c22aea8838033d78a3f1 100644 (file)
--- a/STEER/AliRun.cxx
+++ b/STEER/AliRun.cxx
@@ -73,7 +73,6 @@ AliRun::AliRun():
   fConfigFunction(""),
   fRandom(0),
   fBaseFileName(""),
-  fTriggerDescriptor(""),
   fRunLoader(0x0)
 {
   //
@@ -94,7 +93,6 @@ AliRun::AliRun(const char *name, const char *title):
   fConfigFunction("Config();"),
   fRandom(new TRandom3()),
   fBaseFileName(""),
-  fTriggerDescriptor(""),
   fRunLoader(0x0)
 {
   //
@@ -118,7 +116,6 @@ AliRun::AliRun(const char *name, const char *title):
   
 }
 
-
 //_______________________________________________________________________
 AliRun::~AliRun()
 {
@@ -148,9 +145,7 @@ AliRun::~AliRun()
   
 }
 
-
 //_____________________________________________________________________________
-
 void AliRun::InitLoaders()
 {
   //creates list of getters
@@ -285,7 +280,6 @@ void AliRun::Hits2Digits(const char *selected)
 
 
 //_______________________________________________________________________
-
 void AliRun::Tree2Tree(Option_t *option, const char *selected)
 {
   //
@@ -373,8 +367,8 @@ void AliRun::Streamer(TBuffer &R__b)
     AliRun::Class()->WriteBuffer(R__b, this);
   }
 }
-//_______________________________________________________________________
 
+//_______________________________________________________________________
 void AliRun::SetGenEventHeader(AliGenEventHeader* header)
 {
   AliRunLoader::Instance()->GetHeader()->SetGenEventHeader(header);
@@ -382,7 +376,6 @@ void AliRun::SetGenEventHeader(AliGenEventHeader* header)
 
 
 //_______________________________________________________________________
-
 Int_t AliRun::GetEvNumber() const
 { 
 //Returns number of current event  
@@ -394,8 +387,8 @@ Int_t AliRun::GetEvNumber() const
 
   return fRunLoader->GetEventNumber();
 }
-//_______________________________________________________________________
 
+//_______________________________________________________________________
 void AliRun::SetRunLoader(AliRunLoader* rloader)
 {
   //
@@ -445,6 +438,7 @@ void AliRun::SetRunLoader(AliRunLoader* rloader)
    }
 }
 
+//_______________________________________________________________________
 void AliRun::AddModule(AliModule* mod)
 {
   //

diff --git a/STEER/AliRun.h b/STEER/AliRun.h
index ec347db42f195d5d998d1b11582750318d36ebe8..d4885a45a426fae1ff74b5f4a51c5e6bc073e58b 100644 (file)
--- a/STEER/AliRun.h
+++ b/STEER/AliRun.h
@@ -56,8 +56,6 @@ public:
    virtual  void  SDigits2Digits(const char *detector=0) {Tree2Tree("D",detector);}
    virtual  void  Digits2Reco(const char *detector=0)    {Tree2Tree("R",detector);}
    Bool_t         IsFolder() const {return kTRUE;}
-   const char*    GetTriggerDescriptor() const {return fTriggerDescriptor.Data();}
-   void           SetTriggerDescriptor(const char *name) {fTriggerDescriptor = name;}
    virtual  void  SetBaseFile(const char *filename="galice.root");
    //
    // End of MC Application
@@ -77,13 +75,12 @@ protected:
   TString        fConfigFunction;    //  Configuration file to be executed
   TRandom       *fRandom;            //  Pointer to the random number generator
   TString        fBaseFileName;      //  Name of the base root file
-  TString        fTriggerDescriptor; //  Trigger descriptor identifier
-  AliRunLoader  *fRunLoader;         //!run getter - written as a separate object
+  AliRunLoader  *fRunLoader;         //! run getter - written as a separate object
 private:
   AliRun(const AliRun&); // Not implemented
   AliRun& operator = (const AliRun&); // Not implemented
 
-  ClassDef(AliRun,13)      //Supervisor class for all Alice detectors
+  ClassDef(AliRun,14)      //Supervisor class for all Alice detectors
 };
  
 R__EXTERN  AliRun *gAlice;

diff --git a/STEER/AliSimulation.cxx b/STEER/AliSimulation.cxx
index 0cb4e3806da0444262128df2c802f1bdeea49148..0bb13bcbcff28ae85d1f9e48fd437e20c6da8f85 100644 (file)
--- a/STEER/AliSimulation.cxx
+++ b/STEER/AliSimulation.cxx
@@ -166,7 +166,7 @@ AliSimulation::AliSimulation(const char* configFileName,
   fLoadAlObjsListOfDets("ALL"),
   fMakeSDigits("ALL"),
   fMakeDigits("ALL"),
-  fMakeTrigger(""),
+  fTriggerConfig(""),
   fMakeDigitsFromHits(""),
   fWriteRawData(""),
   fRawDataFileName(""),
@@ -708,7 +708,7 @@ Bool_t AliSimulation::Run(Int_t nEvents)
   
   
   // digits -> trigger
-  if (!RunTrigger(fMakeTrigger,fMakeDigits)) {
+  if (!RunTrigger(fTriggerConfig,fMakeDigits)) {
     if (fStopOnError) return kFALSE;
   }
 
@@ -914,8 +914,8 @@ Bool_t AliSimulation::RunTrigger(const char* config, const char* detectors)
    TString trconfiguration = config;
 
    if (trconfiguration.IsNull()) {
-     if (strcmp(gAlice->GetTriggerDescriptor(),"")) {
-       trconfiguration = gAlice->GetTriggerDescriptor();
+     if(!fTriggerConfig.IsNull()) {
+       trconfiguration = fTriggerConfig;
      }
      else
        AliWarning("No trigger descriptor is specified. Loading the one that is in the CDB.");
@@ -1021,15 +1021,6 @@ Bool_t AliSimulation::RunSimulation(Int_t nEvents)
    AliSysInfo::AddStamp("RunSimulation_InitLoaders");
   //___________________________________________________________________________________________
   
-  // Get the trigger descriptor string
-  // Either from AliSimulation or from
-  // gAlice
-  if (fMakeTrigger.IsNull()) {
-    if (strcmp(gAlice->GetTriggerDescriptor(),""))
-      fMakeTrigger = gAlice->GetTriggerDescriptor();
-  }
-  else
-    gAlice->SetTriggerDescriptor(fMakeTrigger.Data());
   AliSysInfo::AddStamp("RunSimulation_TriggerDescriptor");
 
   // Set run number in CDBManager
@@ -2266,7 +2257,7 @@ void AliSimulation::WriteGRPEntry()
     }
   }
   // CTP
-  if (!fMakeTrigger.IsNull() || strcmp(gAlice->GetTriggerDescriptor(),""))
+  if (!fTriggerConfig.IsNull())
     detectorPattern |= (1 << AliDAQ::DetectorID("TRG"));
 
   // HLT

diff --git a/STEER/AliSimulation.h b/STEER/AliSimulation.h
index 1e2ae8497925f78eea09ded2eeb99a6f5d5dbfdc..a53d2fa16f0444f0504c4e27e3f07b93547cb1f9 100644 (file)
--- a/STEER/AliSimulation.h
+++ b/STEER/AliSimulation.h
@@ -55,8 +55,6 @@ public:
   void           SetRegionOfInterest(Bool_t flag) {fRegionOfInterest = flag;};
   void           SetMakeDigits(const char* detectors)
                    {fMakeDigits = detectors;};
-  void           SetMakeTrigger(const char* descriptors)
-                   {fMakeTrigger = descriptors;};
   void           SetMakeDigitsFromHits(const char* detectors)
                    {fMakeDigitsFromHits = detectors;};
   void           SetWriteRawData(const char* detectors, 
@@ -66,6 +64,8 @@ public:
                   fDeleteIntermediateFiles = deleteIntermediateFiles;};
   void           SetWriteSelRawData(Bool_t sel = kTRUE)
                    {fWriteSelRawData = sel;}
+  void           SetTriggerConfig(TString conf) {fTriggerConfig=conf;}
+  const Char_t*  GetTriggerConfig() const {return fTriggerConfig.Data();}
   void           SetAlignObjArray(TObjArray *array)
                    {fAlignObjArray = array;
                   fLoadAlignFromCDB = kFALSE;}
@@ -153,7 +153,7 @@ private:
   TString        fLoadAlObjsListOfDets;   // Load alignment data from CDB for these detectors
   TString        fMakeSDigits;        // create sdigits for these detectors
   TString        fMakeDigits;         // create digits for these detectors
-  TString        fMakeTrigger;        // run trigger for these descriptors
+  TString        fTriggerConfig;      // run trigger for these descriptors
   TString        fMakeDigitsFromHits; // create digits from hits for these detectors
   TString        fWriteRawData;       // write raw data for these detectors
   TString        fRawDataFileName;    // file name for the raw data file

diff --git a/TFluka/macro/FlukaConfig.C b/TFluka/macro/FlukaConfig.C
index a52ab448b5b3866d8ce75cc3811b49bc3ef193f0..2c6c11e0dde9ce0e306fb45a98f24006f53ee2ac 100644 (file)
--- a/TFluka/macro/FlukaConfig.C
+++ b/TFluka/macro/FlukaConfig.C
@@ -121,7 +121,7 @@ void Config()
     // Uncomment if you want to load geometry from OCDB!   <<<<
 
     // Set the trigger configuration
-    gAlice->SetTriggerDescriptor("Pb-Pb");
+    AliSimulation::Instance()->SetTriggerConfig("Pb-Pb");
     cout<<"Trigger configuration is set to  Pb-Pb"<<endl;
 
     //

diff --git a/TPC/ConfigKr.C b/TPC/ConfigKr.C
index 337f146b06ac5e6594318900618b157b486fb60c..dda1da48af1dc21fbcc6613348ebfbe8d0625959 100644 (file)
--- a/TPC/ConfigKr.C
+++ b/TPC/ConfigKr.C
@@ -77,7 +77,7 @@ void Config()
     gAlice->SetRunLoader(rl);
 
     // Set the trigger configuration
-    gAlice->SetTriggerDescriptor("Pb-Pb");
+    AliSimulation::Instance()->SetTriggerConfig("Pb-Pb");
     cout<<"Trigger configuration is set to  Pb-Pb"<<endl;
 
     //

diff --git a/TPC/testMC/ConfigCosmic.C b/TPC/testMC/ConfigCosmic.C
index 8767d2e87a82abca9988a537d50e3e87b4058748..faa25ec1750d8ac435eeae477eb55389479fe2ed 100644 (file)
--- a/TPC/testMC/ConfigCosmic.C
+++ b/TPC/testMC/ConfigCosmic.C
@@ -178,7 +178,7 @@ void Config()
     gAlice->SetRunLoader(rl);
 
     // Set the trigger configuration
-    gAlice->SetTriggerDescriptor(pprTrigConfName[strig]);
+    AliSimulation::Instance()->SetTriggerConfig(pprTrigConfName[strig]);
     cout<<"Trigger configuration is set to  "<<pprTrigConfName[strig]<<endl;
 
     //

diff --git a/TPC/testMC/ConfigCosmic0Field.C b/TPC/testMC/ConfigCosmic0Field.C
index 70bc42d4412e9a50d15ba70b4327c8f27e2ecccd..fa6c8154cba2126c026359b983703a8e53a2d3b0 100644 (file)
--- a/TPC/testMC/ConfigCosmic0Field.C
+++ b/TPC/testMC/ConfigCosmic0Field.C
@@ -113,7 +113,7 @@ void Config()
     // Uncomment if you want to load geometry from OCDB!   <<<<
 
     // Set the trigger configuration
-    gAlice->SetTriggerDescriptor("Pb-Pb");
+    AliSimulation::Instance()->SetTriggerConfig("Pb-Pb");
     cout<<"Trigger configuration is set to  Pb-Pb"<<endl;
 
     //

diff --git a/TPC/testMC/ConfigCosmicBox.C b/TPC/testMC/ConfigCosmicBox.C
index 6778144f26d08debd2982510f575bba5b1a8e0d9..6ddd22491d144140409181f58167df303e040a09 100644 (file)
--- a/TPC/testMC/ConfigCosmicBox.C
+++ b/TPC/testMC/ConfigCosmicBox.C
@@ -178,7 +178,7 @@ void Config()
     gAlice->SetRunLoader(rl);
 
     // Set the trigger configuration
-    gAlice->SetTriggerDescriptor(pprTrigConfName[strig]);
+    AliSimulation::Instance()->SetTriggerConfig(pprTrigConfName[strig]);
     cout<<"Trigger configuration is set to  "<<pprTrigConfName[strig]<<endl;
 
     //

diff --git a/TPC/testMC/ConfigCosmicField05.C b/TPC/testMC/ConfigCosmicField05.C
index 009878d31c131779fdf0b73c16228e438a2b3a3d..b1e7aec208da4b9437e9b1b585cab256c3105c4b 100644 (file)
--- a/TPC/testMC/ConfigCosmicField05.C
+++ b/TPC/testMC/ConfigCosmicField05.C
@@ -113,7 +113,7 @@ void Config()
     // Uncomment if you want to load geometry from OCDB!   <<<<
 
     // Set the trigger configuration
-    gAlice->SetTriggerDescriptor("Pb-Pb");
+    AliSimulation::Instance()->SetTriggerConfig("Pb-Pb");
     cout<<"Trigger configuration is set to  Pb-Pb"<<endl;
 
     //

diff --git a/TPC/testMC/ConfigHM.C b/TPC/testMC/ConfigHM.C
index 0f3a196310e00486b808bbf8b8eeb3f28787e0e9..7b40c91aaf609bd302695861c2462822d47ebf85 100644 (file)
--- a/TPC/testMC/ConfigHM.C
+++ b/TPC/testMC/ConfigHM.C
@@ -84,7 +84,7 @@ void Config()
     // gAlice->SetGeometryFromCDB();
 
     // Set the trigger configuration
-    gAlice->SetTriggerDescriptor("Pb-Pb");
+    AliSimulation::Instance()->SetTriggerConfig("Pb-Pb");
     cout<<"Trigger configuration is set to  Pb-Pb"<<endl;
 
     //

diff --git a/TPC/testMC/ConfigHPT.C b/TPC/testMC/ConfigHPT.C
index c16209a9ce7e7494c1b7f7f6cf549f577b3bd83b..64f8b14233211b967c076abb820f7acbba319350 100644 (file)
--- a/TPC/testMC/ConfigHPT.C
+++ b/TPC/testMC/ConfigHPT.C
@@ -181,7 +181,7 @@ void Config()
     gAlice->SetRunLoader(rl);
 
     // Set the trigger configuration
-    gAlice->SetTriggerDescriptor(pprTrigConfName[strig]);
+    AliSimulation::Instance()->SetTriggerConfig(pprTrigConfName[strig]);
     cout<<"Trigger configuration is set to  "<<pprTrigConfName[strig]<<endl;
 
     //

diff --git a/TPC/testMC/ConfigHPT1.C b/TPC/testMC/ConfigHPT1.C
index 2d4c241b8496c6939c90ef4781c87b6476980365..58015f02ea43dceb7e89dee280f43e13cddc3171 100644 (file)
--- a/TPC/testMC/ConfigHPT1.C
+++ b/TPC/testMC/ConfigHPT1.C
@@ -84,7 +84,7 @@ void Config()
     // gAlice->SetGeometryFromCDB();
 
     // Set the trigger configuration
-    gAlice->SetTriggerDescriptor("Pb-Pb");
+    AliSimulation::Instance()->SetTriggerConfig("Pb-Pb");
     cout<<"Trigger configuration is set to  Pb-Pb"<<endl;
 
     //

diff --git a/TPC/testMC/ConfigLM.C b/TPC/testMC/ConfigLM.C
index 8a8aa6321b80f7c18a37346856289ba150033302..a52ae1b57331cdb6c0acc225f6c89f125dc6f567 100644 (file)
--- a/TPC/testMC/ConfigLM.C
+++ b/TPC/testMC/ConfigLM.C
@@ -84,7 +84,7 @@ void Config()
     // gAlice->SetGeometryFromCDB();
 
     // Set the trigger configuration
-    gAlice->SetTriggerDescriptor("Pb-Pb");
+    AliSimulation::Instance()->SetTriggerConfig("Pb-Pb");
     cout<<"Trigger configuration is set to  Pb-Pb"<<endl;
 
     //

diff --git a/TPC/testMC/ConfigPP.C b/TPC/testMC/ConfigPP.C
index a5a6a112c3cd58ab55a941f8ef0d8c9594bb7d8e..7741252525a436f7dc24550ae20b7af1cc41a8d9 100644 (file)
--- a/TPC/testMC/ConfigPP.C
+++ b/TPC/testMC/ConfigPP.C
@@ -176,7 +176,7 @@ void Config()
     gAlice->SetRunLoader(rl);
 
     // Set the trigger configuration
-    gAlice->SetTriggerDescriptor(pprTrigConfName[strig]);
+    AliSimulation::Instance()->SetTriggerConfig(pprTrigConfName[strig]);
     cout<<"Trigger configuration is set to  "<<pprTrigConfName[strig]<<endl;
 
     //

diff --git a/TPC/testMC/Config_AliGenCosmicsParam.C b/TPC/testMC/Config_AliGenCosmicsParam.C
index 9dc634606b20729e4d51c925acf78c70cefe5909..e5a15a59a70f5ad6abd1ee0141c032ead660cc6f 100644 (file)
--- a/TPC/testMC/Config_AliGenCosmicsParam.C
+++ b/TPC/testMC/Config_AliGenCosmicsParam.C
@@ -108,8 +108,8 @@ void Config()
     // gAlice->SetGeometryFromCDB();
 
     // Set the trigger configuration
-    //    gAlice->SetTriggerDescriptor("Pb-Pb");
-    gAlice->SetTriggerDescriptor("ACORDE");
+    //    AliSimulation::Instance()->SetTriggerConfig("Pb-Pb");
+    AliSimulation::Instance()->SetTriggerConfig("ACORDE");
     cout<<"Trigger configuration is set to  ACORDE"<<endl;
 
     //

diff --git a/macros/Config.C b/macros/Config.C
index d46001d7d05e36dfce3b5a7798f41414b5109ac8..295ecb38995e951477fd35238ff0c62df2e4ac1e 100644 (file)
--- a/macros/Config.C
+++ b/macros/Config.C
@@ -111,7 +111,7 @@ void Config()
     // Uncomment if you want to load geometry from OCDB!   <<<<
 
     // Set the trigger configuration
-    gAlice->SetTriggerDescriptor("Pb-Pb");
+    AliSimulation::Instance()->SetTriggerConfig("Pb-Pb");
     cout<<"Trigger configuration is set to  Pb-Pb"<<endl;
 
     //

diff --git a/macros/ConfigBeautyPPR.C b/macros/ConfigBeautyPPR.C
index 18638a727f66b46fcbc3c3b3f02ae365a1c81411..f29b0095eb56e27bcbd97aaba6cf5420e9f3b9de 100644 (file)
--- a/macros/ConfigBeautyPPR.C
+++ b/macros/ConfigBeautyPPR.C
@@ -83,7 +83,7 @@ void Config()
   // gAlice->SetGeometryFromCDB();
 
   // Set the trigger configuration
-  gAlice->SetTriggerDescriptor("Pb-Pb");
+  AliSimulation::Instance()->SetTriggerConfig("Pb-Pb");
   cout<<"Trigger configuration is set to  Pb-Pb"<<endl;
 
   //

diff --git a/macros/ConfigCharmPPR.C b/macros/ConfigCharmPPR.C
index cf44e9eb97932c1b8155b18029691c91a183ae06..75666257d73beff87d650b2f6b35ecab6a29f09c 100644 (file)
--- a/macros/ConfigCharmPPR.C
+++ b/macros/ConfigCharmPPR.C
@@ -83,7 +83,7 @@ void Config()
   // gAlice->SetGeometryFromCDB();
 
   // Set the trigger configuration
-  gAlice->SetTriggerDescriptor("Pb-Pb");
+  AliSimulation::Instance()->SetTriggerConfig("Pb-Pb");
   cout<<"Trigger configuration is set to  Pb-Pb"<<endl;
 
   //

diff --git a/macros/ConfigHBT.C b/macros/ConfigHBT.C
index 66d9dab69e1da8e9ef304558edeb780d1fbf8a0f..dabc206b3da51be9aed2680f2a3b68226208ff76 100644 (file)
--- a/macros/ConfigHBT.C
+++ b/macros/ConfigHBT.C
@@ -75,7 +75,7 @@ void Config()
     // gAlice->SetGeometryFromCDB();
 
     // Set the trigger configuration
-    gAlice->SetTriggerDescriptor("Pb-Pb");
+    AliSimulation::Instance()->SetTriggerConfig("Pb-Pb");
     cout<<"Trigger configuration is set to  Pb-Pb"<<endl;
 
     //

diff --git a/macros/ConfigPPR.C b/macros/ConfigPPR.C
index cd7489992f5634d95bb289da43191a3888f97132..8bb9b01530138b501210b9a43508a0a0c62c2ecf 100644 (file)
--- a/macros/ConfigPPR.C
+++ b/macros/ConfigPPR.C
@@ -180,7 +180,7 @@ void Config()
     // gAlice->SetGeometryFromCDB();
 
     // Set the trigger configuration
-    gAlice->SetTriggerDescriptor(pprTrigConfName[strig]);
+    AliSimulation::Instance()->SetTriggerConfig(pprTrigConfName[strig]);
     cout<<"Trigger configuration is set to  "<<pprTrigConfName[strig]<<endl;
 
     //

diff --git a/macros/Config_AliGenCosmicsParam.C b/macros/Config_AliGenCosmicsParam.C
index d4f8b633aa66353b2d9572262fe3c6bd9ab91a4d..eb7da3ec89d2f06400b880c4f51b80dbd987e197 100644 (file)
--- a/macros/Config_AliGenCosmicsParam.C
+++ b/macros/Config_AliGenCosmicsParam.C
@@ -100,8 +100,8 @@ void Config()
     // gAlice->SetGeometryFromCDB();
 
     // Set the trigger configuration
-    //    gAlice->SetTriggerDescriptor("Pb-Pb");
-    gAlice->SetTriggerDescriptor("ACORDE");
+    //    AliSimulation::Instance()->SetTriggerConfig("Pb-Pb");
+    AliSimulation::Instance()->SetTriggerConfig("ACORDE");
     cout<<"Trigger configuration is set to  ACORDE"<<endl;
 
     //

diff --git a/macros/Config_PDC06.C b/macros/Config_PDC06.C
index 2df07db774451e357ffb25ba849d39113547effa..3caf5627ad56e63e4a214bf6b0a9e927a618ba1d 100644 (file)
--- a/macros/Config_PDC06.C
+++ b/macros/Config_PDC06.C
@@ -188,7 +188,7 @@ void Config()
   // gAlice->SetGeometryFromCDB();
   
   // Set the trigger configuration
-  gAlice->SetTriggerDescriptor(TrigConfName[trig]);
+  AliSimulation::Instance()->SetTriggerConfig(TrigConfName[trig]);
   cout<<"Trigger configuration is set to  "<<TrigConfName[trig]<<endl;
 
   //

diff --git a/macros/Config_PDC06_MUON.C b/macros/Config_PDC06_MUON.C
index 1bf00c724e09bfb7428eced10c0e7dc0b0f7d94e..1ad6754f68f115730efb8af5d6edbbb6b58607c1 100644 (file)
--- a/macros/Config_PDC06_MUON.C
+++ b/macros/Config_PDC06_MUON.C
@@ -45,7 +45,7 @@ void Config(char directory[100]="", char option[6]="trg1mu")
   
   //=======================================================================
   // Set the trigger configuration
-  gAlice->SetTriggerDescriptor("p-p");
+  AliSimulation::Instance()->SetTriggerConfig("p-p");
   cout<<"Trigger configuration is set to  p-p"<<endl;
 
   //=======================================================================

diff --git a/macros/Config_PDC07_MBias_MUON.C b/macros/Config_PDC07_MBias_MUON.C
index 2142784b2d598726f9b2aeba6f57c54573c2c421..f1eaee8b1f6b40d087fff2776e7cd1ea014cc542 100644 (file)
--- a/macros/Config_PDC07_MBias_MUON.C
+++ b/macros/Config_PDC07_MBias_MUON.C
@@ -46,7 +46,7 @@ void Config(char directory[100]="", char option[6]="trgAll")
   //=======================================================================
   // Set the trigger configuration - not needed here for MUON in
   // stand-alone mode
-  // gAlice->SetTriggerDescriptor("p-p");
+  // AliSimulation::Instance()->SetTriggerConfig("p-p");
   // cout<<"Trigger configuration is set to  p-p"<<endl;
 
   //=======================================================================

diff --git a/macros/Config_PythiaHeavyFlavours.C b/macros/Config_PythiaHeavyFlavours.C
index 50996aa017c9499d0098e21668358cdfb31c5c8e..a34e0a91c98acccd6c2a43960594247508624902 100644 (file)
--- a/macros/Config_PythiaHeavyFlavours.C
+++ b/macros/Config_PythiaHeavyFlavours.C
@@ -170,7 +170,7 @@ void Config()
   // gAlice->SetGeometryFromCDB();
 
   // Set the trigger configuration
-  gAlice->SetTriggerDescriptor(TrigConfName[trig]);
+  AliSimulation::Instance()->SetTriggerConfig(TrigConfName[trig]);
   cout<<"Trigger configuration is set to  "<<TrigConfName[trig]<<endl;
 
   //

diff --git a/macros/g4ConfigCommon.C b/macros/g4ConfigCommon.C
index 8be698fc6420b441b34cf89fde64300af13436aa..723e2e522975405eb8ca9b9e193e65c38da2f690 100644 (file)
--- a/macros/g4ConfigCommon.C
+++ b/macros/g4ConfigCommon.C
@@ -43,7 +43,7 @@ void ConfigCommon(Bool_t setRootGeometry = kTRUE)
   }
 
   // Set the trigger configuration
-  gAlice->SetTriggerDescriptor("Pb-Pb");
+  AliSimulation::Instance()->SetTriggerConfig("Pb-Pb");
   cout<<"Trigger configuration is set to  Pb-Pb"<<endl;
 
     // Set Random Number seed

diff --git a/macros/g4ConfigCommon1.C b/macros/g4ConfigCommon1.C
index 77498ef762885e46ca6b43b37d8ee4d6c139678c..ff9c9bc332c417b67e1f7d0312ef6ea1a95e583f 100644 (file)
--- a/macros/g4ConfigCommon1.C
+++ b/macros/g4ConfigCommon1.C
@@ -50,7 +50,7 @@ void ConfigCommon1(Bool_t setRootGeometry = kTRUE)
   // Trigger configuration
   //=======================================================================
 
-  gAlice->SetTriggerDescriptor("Pb-Pb");
+  AliSimulation::Instance()->SetTriggerConfig("Pb-Pb");
   cout<<"Trigger configuration is set to  Pb-Pb"<<endl;
 
   // ============================= 

diff --git a/prod/LHC08d10/Config.C b/prod/LHC08d10/Config.C
index 6856e783fd6137d23abe5c7f075fc527f8b7d9fd..3a684dfe602809b8c8c208bcb6ab2e6ab04ed0af 100644 (file)
--- a/prod/LHC08d10/Config.C
+++ b/prod/LHC08d10/Config.C
@@ -201,7 +201,7 @@ void Config()
        gAlice->SetRunLoader(rl);
        
        // Set the trigger configuration
-       gAlice->SetTriggerDescriptor(TrigConfName[trig]);
+       AliSimulation::Instance()->SetTriggerConfig(TrigConfName[trig]);
        cout<<"Trigger configuration is set to  "<<TrigConfName[trig]<<endl;
        
        //

diff --git a/prod/LHC08d11/Config.C b/prod/LHC08d11/Config.C
index aa3e8208bdbe591527af9beec49ac8cb84ea5b39..3b760078efe23eb4182a613d5a82ee80d160e9ae 100644 (file)
--- a/prod/LHC08d11/Config.C
+++ b/prod/LHC08d11/Config.C
@@ -201,7 +201,7 @@ void Config()
        gAlice->SetRunLoader(rl);
        
        // Set the trigger configuration
-       gAlice->SetTriggerDescriptor(TrigConfName[trig]);
+       AliSimulation::Instance()->SetTriggerConfig(TrigConfName[trig]);
        cout<<"Trigger configuration is set to  "<<TrigConfName[trig]<<endl;
        
        //

diff --git a/prod/LHC08d12/Config.C b/prod/LHC08d12/Config.C
index 5deb01e0bd32e845fe6997c77998dd028f31515d..036485ae57ce157348ccfdeceba11bc0dca346cc 100644 (file)
--- a/prod/LHC08d12/Config.C
+++ b/prod/LHC08d12/Config.C
@@ -203,7 +203,7 @@ void Config()
        gAlice->SetRunLoader(rl);
        
        // Set the trigger configuration
-       gAlice->SetTriggerDescriptor(TrigConfName[trig]);
+       AliSimulation::Instance()->SetTriggerConfig(TrigConfName[trig]);
        cout<<"Trigger configuration is set to  "<<TrigConfName[trig]<<endl;
        
        //

diff --git a/prod/LHC08d13/Config.C b/prod/LHC08d13/Config.C
index 5deb01e0bd32e845fe6997c77998dd028f31515d..036485ae57ce157348ccfdeceba11bc0dca346cc 100644 (file)
--- a/prod/LHC08d13/Config.C
+++ b/prod/LHC08d13/Config.C
@@ -203,7 +203,7 @@ void Config()
        gAlice->SetRunLoader(rl);
        
        // Set the trigger configuration
-       gAlice->SetTriggerDescriptor(TrigConfName[trig]);
+       AliSimulation::Instance()->SetTriggerConfig(TrigConfName[trig]);
        cout<<"Trigger configuration is set to  "<<TrigConfName[trig]<<endl;
        
        //

diff --git a/prod/LHC08d14/Config.C b/prod/LHC08d14/Config.C
index 5deb01e0bd32e845fe6997c77998dd028f31515d..036485ae57ce157348ccfdeceba11bc0dca346cc 100644 (file)
--- a/prod/LHC08d14/Config.C
+++ b/prod/LHC08d14/Config.C
@@ -203,7 +203,7 @@ void Config()
        gAlice->SetRunLoader(rl);
        
        // Set the trigger configuration
-       gAlice->SetTriggerDescriptor(TrigConfName[trig]);
+       AliSimulation::Instance()->SetTriggerConfig(TrigConfName[trig]);
        cout<<"Trigger configuration is set to  "<<TrigConfName[trig]<<endl;
        
        //

diff --git a/prod/LHC08d15/Config.C b/prod/LHC08d15/Config.C
index 02c84bd17334a5a202c2fad8539f42314bea7c4d..2b430bacbf0a20dec4a4b455b71160a0c3427b7d 100644 (file)
--- a/prod/LHC08d15/Config.C
+++ b/prod/LHC08d15/Config.C
@@ -203,7 +203,7 @@ void Config()
        gAlice->SetRunLoader(rl);
        
        // Set the trigger configuration
-       gAlice->SetTriggerDescriptor(TrigConfName[trig]);
+       AliSimulation::Instance()->SetTriggerConfig(TrigConfName[trig]);
        cout<<"Trigger configuration is set to  "<<TrigConfName[trig]<<endl;
        
        //

diff --git a/prod/LHC08d16/Config.C b/prod/LHC08d16/Config.C
index 4ea969a6d2ca89cd7dcb45a6c3546dc82b0d2a46..3c1a93fb9e270cf59d0ff431cbfad54e95b1bb40 100644 (file)
--- a/prod/LHC08d16/Config.C
+++ b/prod/LHC08d16/Config.C
@@ -203,7 +203,7 @@ void Config()
        gAlice->SetRunLoader(rl);
        
        // Set the trigger configuration
-       gAlice->SetTriggerDescriptor(TrigConfName[trig]);
+       AliSimulation::Instance()->SetTriggerConfig(TrigConfName[trig]);
        cout<<"Trigger configuration is set to  "<<TrigConfName[trig]<<endl;
        
        //

diff --git a/prod/LHC08d17/Config.C b/prod/LHC08d17/Config.C
index 8b4726880bf55c832970da96b2ca8e0fe7d16029..d2845f6dc08448b2a8c09f4a2cc39d127027f32a 100644 (file)
--- a/prod/LHC08d17/Config.C
+++ b/prod/LHC08d17/Config.C
@@ -203,7 +203,7 @@ void Config()
        gAlice->SetRunLoader(rl);
        
        // Set the trigger configuration
-       gAlice->SetTriggerDescriptor(TrigConfName[trig]);
+       AliSimulation::Instance()->SetTriggerConfig(TrigConfName[trig]);
        cout<<"Trigger configuration is set to  "<<TrigConfName[trig]<<endl;
        
        //

diff --git a/prod/LHC08d5/Config.C b/prod/LHC08d5/Config.C
index e8fe48e9a55cc46f81e46a413fbb4c92678fbdbd..edda6f2968f51cb2804f1668273e275af14aa64d 100644 (file)
--- a/prod/LHC08d5/Config.C
+++ b/prod/LHC08d5/Config.C
@@ -208,7 +208,7 @@ void Config()
   gAlice->SetRunLoader(rl);
 
   // Set the trigger configuration
-  gAlice->SetTriggerDescriptor("p-p");
+  AliSimulation::Instance()->SetTriggerConfig("p-p");
   cout<<"Trigger configuration is set to  p-p "<<endl;
 
   //

diff --git a/prod/LHC08d6/Config.C b/prod/LHC08d6/Config.C
index b4aeac9a6ae868a2038f4077ffcfcc5702681f78..1c2b20f5698894f261d9d14cc65ba5bd496e1f8a 100644 (file)
--- a/prod/LHC08d6/Config.C
+++ b/prod/LHC08d6/Config.C
@@ -149,7 +149,7 @@ void Config()
     // Uncomment if you want to load geometry from OCDB!   <<<<
 
     // Set the trigger configuration
-    gAlice->SetTriggerDescriptor(TrigConfName[trig]);
+    AliSimulation::Instance()->SetTriggerConfig(TrigConfName[trig]);
     cout<<"Trigger configuration is set to  "<<TrigConfName[trig]<<endl;
 
 

diff --git a/prod/LHC08d8/Config.C b/prod/LHC08d8/Config.C
index a3c277cb6f83355fb69c1ef66b47b34a0a33605d..c031ac8dabdc26efc9d64732974965098e79187a 100644 (file)
--- a/prod/LHC08d8/Config.C
+++ b/prod/LHC08d8/Config.C
@@ -201,7 +201,7 @@ void Config()
        gAlice->SetRunLoader(rl);
        
        // Set the trigger configuration
-       gAlice->SetTriggerDescriptor(TrigConfName[trig]);
+       AliSimulation::Instance()->SetTriggerConfig(TrigConfName[trig]);
        cout<<"Trigger configuration is set to  "<<TrigConfName[trig]<<endl;
        
        //

diff --git a/prod/LHC08d9/Config.C b/prod/LHC08d9/Config.C
index aa3e8208bdbe591527af9beec49ac8cb84ea5b39..3b760078efe23eb4182a613d5a82ee80d160e9ae 100644 (file)
--- a/prod/LHC08d9/Config.C
+++ b/prod/LHC08d9/Config.C
@@ -201,7 +201,7 @@ void Config()
        gAlice->SetRunLoader(rl);
        
        // Set the trigger configuration
-       gAlice->SetTriggerDescriptor(TrigConfName[trig]);
+       AliSimulation::Instance()->SetTriggerConfig(TrigConfName[trig]);
        cout<<"Trigger configuration is set to  "<<TrigConfName[trig]<<endl;
        
        //

diff --git a/prod/LHC09a1/Config.C b/prod/LHC09a1/Config.C
index f6f036eccb44cafa0b61dbbcace3ecbcbcd022a8..b5e0bd01809e2b97a4ae27610e8f3faabef6d195 100644 (file)
--- a/prod/LHC09a1/Config.C
+++ b/prod/LHC09a1/Config.C
@@ -364,7 +364,7 @@ void Config()
   //gAlice->SetRunNumber(runNumber);\r
   \r
   // Set the trigger configuration\r
-  gAlice->SetTriggerDescriptor(TrigConfName[trig]);\r
+  AliSimulation::Instance()->SetTriggerConfig(TrigConfName[trig]);\r
   cout<<"Trigger configuration is set to  "<<TrigConfName[trig]<<endl;\r
 \r
   //\r

diff --git a/prod/LHC09c1/Config.C b/prod/LHC09c1/Config.C
index 2093b09b09b625fa55b1fb1d0550fb09ab4d261e..88b58f8d08aa21dc22ba037ac71c78ec48737120 100644 (file)
--- a/prod/LHC09c1/Config.C
+++ b/prod/LHC09c1/Config.C
@@ -129,7 +129,7 @@ void Config()
   // gAlice->SetGeometryFromCDB();\r
   \r
   // Set the trigger configuration: proton-proton\r
-  gAlice->SetTriggerDescriptor("p-p");\r
+  AliSimulation::Instance()->SetTriggerConfig("p-p");\r
 \r
   //\r
   //=======================================================================\r

diff --git a/prod/LHC09d1/Config.C b/prod/LHC09d1/Config.C
index effa26e1708fd75659ff35f714a7d9fc181fe95d..359625422e6bc4159b16bfcd83bd3f4456d5cc74 100644 (file)
--- a/prod/LHC09d1/Config.C
+++ b/prod/LHC09d1/Config.C
@@ -134,7 +134,7 @@ void Config()
   // gAlice->SetGeometryFromCDB();
   
   // Set the trigger configuration: proton-proton
-  gAlice->SetTriggerDescriptor("p-p");
+  AliSimulation::Instance()->SetTriggerConfig("p-p");
 
   //
   //=======================================================================

diff --git a/prod/LHC09d2/Config.C b/prod/LHC09d2/Config.C
index 20921a46ac19381a9a55ce201a0c870e67d52564..fd26b388c88471ee6534883c9e720ccfd5750227 100644 (file)
--- a/prod/LHC09d2/Config.C
+++ b/prod/LHC09d2/Config.C
@@ -134,7 +134,7 @@ void Config()
   // gAlice->SetGeometryFromCDB();
   
   // Set the trigger configuration: proton-proton
-  gAlice->SetTriggerDescriptor("p-p");
+  AliSimulation::Instance()->SetTriggerConfig("p-p");
 
   //
   //=======================================================================

diff --git a/prod/LHC09d3/Config.C b/prod/LHC09d3/Config.C
index 20921a46ac19381a9a55ce201a0c870e67d52564..fd26b388c88471ee6534883c9e720ccfd5750227 100644 (file)
--- a/prod/LHC09d3/Config.C
+++ b/prod/LHC09d3/Config.C
@@ -134,7 +134,7 @@ void Config()
   // gAlice->SetGeometryFromCDB();
   
   // Set the trigger configuration: proton-proton
-  gAlice->SetTriggerDescriptor("p-p");
+  AliSimulation::Instance()->SetTriggerConfig("p-p");
 
   //
   //=======================================================================

diff --git a/prod/LHC09d4/Config.C b/prod/LHC09d4/Config.C
index 20921a46ac19381a9a55ce201a0c870e67d52564..fd26b388c88471ee6534883c9e720ccfd5750227 100644 (file)
--- a/prod/LHC09d4/Config.C
+++ b/prod/LHC09d4/Config.C
@@ -134,7 +134,7 @@ void Config()
   // gAlice->SetGeometryFromCDB();
   
   // Set the trigger configuration: proton-proton
-  gAlice->SetTriggerDescriptor("p-p");
+  AliSimulation::Instance()->SetTriggerConfig("p-p");
 
   //
   //=======================================================================

diff --git a/prod/LHC09d5/Config.C b/prod/LHC09d5/Config.C
index b9cf8e85a9b886dc6a0d720a70709d0cf77e67ca..ed77b06ae5bf97fda9db608254526357a3d8211d 100644 (file)
--- a/prod/LHC09d5/Config.C
+++ b/prod/LHC09d5/Config.C
@@ -134,7 +134,7 @@ void Config()
   // gAlice->SetGeometryFromCDB();
   
   // Set the trigger configuration: proton-proton
-  gAlice->SetTriggerDescriptor("p-p");
+  AliSimulation::Instance()->SetTriggerConfig("p-p");
 
   //
   //=======================================================================

diff --git a/prod/LHC09d6/Config.C b/prod/LHC09d6/Config.C
index b9cf8e85a9b886dc6a0d720a70709d0cf77e67ca..ed77b06ae5bf97fda9db608254526357a3d8211d 100644 (file)
--- a/prod/LHC09d6/Config.C
+++ b/prod/LHC09d6/Config.C
@@ -134,7 +134,7 @@ void Config()
   // gAlice->SetGeometryFromCDB();
   
   // Set the trigger configuration: proton-proton
-  gAlice->SetTriggerDescriptor("p-p");
+  AliSimulation::Instance()->SetTriggerConfig("p-p");
 
   //
   //=======================================================================

diff --git a/prod/fpprod/Config.C b/prod/fpprod/Config.C
index 5e69c0869a94a99278e438ea4b90394922bc1754..71c3ae6062f1d998b1ffa460986011ebc12fe970 100644 (file)
--- a/prod/fpprod/Config.C
+++ b/prod/fpprod/Config.C
@@ -134,7 +134,7 @@ void Config()
   // gAlice->SetGeometryFromCDB();
   
   // Set the trigger configuration: proton-proton
-  gAlice->SetTriggerDescriptor("p-p");
+  AliSimulation::Instance()->SetTriggerConfig("p-p");
 
   //
   //=======================================================================

diff --git a/test/PbPbbench/Config.C b/test/PbPbbench/Config.C
index cba6ab0512c7e974bfa46b4f01744e5d8980670c..db1b97e072d7a1fae663730d9189c4d32f3cba46 100644 (file)
--- a/test/PbPbbench/Config.C
+++ b/test/PbPbbench/Config.C
@@ -178,7 +178,7 @@ void Config()
     gAlice->SetRunLoader(rl);
 
     // Set the trigger configuration
-    gAlice->SetTriggerDescriptor(pprTrigConfName[strig]);
+    AliSimulation::Instance()->SetTriggerConfig(pprTrigConfName[strig]);
     cout<<"Trigger configuration is set to  "<<pprTrigConfName[strig]<<endl;
 
     //

diff --git a/test/QA/Config.C b/test/QA/Config.C
index 9c7dc1317f821861f60b9a879a1014562301de13..3060456aed375100dbf4e74dc7ecd959a6eb81ce 100644 (file)
--- a/test/QA/Config.C
+++ b/test/QA/Config.C
@@ -219,7 +219,7 @@ void Config()
   gAlice->SetRunLoader(rl);
 
   // Set the trigger configuration
-  gAlice->SetTriggerDescriptor(TrigConfName[trig]);
+  AliSimulation::Instance()->SetTriggerConfig(TrigConfName[trig]);
   cout<<"Trigger configuration is set to  "<<TrigConfName[trig]<<endl;
 
   //======================//

diff --git a/test/embedding/Config.C b/test/embedding/Config.C
index 2013ed1c27c6aeba20a2c7512f49e31883083948..02f96975f6d4a7c4c7d01d4ccc2091f669a9f7da 100644 (file)
--- a/test/embedding/Config.C
+++ b/test/embedding/Config.C
@@ -145,12 +145,12 @@ void Config()
   
   // Set the trigger configuration
   if ((embedrun == kBackground) || (embedrun == kMerged)) {
-    gAlice->SetTriggerDescriptor("Pb-Pb");
+    AliSimulation::Instance()->SetTriggerConfig("Pb-Pb");
     cout<<"Trigger configuration is set to  Pb-Pb"<<endl;
   }
   else {
     // Set the trigger configuration: proton-proton
-    gAlice->SetTriggerDescriptor("p-p");
+    AliSimulation::Instance()->SetTriggerConfig("p-p");
   }
 
   //

diff --git a/test/genkine/sim/Config.C b/test/genkine/sim/Config.C
index 89fbcfaca623a92ab7c406faa328222a8265e09c..2a52f5d2e118c906e13bfcdddbffefbcc4234c3f 100644 (file)
--- a/test/genkine/sim/Config.C
+++ b/test/genkine/sim/Config.C
@@ -126,7 +126,7 @@ void Config()
     gAlice->SetRunLoader(rl);
 
   // Set the trigger configuration
-    gAlice->SetTriggerDescriptor(pprTrigConfName[strig]);
+    AliSimulation::Instance()->SetTriggerConfig(pprTrigConfName[strig]);
     cout<<"Trigger configuration is set to  "<<pprTrigConfName[strig]<<endl;
 
 

diff --git a/test/gun/Config.C b/test/gun/Config.C
index 2e4251e8483bc5989e3230902108fcf2f6c0c705..d2ddc6d3cb2ca17a6ad4eb36a710fe74cc47bfb7 100644 (file)
--- a/test/gun/Config.C
+++ b/test/gun/Config.C
@@ -94,7 +94,7 @@ void Config()
     gAlice->SetRunLoader(rl);
 
     // Set the trigger configuration
-    gAlice->SetTriggerDescriptor(pprTrigConfName[strig]);
+    AliSimulation::Instance()->SetTriggerConfig(pprTrigConfName[strig]);
     cout<<"Trigger configuration is set to  "<<pprTrigConfName[strig]<<endl;
 
     //

diff --git a/test/merge/backgr/Config.C b/test/merge/backgr/Config.C
index c5e9b0246fbd234b33c1ce95d14686ed1703490c..7f6158043d95939461d8e3ee6a7223c06bef7d6c 100644 (file)
--- a/test/merge/backgr/Config.C
+++ b/test/merge/backgr/Config.C
@@ -177,7 +177,7 @@ void Config()
     gAlice->SetRunLoader(rl);
 
     // Set the trigger configuration
-    gAlice->SetTriggerDescriptor(pprTrigConfName[strig]);
+    AliSimulation::Instance()->SetTriggerConfig(pprTrigConfName[strig]);
     cout<<"Trigger configuration is set to  "<<pprTrigConfName[strig]<<endl;
 
     //

diff --git a/test/merge/signal/Config.C b/test/merge/signal/Config.C
index a4eba35333a47ab630b78151943a371b0c2dbd11..f573b98af97705ce66c56c1b1e40d2ca5e042210 100644 (file)
--- a/test/merge/signal/Config.C
+++ b/test/merge/signal/Config.C
@@ -176,7 +176,7 @@ void Config()
     gAlice->SetRunLoader(rl);
 
     // Set the trigger configuration
-    gAlice->SetTriggerDescriptor(pprTrigConfName[strig]);
+    AliSimulation::Instance()->SetTriggerConfig(pprTrigConfName[strig]);
     cout<<"Trigger configuration is set to  "<<pprTrigConfName[strig]<<endl;
 
     //

diff --git a/test/pileup/Config.C b/test/pileup/Config.C
index dc4a1ec2e99ca25aade71f99054493077a1a257b..3fb15b4979fbfd8355d7ab6bcb58b5d8b0c24cb2 100644 (file)
--- a/test/pileup/Config.C
+++ b/test/pileup/Config.C
@@ -129,7 +129,7 @@ void Config()
   // gAlice->SetGeometryFromCDB();
   
   // Set the trigger configuration: proton-proton
-  gAlice->SetTriggerDescriptor("p-p");
+  AliSimulation::Instance()->SetTriggerConfig("p-p");
 
   //
   //=======================================================================

diff --git a/test/ppbench/Config.C b/test/ppbench/Config.C
index 059223de62d7a3b13d05fd6474277b4a357d6402..c88e921fe80ef1e4d10dbf7f3a622037aabe74f8 100644 (file)
--- a/test/ppbench/Config.C
+++ b/test/ppbench/Config.C
@@ -176,7 +176,7 @@ void Config()
     gAlice->SetRunLoader(rl);
 
     // Set the trigger configuration
-    gAlice->SetTriggerDescriptor(pprTrigConfName[strig]);
+    AliSimulation::Instance()->SetTriggerConfig(pprTrigConfName[strig]);
     cout<<"Trigger configuration is set to  "<<pprTrigConfName[strig]<<endl;
 
     //

diff --git a/test/pploadlibs/Config.C b/test/pploadlibs/Config.C
index ac408dda258065d474e1df6281164565ebbf08a7..89695f12fffbcb765b1017d8f705b50225bb1812 100644 (file)
--- a/test/pploadlibs/Config.C
+++ b/test/pploadlibs/Config.C
@@ -180,7 +180,7 @@ void Config()
   gAlice->SetRunLoader(rl);
   
   // Set the trigger configuration
-  gAlice->SetTriggerDescriptor(TrigConfName[trig]);
+  AliSimulation::Instance()->SetTriggerConfig(TrigConfName[trig]);
   cout<<"Trigger configuration is set to  "<<TrigConfName[trig]<<endl;
 
   //

diff --git a/test/vmctest/gun/commonConfig.C b/test/vmctest/gun/commonConfig.C
index f8a2607c4a651a4ad5e8ac19e40b42f5a091fa78..26efb8accaf60ec313a7411b620bf68e6b3f1b5d 100644 (file)
--- a/test/vmctest/gun/commonConfig.C
+++ b/test/vmctest/gun/commonConfig.C
@@ -64,7 +64,7 @@ void commonConfig(Bool_t setRootGeometry = kFALSE)
   // Trigger configuration
   //=======================================================================
 
-  gAlice->SetTriggerDescriptor(pprTrigConfName[strig]);
+  AliSimulation::Instance()->SetTriggerConfig(pprTrigConfName[strig]);
   cout << "Trigger configuration is set to  " << pprTrigConfName[strig] << endl;
 
   // ============================= 

diff --git a/test/vmctest/ppbench/commonConfig.C b/test/vmctest/ppbench/commonConfig.C
index f8a2607c4a651a4ad5e8ac19e40b42f5a091fa78..26efb8accaf60ec313a7411b620bf68e6b3f1b5d 100644 (file)
--- a/test/vmctest/ppbench/commonConfig.C
+++ b/test/vmctest/ppbench/commonConfig.C
@@ -64,7 +64,7 @@ void commonConfig(Bool_t setRootGeometry = kFALSE)
   // Trigger configuration
   //=======================================================================
 
-  gAlice->SetTriggerDescriptor(pprTrigConfName[strig]);
+  AliSimulation::Instance()->SetTriggerConfig(pprTrigConfName[strig]);
   cout << "Trigger configuration is set to  " << pprTrigConfName[strig] << endl;
 
   // =============================