X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=macros%2FConfigBeautyPPR.C;h=f29b0095eb56e27bcbd97aaba6cf5420e9f3b9de;hb=94f7c83694bce64e30bc557d5f03ba7b165fbcf7;hp=2532612bef7c373cbb043b65caf683b1188f9d5d;hpb=9988704266cf8e4b13017cc4e53d86463471b873;p=u%2Fmrichter%2FAliRoot.git

diff --git a/macros/ConfigBeautyPPR.C b/macros/ConfigBeautyPPR.C
index 2532612bef7..f29b0095eb5 100644
--- a/macros/ConfigBeautyPPR.C
+++ b/macros/ConfigBeautyPPR.C
@@ -33,11 +33,6 @@
 #include "ACORDE/AliACORDEv1.h"
 #endif
 
-enum PprGeo_t
-  {
-    kHoles, kNoHoles
-  };
-static PprGeo_t geo = kHoles;
 void LoadPythia();
 
 void Config()
@@ -66,7 +61,7 @@ void Config()
   //  Create the output file
    
   if(!AliCDBManager::Instance()->IsDefaultStorageSet()){
-    AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT");
+    AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
     AliCDBManager::Instance()->SetRun(0);
   }
   
@@ -88,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;
 
   //
@@ -228,12 +223,7 @@ void Config()
     //=================== FRAME parameters ============================
 
     AliFRAME *FRAME  = new AliFRAMEv2("FRAME","Space Frame");
-    if (geo == kHoles) {
-      FRAME->SetHoles(1);
-    } else {
-      FRAME->SetHoles(0);
-    }
-
+    FRAME->SetHoles(1);
   }
 
   if(iSHIL) {