X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=FASTSIM%2FfastGen.C;h=d48e78787cd8ed4978d2d70863ba392e4aa3cdc3;hb=372acc818559cfe0bbd074377bcfa5ad09881cd9;hp=35b1bb9bc89ddd38c9908402ea0b6d4d2648253e;hpb=600211b11f4aca6b7014d05e960ff7cfbba66ce1;p=u%2Fmrichter%2FAliRoot.git

diff --git a/FASTSIM/fastGen.C b/FASTSIM/fastGen.C
index 35b1bb9bc89..d48e78787cd 100644
--- a/FASTSIM/fastGen.C
+++ b/FASTSIM/fastGen.C
@@ -2,21 +2,22 @@ AliGenerator*  CreateGenerator();
 
 void fastGen(Int_t nev = 1, char* filename = "galice.root")
 {
-//
-//                        Construction
-//
-//  Output file
-    TFile*  file         = new TFile(filename, "recreate");
+//  Runloader
+    
+    AliRunLoader* rl = AliRunLoader::Open("galice.root","FASTRUN","recreate");
+    
+    rl->SetCompressionLevel(2);
+    rl->SetNumberOfEventsPerFile(nev);
+    rl->LoadKinematics("RECREATE");
+    rl->MakeTree("E");
+    gAlice->SetRunLoader(rl);
+
 //  Create stack
-    AliStack* stack      = new AliStack(10000);
-    stack->MakeTree(0, filename);
-
-//  Create Header
-    AliHeader* header    = new AliHeader();
-//  Create Header Tree
-    TTree* treeE         = new TTree("TE","Headers");
-    treeE->Branch("Header", "AliHeader", &header, 4000, 0);
-    treeE->Write();
+    rl->MakeStack();
+    AliStack* stack      = rl->Stack();
+ 
+//  Header
+    AliHeader* header = rl->GetHeader();
 //
 //  Create and Initialize Generator
     AliGenerator *gener = CreateGenerator();
@@ -34,8 +35,11 @@ void fastGen(Int_t nev = 1, char* filename = "galice.root")
 	
 //  Initialize event
 	header->Reset(0,iev);
-	stack->BeginEvent(iev);
-
+	rl->SetEventNumber(iev);
+	stack->Reset();
+	rl->MakeTree("K");
+//	stack->ConnectTree();
+    
 //  Generate event
 	gener->Generate();
 //  Analysis
@@ -52,25 +56,21 @@ void fastGen(Int_t nev = 1, char* filename = "galice.root")
 	header->SetNtrack(stack->GetNtrack());  
 //      I/O
 //	
-//	stack->FinishEvent();
-//	header->SetStack(stack);
-//	treeE->Fill();
-//	Reset stack
+	stack->FinishEvent();
+	header->SetStack(stack);
+	rl->TreeE()->Fill();
+	rl->WriteKinematics("OVERWRITE");
 
-	stack->Reset();
     } // event loop
 //
 //                         Termination
 //  Generator
     gener->FinishRun();
-//  Header
-    treeE->Write(0,TObject::kOverwrite);
-    delete treeE;   treeE = 0;
-//  Stack
-    stack->FinishRun();
 //  Write file
+    rl->WriteHeader("OVERWRITE");
     gener->Write();
-    file->Write();
+    rl->Write();
+    
 }
 
 
@@ -86,9 +86,9 @@ AliGenerator*  CreateGenerator()
 //   charm, beauty, charm_unforced, beauty_unforced, jpsi, jpsi_chi, mb
     gener->SetProcess(kPyJets);
 //   Centre of mass energy 
-    gener->SetEnergyCMS(14000.);
+    gener->SetEnergyCMS(5500.);
 //   Pt transfer of the hard scattering
-    gener->SetPtHard(5.,5.1);
+    gener->SetPtHard(50.,50.2);
 //   Initialize generator    
     return gener;
 }