Added Hijing vars.

diff --git a/JETAN/AliJetEventParticles.cxx b/JETAN/AliJetEventParticles.cxx
index 2df1c2ef53e522a3d49a5334e80a1a1bc4aabe95..71fed7ea7d9363c3bb0c57726d012fb2509bf90f 100644 (file)
--- a/JETAN/AliJetEventParticles.cxx
+++ b/JETAN/AliJetEventParticles.cxx
@@ -26,7 +26,10 @@ AliJetEventParticles::AliJetEventParticles(Int_t size) :
   fNJets(0),
   fNUQJets(0),
   fXJet(-1),
-  fYJet(-1)
+  fYJet(-1),
+  fImpact(0.),
+  fNHardScatters(0),
+  fNwNwColl(0)
 {
   // Default Constructor
   for (Int_t i = 0; i < 4; i++) fZquench[i] = 0.;
@@ -52,7 +55,10 @@ AliJetEventParticles::AliJetEventParticles(const AliJetEventParticles& source) :
   fNJets(source.NTriggerJets()),
   fNUQJets(source.NUQTriggerJets()),
   fXJet(source.GetXJet()),
-  fYJet(source.GetXJet())
+  fYJet(source.GetXJet()),
+  fImpact(source.GetImpact()),
+  fNHardScatters(source.GetNhard()),
+  fNwNwColl(source.GetNpart())
 {
   //copy constructor
   for(Int_t i =0; i<fNParticles; i++)
@@ -100,6 +106,9 @@ void  AliJetEventParticles::Reset(Int_t size)
   fNUQJets=0;
   fXJet=-1;
   fYJet=-1;
+  fImpact=0.;
+  fNHardScatters=0;
+  fNwNwColl=0;
   for (Int_t i = 0; i < 4; i++) fZquench[i] = 0.;
   for (Int_t i = 0; i < 10; i++) 
     for (Int_t j = 0; j < 4; j++) {
@@ -323,6 +332,22 @@ void AliJetEventParticles::Hard(Int_t i, Float_t &p1, Float_t &p2, Float_t &p3,
   }
 }
 
+void AliJetEventParticles::Hard(Int_t i, Float_t p[4], Float_t &type) const
+{
+  //
+  // Give back jet #i
+  //
+  if (i >= 2) {
+    printf("\nWarning: Hard partons, index out of Range!!\n");
+  } else {
+    p[0]   = fHard[0][i];
+    p[1]   = fHard[1][i];
+    p[2]   = fHard[2][i];
+    p[3]   = fHard[3][i];
+    type = fHard[4][i];
+  }
+}
+
 void AliJetEventParticles::SetXYJet(Double_t x, Double_t y)
 {
   //

diff --git a/JETAN/AliJetEventParticles.h b/JETAN/AliJetEventParticles.h
index 308633eb9f98f4a802991eb9b138dbdd8f71207b..8f8d87d004b61a05e6a80ce6b9af76ef7737933a 100644 (file)
--- a/JETAN/AliJetEventParticles.h
+++ b/JETAN/AliJetEventParticles.h
@@ -29,6 +29,7 @@ class AliJetEventParticles: public TObject
   void SetVertex(Float_t v1,Float_t v2, Float_t v3){fVertexX=v1;fVertexY=v2;fVertexZ=v3;}
   void SetHeader(TString& s){fHeader=s;}
   void Reset(Int_t size=-1); //deletes all entries
+  void Clear(Option_t *option="") {TObject::Clear(option);Reset();}
   
   //adds particle to the event
   void AddParticle(AliJetParticle* p);  
@@ -55,11 +56,16 @@ class AliJetEventParticles: public TObject
   void     TriggerJet(Int_t i, Float_t &p1, Float_t &p2, Float_t &p3, Float_t &E)          const;
   void     UQJet(Int_t i, Float_t &p1, Float_t &p2, Float_t &p3, Float_t &E)               const;
   void     Hard(Int_t i, Float_t &p1, Float_t &p2, Float_t &p3, Float_t &E, Float_t &type) const;
+  void     Hard(Int_t i, Float_t p[4], Float_t &type) const;
   Double_t GetXJet() const {return fXJet;}
   Double_t GetYJet() const {return fYJet;}    
   void     GetZQuench(Double_t z[4]) const;
   TString  getHeader() const {return fHeader;}
 
+  Float_t  GetImpact() const {return fImpact;}
+  Int_t    GetNhard()  const {return fNHardScatters;}
+  Int_t    GetNpart()  const {return fNwNwColl;}
+
   void     SetXYJet(Double_t x, Double_t y); 
   void     SetZQuench(Double_t z[4]);
   void     SetTrials(Int_t trials) {fTrials = trials;}
@@ -69,7 +75,11 @@ class AliJetEventParticles: public TObject
   void     AddUQJet(Float_t p[4]);
   void     AddHard(Int_t i,Float_t px, Float_t py, Float_t pz, Float_t e, Float_t type);
 
-  void Print(Option_t *t="") const;
+  void     SetImpact(Float_t b){fImpact=b;}
+  void     SetNhard(Int_t n){fNHardScatters=n;}
+  void     SetNpart(Int_t n){fNwNwColl=n;}
+
+  void     Print(Option_t *t="") const;
 
   protected:
   TString fHeader;          //   event description
@@ -90,6 +100,10 @@ class AliJetEventParticles: public TObject
   Float_t  fHard[5][2];     // Hard partons
   Double_t fZquench[4];     // Quenching fraction
 
-  ClassDef(AliJetEventParticles,4) //class AliJetEventParticles
+  Float_t fImpact;          // impact parameter
+  Int_t   fNHardScatters;   // number of hard scatterings
+  Int_t   fNwNwColl;        // number of Nwounded-Nwounded collisions
+
+  ClassDef(AliJetEventParticles,5) //class AliJetEventParticles
 };
 #endif