X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=EVGEN%2FAliGenFLUKAsource.cxx;h=92ace3eff93ff250cd0d2f5588394723c1b24340;hb=4b621d9c358e960282e509fc4c80d639f982d03f;hp=9c9eeb505e4a40188593f2f109d6dbc61038785d;hpb=2ec105c5f1abdb8ca7252162a117a71327e3ff51;p=u%2Fmrichter%2FAliRoot.git

diff --git a/EVGEN/AliGenFLUKAsource.cxx b/EVGEN/AliGenFLUKAsource.cxx
index 9c9eeb505e4..92ace3eff93 100644
--- a/EVGEN/AliGenFLUKAsource.cxx
+++ b/EVGEN/AliGenFLUKAsource.cxx
@@ -21,41 +21,62 @@
 // Files can be chained. 
 // Author: andreas.morsch@cern.ch
 
-#include "TPDGCode.h"
-#include "TDatabasePDG.h"
-
 #include "AliGenFLUKAsource.h"
-#include "AliRun.h"
-
+#include <stdlib.h>
 
+#include <TDatabasePDG.h>
+#include <TPDGCode.h>
+#include <RVersion.h>
+#include <TChain.h>
 #include <TFile.h>
 #include <TTree.h>
-#include <TChain.h>
-#include <stdlib.h>
+#include <TVirtualMC.h>
+
+#include "AliRun.h"
+
 ClassImp(AliGenFLUKAsource)
 
 AliGenFLUKAsource::AliGenFLUKAsource()
-	 :AliGenerator(-1)
+    :AliGenerator(-1), 
+     fIkine(6),
+     fAgeMax(1.e-5), 
+     fAddWeight(1.),
+     fZshift(0.),
+     fFrac(0.),
+     fSourceId(-1),
+     fFileName(0),
+     fTreeChain(0),
+     fTreeFluka(0),
+     fIp(0.),
+     fIpp(0.),
+     fXi(0.),
+     fYi(0.),
+     fZi(0.),
+     fPx(0.),
+     fPy(0.),
+     fPz(0.),
+     fEkin(0.),
+     fZv(0.),
+     fRv(0.),
+     fItra(0.),
+     fIgas(0.),
+     fWgt(0.),
+     fEtag(0.),
+     fPtg(0.),
+     fAge(0.)
 {
     // Constructor
     fName="FLUKA";
     fTitle="FLUKA Boundary Source";
     // Read in all particle types by default
-    fIkine=6;
     // Set maximum admitted age of particles to 1.e-05 by default 
-    fAgeMax=1.e-05;
     // Do not add weight
-    fAddWeight=1.;
     // Shift the z-coordinate of the impact point by 4.5 cm only if it reads 
     // from  specific boundary source to the chamber (fZshift=4.5;),else there 
     // is no need to shift as it reads boundary source for the whole volume of 
     // the Muon Arm; the default value corresponds to boundary source for the
     // whole volume of the MUON Arm 
-    fZshift=0;
     // Set the default file 
-    fFileName="";
-
-    fTreeFluka=0;
     fTreeChain = new TChain("h1");
 //
 //  Read all particles
@@ -63,39 +84,39 @@ AliGenFLUKAsource::AliGenFLUKAsource()
 }
 
 AliGenFLUKAsource::AliGenFLUKAsource(Int_t npart)
-    :AliGenerator(npart)
+    :AliGenerator(npart), 
+     fIkine(6),
+     fAgeMax(1.e-5), 
+     fAddWeight(1.),
+     fZshift(0.),
+     fFrac(0.),
+     fSourceId(-1),
+     fFileName(""),
+     fTreeChain(new TChain("h1")),
+     fTreeFluka(0),
+     fIp(0.),
+     fIpp(0.),
+     fXi(0.),
+     fYi(0.),
+     fZi(0.),
+     fPx(0.),
+     fPy(0.),
+     fPz(0.),
+     fEkin(0.),
+     fZv(0.),
+     fRv(0.),
+     fItra(0.),
+     fIgas(0.),
+     fWgt(0.),
+     fEtag(0.),
+     fPtg(0.),
+     fAge(0.)
 {
     // Constructor
     fName  = "FLUKA";
     fTitle = "FLUKA Boundary Source";
-    // Read in all particle types by default
-    fIkine=6;
-    // Set maximum admitted age of particles to 1.e-05 by default 
-    fAgeMax=1.e-05;
-    // Do not add weight
-    fAddWeight=1.;
-    // Shift the z-coordinate of the impact point by 4.5 cm only if it reads 
-    // from  specific boundary source to the chamber (fZshift=4.5;),else there 
-    // is no need to shift as it reads boundary source for the whole volume of 
-    // the Muon Arm; the default value corresponds to boundary source for the
-    // whole volume of the MUON Arm 
-    fZshift=0;
-    // Set the default file 
-    fFileName="";
-
-    fTreeFluka=0;
-    fTreeChain = new TChain("h1"); 
-    fSourceId=-1;
-}
-
-AliGenFLUKAsource::AliGenFLUKAsource(const AliGenFLUKAsource & FLUKAsource):
-    AliGenerator(FLUKAsource)
-{
-// Copy constructor
-    FLUKAsource.Copy(*this);
 }
 
-
 //____________________________________________________________
 AliGenFLUKAsource::~AliGenFLUKAsource()
 {
@@ -183,7 +204,7 @@ void AliGenFLUKAsource::Generate()
 		if (gAlice) printf("AliRun object found on file\n");
 		if (!gAlice) gAlice = new AliRun("gAlice","Alice test program");
 	    }
-	    TTree *fAli=gAlice->TreeK();
+	    TTree *fAli=AliRunLoader::Instance()->TreeK();
 	    if (fAli) pFile =fAli->GetCurrentFile();
 	    pFile->cd();
 	    printf("Generate - I'm out \n");
@@ -274,25 +295,12 @@ void AliGenFLUKAsource::Generate()
 	if (gAlice) printf("AliRun object found on file\n");
 	if (!gAlice) gAlice = new AliRun("gAlice","Alice test program");
     }
-    TTree *fAli=gAlice->TreeK();
+    TTree *fAli=AliRunLoader::Instance()->TreeK();
     if (fAli) pFile =fAli->GetCurrentFile();
     pFile->cd();
 }
 
 
-AliGenFLUKAsource& AliGenFLUKAsource::operator=(const  AliGenFLUKAsource& rhs)
-{
-// Assignment operator
-    rhs.Copy(*this);
-    return (*this);
-}
-
-
-void AliGenFLUKAsource::Copy(AliGenFLUKAsource &) const
-{
-    Fatal("Copy","Not implemented!\n");
-}
-