Adding eta info at hit level

diff --git a/ZDC/AliZDC.cxx b/ZDC/AliZDC.cxx
index 73e2c4a5dc5203c42608e662d733bcc7822bc90f..662ace916566ae05374954c8a7fa656b9e433142 100644 (file)
--- a/ZDC/AliZDC.cxx
+++ b/ZDC/AliZDC.cxx
@@ -160,7 +160,7 @@ void AliZDC::AddHit(Int_t track, Int_t *vol, Float_t *hits)
   //
   //           Add a ZDC hit to the hit list.
   
-  static Float_t trackTime=0., primKinEn=0., xImpact=0., yImpact=0., sFlag=0.;
+  static Float_t trackTime=0., trackEta=0., primKinEn=0., xImpact=0., yImpact=0., sFlag=0.;
   static Int_t   pcPDGcode, motPDGcode;
 
   AliZDCHit *newquad, *curprimquad;
@@ -186,6 +186,7 @@ void AliZDC::AddHit(Int_t track, Int_t *vol, Float_t *hits)
       pcPDGcode         = newquad->GetPDGCode();
       motPDGcode = newquad->GetMotherPDGCode();
       trackTime  = newquad->GetTrackTOF();
+      trackEta   = newquad->GetTrackEta();
    }
    else{       
       newquad->SetPrimKinEn(primKinEn);
@@ -195,6 +196,7 @@ void AliZDC::AddHit(Int_t track, Int_t *vol, Float_t *hits)
       newquad->SetPDGCode(pcPDGcode);
       newquad->SetMotherPDGCode(motPDGcode);
       newquad->SetTrackTOF(trackTime);
+      newquad->SetTrackEta(trackEta);
    }
  
   Int_t j;

diff --git a/ZDC/AliZDCHit.cxx b/ZDC/AliZDCHit.cxx
index 197842498672792d138de5cdf3def7cb058720cf..ae07219027a9832ffd6914f6259311d2b5a87021 100644 (file)
--- a/ZDC/AliZDCHit.cxx
+++ b/ZDC/AliZDCHit.cxx
@@ -37,7 +37,8 @@ AliZDCHit::AliZDCHit() :
   fEnergy(0.), 
   fPDGCode(0),
   fMotherPDGCode(0),
