Adding an additional ascii format for the entry collection + a getter to the TEntryLi...

[u/mrichter/AliRoot.git] / THerwig / AliGenHerwig.cxx

diff --git a/THerwig/AliGenHerwig.cxx b/THerwig/AliGenHerwig.cxx
index 83ea10b8ffaa7191bd508297122876df04e867ad..9578c55ab6af27c9bb85644134ef74ea135ce62d 100644 (file)
--- a/THerwig/AliGenHerwig.cxx
+++ b/THerwig/AliGenHerwig.cxx
@@ -20,16 +20,17 @@
 // The main Herwig options are accessable for the user through this interface.
 // Uses the THerwig implementation of TGenerator.
 
-#include "AliGenHerwig.h"
-#include "AliHerwigRndm.h"
-#include "AliRun.h"
 
+#include <Riostream.h>
+#include <TClonesArray.h>
 #include <TParticle.h>
-#include "THerwig6.h"
 
-#include "Riostream.h"
-#include "AliMC.h"
+#include <THerwig6.h>
 
+#include "AliGenHerwig.h"
+#include "AliHerwigRndm.h"
+#include "AliMC.h"
+#include "AliRun.h"
 #include "driver.h"
 
 ClassImp(AliGenHerwig)
@@ -45,7 +46,6 @@ ClassImp(AliGenHerwig)
     fTrigger(0),
     fSelectAll(0),
     fFlavor(0),
-    fEnergyCMS(14000),
     fMomentum1(7000),
     fMomentum2(7000),
     fKineBias(1),
@@ -63,6 +63,7 @@ ClassImp(AliGenHerwig)
     fFileName(0)
 {
 // Constructor
+  fEnergyCMS = 14000;
 }
 
 AliGenHerwig::AliGenHerwig(Int_t npart)
@@ -75,7 +76,6 @@ AliGenHerwig::AliGenHerwig(Int_t npart)
     fTrigger(0),
     fSelectAll(0),
     fFlavor(0),
-    fEnergyCMS(14000),
     fMomentum1(7000),
     fMomentum2(7000),
     fKineBias(1),
@@ -92,44 +92,13 @@ AliGenHerwig::AliGenHerwig(Int_t npart)
     fEv2Pr(0),
     fFileName(0)
 {
+    fEnergyCMS = 14000;
     SetTarget();
     SetProjectile();
     // Set random number generator
     AliHerwigRndm::SetHerwigRandom(GetRandom());
 }
 
-AliGenHerwig::AliGenHerwig(const AliGenHerwig & Herwig)
-    :AliGenMC(Herwig),
-    fAutPDF("LHAPDF"),
-    fModPDF(19070),
-    fStrucFunc(kCTEQ5L),
-    fKeep(0),
-    fDecaysOff(1),
-    fTrigger(0),
-    fSelectAll(0),
-    fFlavor(0),
-    fEnergyCMS(14000),
-    fMomentum1(7000),
-    fMomentum2(7000),
-    fKineBias(1),
-    fTrials(0),
-    fXsection(0),
-    fHerwig(0x0),
-    fProcess(0),
-    fPtHardMin(0.),
-    fPtRMS(0.),
-    fMaxPr(10),
-    fMaxErrors(1000),
-    fEnSoft(1),
-    fEv1Pr(0),
-    fEv2Pr(0),
-    fFileName(0)
-{
-// Copy constructor
-    Herwig.Copy(*this);
-}
-
-
 AliGenHerwig::~AliGenHerwig()
 {
 // Destructor
@@ -451,14 +420,6 @@ void AliGenHerwig::FinishRun()
   fHerwig->Hwefin();
 }
 
-
-AliGenHerwig& AliGenHerwig::operator=(const  AliGenHerwig& rhs)
-{
-// Assignment operator
-    rhs.Copy(*this);
-    return (*this);
-}
-
 void AliGenHerwig::FinishRunJimmy()
 {
   fHerwig->Hwefin();