Updates needed for ZDC and AliCollisionGeometry (Chiara Oppedisano).

diff --git a/THijing/AliGenHijing.cxx b/THijing/AliGenHijing.cxx
index 017cda2003011b3624761316dac54e41223d1723..654f72146b90ed47699088bdb5c5af8f7598819c 100644 (file)
--- a/THijing/AliGenHijing.cxx
+++ b/THijing/AliGenHijing.cxx
@@ -194,8 +194,10 @@ void AliGenHijing::Generate()
   {
 //    Generate one event
 // --------------------------------------------------------------------------
-      fSpecn   = 0;  
-      fSpecp   = 0;
+      fProjectileSpecn    = 0;  
+      fProjectileSpecp    = 0;
+      fTargetSpecn    = 0;  
+      fTargetSpecp    = 0;
 // --------------------------------------------------------------------------
       fHijing->GenerateEvent();
       fTrials++;
@@ -271,9 +273,13 @@ void AliGenHijing::Generate()
          
 // --------------------------------------------------------------------------
 // Count spectator neutrons and protons
-         if(ks == 0 || ks == 1 || ks == 10 || ks == 11){
-             if(kf == kNeutron) fSpecn += 1;
-             if(kf == kProton)  fSpecp += 1;
+         if(ks == 0 || ks == 1){
+             if(kf == kNeutron) fProjectileSpecn += 1;
+             if(kf == kProton)  fProjectileSpecp += 1;
+         }
+         else if(ks == 10 || ks == 11){
+             if(kf == kNeutron) fTargetSpecn += 1;
+             if(kf == kProton)  fTargetSpecp += 1;
          }
 // --------------------------------------------------------------------------
 //         
@@ -490,7 +496,8 @@ void AliGenHijing::MakeHeader()
                                                       fHijing->GetN01(),
                                                       fHijing->GetN10(),
                                                       fHijing->GetN11());
-    ((AliGenHijingEventHeader*) header)->SetSpectators(fSpecn, fSpecp);
+    ((AliGenHijingEventHeader*) header)->SetSpectators(fProjectileSpecn, fProjectileSpecp,
+                                                      fTargetSpecn,fTargetSpecp);
 
 // 4-momentum vectors of the triggered jets.
 //

diff --git a/THijing/AliGenHijing.h b/THijing/AliGenHijing.h
index d65730bfc49947a392b8da48e09ff1ab2425cee0..9207e8843db0485b136eef3843ce78e9b4dc250e 100644 (file)
--- a/THijing/AliGenHijing.h
+++ b/THijing/AliGenHijing.h
@@ -119,8 +119,10 @@ class AliGenHijing : public AliGenMC
     Int_t       fNoGammas;       // Don't write gammas if flag "on"
     
 // ZDC proposal (by Chiara) to store num. of SPECTATORS protons and neutrons
-    Int_t      fSpecn;          // Num. of spectator neutrons
-    Int_t      fSpecp;          // Num. of spectator protons
+    Int_t      fProjectileSpecn;// Num. of spectator neutrons from projectile nucleus
+    Int_t      fProjectileSpecp;// Num. of spectator protons from projectile nucleus
+    Int_t      fTargetSpecn;    // Num. of spectator neutrons from target nucleus
+    Int_t      fTargetSpecp;    // Num. of spectator protons from target nucleus
     Int_t       fLHC;            // Assume LHC as lab frame
  private:
     void Copy(TObject &rhs) const;