-  fTrackTOF(0.)
+  fTrackTOF(0.),
+  fTrackEta(0.)
 
 {
   //
@@ -58,7 +59,8 @@ AliZDCHit::AliZDCHit(Int_t shunt, Int_t track, Int_t *vol, Float_t *hits) :
   fEnergy(hits[9]), 
   fPDGCode((Int_t) hits[10]),
   fMotherPDGCode((Int_t) hits[11]),
-  fTrackTOF(hits[12])
+  fTrackTOF(hits[12]),
+  fTrackEta(hits[13])
 
 {
   //
@@ -83,7 +85,8 @@ AliZDCHit::AliZDCHit(const AliZDCHit &oldhit) :
   fEnergy(oldhit.GetEnergy()),
   fPDGCode(oldhit.GetPDGCode()),
   fMotherPDGCode(oldhit.GetMotherPDGCode()),
-  fTrackTOF(oldhit.GetTrackTOF())
+  fTrackTOF(oldhit.GetTrackTOF()),
+  fTrackEta(oldhit.GetTrackEta())
 {
   // Copy constructor
   fX = oldhit.X();
@@ -108,6 +111,7 @@ AliZDCHit &AliZDCHit::operator= (const AliZDCHit &hit)
   fPDGCode = hit.GetPDGCode();
   fMotherPDGCode = hit.GetMotherPDGCode();
   fTrackTOF = hit.GetTrackTOF();
+  fTrackEta = hit.GetTrackEta();
 
   fX = hit.X();
   fY = hit.Y();
@@ -122,10 +126,10 @@ AliZDCHit &AliZDCHit::operator= (const AliZDCHit &hit)
 void AliZDCHit::Print(Option_t *) const 
 {
    // Print method
-   printf("\t AliZDCHit: track %d PDGcode %d TOF %1.1f ns E_prim = %1.2f GeV SFlag = %1.0f\n" 
+   printf("\t AliZDCHit: track %d eta %f PDGcode %d TOF %1.1f ns E_prim = %1.2f GeV \n" 
          "\t DETECTOR (%d, %d)  (X, Y)_impact (%f, %f) cm\n"
           "\t PMQLight %1.0f, PMCLight %1.0f,  E_dep %1.2f\n ", 
-          fTrack,fPDGCode,fTrackTOF,fPrimKinEn,fSFlag,
+          fTrack,fTrackEta,fPDGCode,fTrackTOF,fPrimKinEn,
          fVolume[0],fVolume[1],fXImpact,fYImpact,
           fLightPMQ,fLightPMC,fEnergy);
 }

diff --git a/ZDC/AliZDCHit.h b/ZDC/AliZDCHit.h
index b4cd99eb106f89cfeeed308ae9ee2bc11ea5af84..74eeca3575180139a8482a4c360aea546f5d0cc5 100644 (file)
--- a/ZDC/AliZDCHit.h
+++ b/ZDC/AliZDCHit.h
@@ -30,6 +30,7 @@ public:
   virtual Float_t GetLightPMC() const      {return fLightPMC;}
   virtual Float_t GetEnergy() const        {return fEnergy;}
   virtual Float_t GetTrackTOF() const      {return fTrackTOF;}
+  virtual Float_t GetTrackEta() const      {return fTrackEta;}
 
   // Setters 
   virtual void SetVolume(Int_t i, Int_t val) {fVolume[i]=val;} 
@@ -42,6 +43,7 @@ public:
   virtual void SetXImpact(Float_t value)     {fXImpact=value;}
   virtual void SetYImpact(Float_t value)     {fYImpact=value;}
   virtual void SetTrackTOF(Float_t value)    {fTrackTOF=value;}
+  virtual void SetTrackEta(Float_t value)    {fTrackEta=value;}
 
   // Operators
   Int_t operator == (AliZDCHit &quad){
@@ -74,8 +76,9 @@ protected:
   Int_t   fPDGCode;      //PDG code of particle in the ZDC
   Int_t   fMotherPDGCode; //PDG code of particle in the ZDC
   Float_t fTrackTOF;     //Track time in ns
+  Float_t fTrackEta;     //Track eta
 
-  ClassDef(AliZDCHit,4)  // Hits for the Zero Degree Calorimeters
+  ClassDef(AliZDCHit,5)  // Hits for the Zero Degree Calorimeters
 };
  
 #endif

diff --git a/ZDC/AliZDCv3.cxx b/ZDC/AliZDCv3.cxx
index 6f226abb74c5079a369388b17bce902868fd5648..949d02b6af92fe6777b88e1a9a88db2d7b58bef2 100644 (file)
--- a/ZDC/AliZDCv3.cxx
+++ b/ZDC/AliZDCv3.cxx
@@ -2252,12 +2252,12 @@ void AliZDCv3::StepManager()
   // Routine called at every step in the Zero Degree Calorimeters
   //
   Int_t   j, vol[2]={0,0}, ibeta=0, ialfa=0, ibe=0, nphe=0;
-  Float_t hits[13], x[3], xdet[3]={999.,999.,999.}, um[3], ud[3];
+  Float_t hits[14], x[3], xdet[3]={999.,999.,999.}, um[3], ud[3];
   Float_t destep=0., be=0., out=0.;
   Double_t s[3], p[4];
   const char *knamed;
   //
-  for(j=0;j<13;j++) hits[j]=-999.;
+  for(j=0;j<14;j++) hits[j]=-999.;
   //
   // --- This part is for no shower developement in beam pipe, TDI, VColl
   // If particle interacts with beam pipe, TDI, VColl -> return
@@ -2464,6 +2464,7 @@ void AliZDCv3::StepManager()
       //
       hits[12] = 1.0e09*gMC->TrackTime(); // in ns!
       //printf("\t TrackTime = %f\n", hits[12]);
+      hits[13] = part->Eta();
 
       AddHit(curTrackN, vol, hits);
 

diff --git a/ZDC/AliZDCv4.cxx b/ZDC/AliZDCv4.cxx
index d6c1296fd007e4dbdf3e4cec0ac926d05add0ca2..e5407faafc159c2ce02f0f4f278e49f46261fb8d 100644 (file)
--- a/ZDC/AliZDCv4.cxx
+++ b/ZDC/AliZDCv4.cxx
@@ -2254,12 +2254,12 @@ void AliZDCv4::StepManager()
   // Routine called at every step in the Zero Degree Calorimeters
   //
   Int_t   j, vol[2]={0,0}, ibeta=0, ialfa=0, ibe=0, nphe=0;
-  Float_t hits[13], x[3], xdet[3]={999.,999.,999.}, um[3], ud[3];
+  Float_t hits[14], x[3], xdet[3]={999.,999.,999.}, um[3], ud[3];
   Float_t destep=0., be=0., out=0.;
   Double_t s[3], p[4];
   const char *knamed;
   //
-  for(j=0;j<13;j++) hits[j]=-999.;
+  for(j=0;j<14;j++) hits[j]=-999.;
   //
   // --- This part is for no shower developement in beam pipe, TDI, VColl
   // If particle interacts with beam pipe, TDI, VColl -> return
@@ -2466,6 +2466,7 @@ void AliZDCv4::StepManager()
       //
       hits[12] = 1.0e09*gMC->TrackTime(); // in ns!
       //printf("\t TrackTime = %f\n", hits[12]);
+      hits[13] = part->Eta();
 
       AddHit(curTrackN, vol, hits);