Include in the ZDC ESD the values for the second hadronic set of ZDC (C.Oppedisano)
authorhristov <hristov@f7af4fe6-9843-0410-8265-dc069ae4e863>
Fri, 31 Mar 2006 16:45:53 +0000 (16:45 +0000)
committerhristov <hristov@f7af4fe6-9843-0410-8265-dc069ae4e863>
Fri, 31 Mar 2006 16:45:53 +0000 (16:45 +0000)
STEER/AliESD.cxx
STEER/AliESD.h
STEER/AliEventTag.cxx
STEER/AliEventTag.h
STEER/AliEventTagCuts.cxx
STEER/AliEventTagCuts.h
STEER/AliReconstruction.cxx
STEER/AliTagCreator.cxx

index d79514c..1c80105 100644 (file)
@@ -33,9 +33,11 @@ AliESD::AliESD():
   fTrigger(0),
   fRecoVersion(0),
   fMagneticField(0),
-  fZDCNEnergy(0),
-  fZDCPEnergy(0),
+  fZDCN1Energy(0),
+  fZDCP1Energy(0),
   fZDCEMEnergy(0),
+  fZDCN2Energy(0),
+  fZDCP2Energy(0),
   fZDCParticipants(0),
   fT0zVertex(0),
   fPrimaryVertex(),
@@ -105,9 +107,11 @@ void AliESD::Reset()
   fTrigger=0;
   fRecoVersion=0;
   fMagneticField=0;
-  fZDCNEnergy=0;
-  fZDCPEnergy=0;
+  fZDCN1Energy=0;
+  fZDCP1Energy=0;
   fZDCEMEnergy=0;
+  fZDCN2Energy=0;
+  fZDCP2Energy=0;
   fZDCParticipants=0;
   fT0zVertex=0;
   fPrimaryVertex.Reset();
index 70c8615..ebc0f6e 100644 (file)
@@ -150,14 +150,16 @@ public:
   Float_t GetT0zVertex() const {return fT0zVertex;}
   void SetT0zVertex(Float_t z) {fT0zVertex=z;}
 
-  Float_t GetZDCNEnergy() const {return fZDCNEnergy;}
-  Float_t GetZDCPEnergy() const {return fZDCPEnergy;}
+  Float_t GetZDCN1Energy() const {return fZDCN1Energy;}
+  Float_t GetZDCP1Energy() const {return fZDCP1Energy;}
+  Float_t GetZDCN2Energy() const {return fZDCN2Energy;}
+  Float_t GetZDCP2Energy() const {return fZDCP2Energy;}
   Float_t GetZDCEMEnergy() const {return fZDCEMEnergy;}
   Int_t   GetZDCParticipants() const {return fZDCParticipants;}
-  void    SetZDC(Float_t nEnergy, Float_t pEnergy, Float_t emEnergy,
-                 Int_t participants) 
-   {fZDCNEnergy=nEnergy; fZDCPEnergy=pEnergy; fZDCEMEnergy=emEnergy;
-    fZDCParticipants=participants;}
+  void    SetZDC(Float_t n1Energy, Float_t p1Energy, Float_t emEnergy,
+                 Float_t n2Energy, Float_t p2Energy, Int_t participants) 
+   {fZDCN1Energy=n1Energy; fZDCP1Energy=p1Energy; fZDCEMEnergy=emEnergy;
+    fZDCN2Energy=n2Energy; fZDCP2Energy=p2Energy; fZDCParticipants=participants;}
 
   void ResetV0s() { fV0s.Clear(); }
   void ResetCascades() { fCascades.Clear(); }
@@ -180,8 +182,10 @@ protected:
   Int_t        fRecoVersion;     // Version of reconstruction 
   Float_t      fMagneticField;   // Solenoid Magnetic Field in kG : for compatibility with AliMagF
 
-  Float_t      fZDCNEnergy;      // reconstructed energy in the neutron ZDC
-  Float_t      fZDCPEnergy;      // reconstructed energy in the proton ZDC
+  Float_t      fZDCN1Energy;      // reconstructed energy in the neutron ZDC
+  Float_t      fZDCP1Energy;      // reconstructed energy in the proton ZDC
+  Float_t      fZDCN2Energy;      // reconstructed energy in the neutron ZDC
+  Float_t      fZDCP2Energy;      // reconstructed energy in the proton ZDC
   Float_t      fZDCEMEnergy;     // reconstructed energy in the electromagnetic ZDC
   Int_t        fZDCParticipants; // number of participants estimated by the ZDC
 
index d7a0889..5107b01 100644 (file)
@@ -41,9 +41,11 @@ ClassImp(AliEventTag)
     fPrimaryVertexZ(-100.0),
     fPrimaryVertexZError(-100.0),
     fTriggerInfo(-10),
-    fZDCNeutronEnergy(-10.0),
-    fZDCProtonEnergy(-10.0),
+    fZDCNeutron1Energy(-10.0),
+    fZDCProton1Energy(-10.0),
     fZDCEMEnergy(-10.0),
+    fZDCNeutron2Energy(-10.0),
+    fZDCProton2Energy(-10.0),
     fT0VertexZ(-10.0),
     fNumberOfTracks(-10),
     fNumberOfPositiveTracks(-10),
@@ -115,9 +117,11 @@ AliEventTag::AliEventTag(const AliEventTag & EvTag) : TObject(EvTag)
 
   SetTrigger(EvTag.GetTrigger());
   
-  SetZDCNeutronEnergy(EvTag.GetZDCNeutronEnergy());
-  SetZDCProtonEnergy(EvTag.GetZDCProtonEnergy());
+  SetZDCNeutron1Energy(EvTag.GetZDCNeutron1Energy());
+  SetZDCProton1Energy(EvTag.GetZDCProton1Energy());
   SetZDCEMEnergy(EvTag.GetZDCEMEnergy());
+  SetZDCNeutron2Energy(EvTag.GetZDCNeutron2Energy());
+  SetZDCProton2Energy(EvTag.GetZDCProton2Energy());
   
   SetT0VertexZ(EvTag.GetT0VertexZ());
   
@@ -202,8 +206,10 @@ AliEventTag & AliEventTag::operator=(const AliEventTag &EvTag)
     
     SetTrigger(EvTag.GetTrigger());
     
-    SetZDCNeutronEnergy(EvTag.GetZDCNeutronEnergy());
-    SetZDCProtonEnergy(EvTag.GetZDCProtonEnergy());
+    SetZDCNeutron1Energy(EvTag.GetZDCNeutron1Energy());
+    SetZDCProton1Energy(EvTag.GetZDCProton1Energy());
+    SetZDCNeutron2Energy(EvTag.GetZDCNeutron2Energy());
+    SetZDCProton2Energy(EvTag.GetZDCProton2Energy());
     SetZDCEMEnergy(EvTag.GetZDCEMEnergy());
     
     SetT0VertexZ(EvTag.GetT0VertexZ());
index 45da3ea..a32b7c9 100644 (file)
@@ -45,8 +45,10 @@ class AliEventTag : public TObject
 
   void   SetTrigger(Int_t Ptr) {fTriggerInfo = Ptr;}
 
-  void   SetZDCNeutronEnergy(Float_t Pen) {fZDCNeutronEnergy = Pen;}
-  void   SetZDCProtonEnergy(Float_t Pen) {fZDCProtonEnergy = Pen;}
+  void   SetZDCNeutron1Energy(Float_t Pen) {fZDCNeutron1Energy = Pen;}
+  void   SetZDCProton1Energy(Float_t Pen) {fZDCProton1Energy = Pen;}
+  void   SetZDCNeutron2Energy(Float_t Pen) {fZDCNeutron2Energy = Pen;}
+  void   SetZDCProton2Energy(Float_t Pen) {fZDCProton2Energy = Pen;}
   void   SetZDCEMEnergy(Float_t Pen) {fZDCEMEnergy = Pen;}
 
   void   SetT0VertexZ(Float_t Pvz) {fT0VertexZ = Pvz;}
@@ -126,8 +128,10 @@ class AliEventTag : public TObject
 
   Int_t   GetTrigger() const {return fTriggerInfo;}
 
-  Float_t GetZDCNeutronEnergy() const {return fZDCNeutronEnergy;}
-  Float_t GetZDCProtonEnergy() const {return fZDCProtonEnergy;}
+  Float_t GetZDCNeutron1Energy() const {return fZDCNeutron1Energy;}
+  Float_t GetZDCProton1Energy() const {return fZDCProton1Energy;}
+  Float_t GetZDCNeutron2Energy() const {return fZDCNeutron2Energy;}
+  Float_t GetZDCProton2Energy() const {return fZDCProton2Energy;}
   Float_t GetZDCEMEnergy() const {return fZDCEMEnergy;}
 
   Float_t GetT0VertexZ() const {return fT0VertexZ;}
@@ -206,8 +210,10 @@ class AliEventTag : public TObject
   Float_t  fPrimaryVertexZError;              //Primary vertex - Z coordinate - error
 
   Int_t    fTriggerInfo;                      //Information from trigger
-  Float_t  fZDCNeutronEnergy;                 //ZDC info - neutron
-  Float_t  fZDCProtonEnergy;                  //ZDC info - proton
+  Float_t  fZDCNeutron1Energy;                //ZDC info - neutron
+  Float_t  fZDCProton1Energy;                 //ZDC info - proton
+  Float_t  fZDCNeutron2Energy;                //ZDC info - neutron
+  Float_t  fZDCProton2Energy;                 //ZDC info - proton
   Float_t  fZDCEMEnergy;                      //ZDC info - em
   Float_t  fT0VertexZ;                        //T0 info
   Int_t    fNumberOfTracks;                   //Multiplicity
index 8dad5f7..2baa681 100644 (file)
@@ -51,8 +51,10 @@ void AliEventTagCuts::Reset()
   fParticipantsFlag = kFALSE;
   fImpactParamFlag = kFALSE;
   fPVFlag = kFALSE;
-  fZDCNeutronEnergyFlag = kFALSE;
-  fZDCProtonEnergyFlag = kFALSE;
+  fZDCNeutron1EnergyFlag = kFALSE;
+  fZDCProton1EnergyFlag = kFALSE;
+  fZDCNeutron2EnergyFlag = kFALSE;
+  fZDCProton2EnergyFlag = kFALSE;
   fZDCEMEnergyFlag = kFALSE;
   fT0VertexZFlag = kFALSE;
   fMultFlag = kFALSE;
@@ -109,10 +111,14 @@ void AliEventTagCuts::Reset()
   fImpactParamMax = 1000.0;
   fPrimaryVertexFlag = 1;
  
-  fZDCNeutronEnergyMin = -1.0;
-  fZDCNeutronEnergyMax = 100000.0;
-  fZDCProtonEnergyMin = -1.0;
-  fZDCProtonEnergyMax = 100000.0;
+  fZDCNeutron1EnergyMin = -1.0;
+  fZDCNeutron1EnergyMax = 100000.0;
+  fZDCProton1EnergyMin = -1.0;
+  fZDCProton1EnergyMax = 100000.0;
+  fZDCNeutron2EnergyMin = -1.0;
+  fZDCNeutron2EnergyMax = 100000.0;
+  fZDCProton2EnergyMin = -1.0;
+  fZDCProton2EnergyMax = 100000.0;
   fZDCEMEnergyMin = -1.0;
   fZDCEMEnergyMax = 100000.0;
   fT0VertexZMin = -10000.0;
@@ -264,22 +270,40 @@ void AliEventTagCuts::SetPrimaryVertexFlag(Int_t i)
 }
 
 //----------------------------------------//
-void AliEventTagCuts::SetZDCNeutrRange(Float_t r1, Float_t r2)
+void AliEventTagCuts::SetZDCNeutr1Range(Float_t r1, Float_t r2)
 {
   //Sets the ZDC's neutron energy range 
   //and the corresponding flag to kTRUE if the cut is used.
-  fZDCNeutronEnergyMin = r1;
-  fZDCNeutronEnergyMax = r2;
-  fZDCNeutronEnergyFlag = kTRUE;
+  fZDCNeutron1EnergyMin = r1;
+  fZDCNeutron1EnergyMax = r2;
+  fZDCNeutron1EnergyFlag = kTRUE;
 }
 //----------------------------------------//
-void AliEventTagCuts::SetZDCProtRange(Float_t r1, Float_t r2)
+void AliEventTagCuts::SetZDCProt1Range(Float_t r1, Float_t r2)
 {
   //Sets the ZDC's proton energy range 
   //and the corresponding flag to kTRUE if the cut is used.
-  fZDCProtonEnergyMin = r1;
-  fZDCProtonEnergyMax = r2;
-  fZDCProtonEnergyFlag = kTRUE;
+  fZDCProton1EnergyMin = r1;
+  fZDCProton1EnergyMax = r2;
+  fZDCProton1EnergyFlag = kTRUE;
+}
+//----------------------------------------//
+void AliEventTagCuts::SetZDCNeutr2Range(Float_t r1, Float_t r2)
+{
+  //Sets the ZDC's neutron energy range 
+  //and the corresponding flag to kTRUE if the cut is used.
+  fZDCNeutron2EnergyMin = r1;
+  fZDCNeutron2EnergyMax = r2;
+  fZDCNeutron2EnergyFlag = kTRUE;
+}
+//----------------------------------------//
+void AliEventTagCuts::SetZDCProt2Range(Float_t r1, Float_t r2)
+{
+  //Sets the ZDC's proton energy range 
+  //and the corresponding flag to kTRUE if the cut is used.
+  fZDCProton2EnergyMin = r1;
+  fZDCProton2EnergyMax = r2;
+  fZDCProton2EnergyFlag = kTRUE;
 }
 //----------------------------------------//
 void AliEventTagCuts::SetZDCEMRange(Float_t r1, Float_t r2)
@@ -687,12 +711,20 @@ Bool_t AliEventTagCuts::IsAccepted(AliEventTag *EvTag) const
     if((EvTag->GetVertexFlag() != fPrimaryVertexFlag))
       return kFALSE; 
   
-  if(fZDCNeutronEnergyFlag)
-    if((EvTag->GetZDCNeutronEnergy() < fZDCNeutronEnergyMin) || (EvTag->GetZDCNeutronEnergy() > fZDCNeutronEnergyMax))
+  if(fZDCNeutron1EnergyFlag)
+    if((EvTag->GetZDCNeutron1Energy() < fZDCNeutron1EnergyMin) || (EvTag->GetZDCNeutron1Energy() > fZDCNeutron1EnergyMax))
+      return kFALSE; 
+  
+  if(fZDCProton1EnergyFlag)
+    if((EvTag->GetZDCProton1Energy() < fZDCProton1EnergyMin) || (EvTag->GetZDCProton1Energy() > fZDCProton1EnergyMax))
+      return kFALSE; 
+  
+  if(fZDCNeutron2EnergyFlag)
+    if((EvTag->GetZDCNeutron2Energy() < fZDCNeutron2EnergyMin) || (EvTag->GetZDCNeutron2Energy() > fZDCNeutron2EnergyMax))
       return kFALSE; 
   
-  if(fZDCProtonEnergyFlag)
-    if((EvTag->GetZDCProtonEnergy() < fZDCProtonEnergyMin) || (EvTag->GetZDCProtonEnergy() > fZDCProtonEnergyMax))
+  if(fZDCProton2EnergyFlag)
+    if((EvTag->GetZDCProton2Energy() < fZDCProton2EnergyMin) || (EvTag->GetZDCProton2Energy() > fZDCProton2EnergyMax))
       return kFALSE; 
   
   if(fZDCEMEnergyFlag)
index a1dc30a..3772387 100644 (file)
@@ -34,9 +34,11 @@ class AliEventTagCuts : public TObject
 
   void SetPrimaryVertexFlag(Int_t i);
 
-  void SetZDCNeutrRange(Float_t r1, Float_t r2);
-  void SetZDCProtRange(Float_t r1, Float_t r2);
+  void SetZDCNeutr1Range(Float_t r1, Float_t r2);
+  void SetZDCProt1Range(Float_t r1, Float_t r2);
   void SetZDCEMRange(Float_t r1, Float_t r2);
+  void SetZDCNeutr2Range(Float_t r1, Float_t r2);
+  void SetZDCProt2Range(Float_t r1, Float_t r2);
   void SetT0VertexZRange(Float_t r1, Float_t r2);
 
   void SetMultiplicityRange(Int_t n1, Int_t n2);
@@ -97,10 +99,14 @@ class AliEventTagCuts : public TObject
   Int_t fPrimaryVertexFlag; //Primary vertex flag: 0->not found, 1->found
   Bool_t fPVFlag;          //Shows whether this cut is used or not
   
-  Float_t fZDCNeutronEnergyMin, fZDCNeutronEnergyMax; //ZDC min,max - neutron
-  Bool_t fZDCNeutronEnergyFlag;//Shows whether this cut is used or not
-  Float_t fZDCProtonEnergyMin, fZDCProtonEnergyMax; //ZDC min,max - proton
-  Bool_t fZDCProtonEnergyFlag;//Shows whether this cut is used or not
+  Float_t fZDCNeutron1EnergyMin, fZDCNeutron1EnergyMax; //ZDC min,max - neutron
+  Bool_t fZDCNeutron1EnergyFlag;//Shows whether this cut is used or not
+  Float_t fZDCProton1EnergyMin, fZDCProton1EnergyMax; //ZDC min,max - proton
+  Bool_t fZDCProton1EnergyFlag;//Shows whether this cut is used or not
+  Float_t fZDCNeutron2EnergyMin, fZDCNeutron2EnergyMax; //ZDC min,max - neutron
+  Bool_t fZDCNeutron2EnergyFlag;//Shows whether this cut is used or not
+  Float_t fZDCProton2EnergyMin, fZDCProton2EnergyMax; //ZDC min,max - proton
+  Bool_t fZDCProton2EnergyFlag;//Shows whether this cut is used or not
   Float_t fZDCEMEnergyMin, fZDCEMEnergyMax; //ZDC min,max - em
   Bool_t fZDCEMEnergyFlag;//Shows whether this cut is used or not
   Float_t fT0VertexZMin, fT0VertexZMax; //T0 min, max
index 0595d5b..684d222 100644 (file)
@@ -1446,8 +1446,10 @@ void AliReconstruction::CreateTag(TFile* file)
     
     evTag->SetTrigger(esd->GetTrigger());
     
-    evTag->SetZDCNeutronEnergy(esd->GetZDCNEnergy());
-    evTag->SetZDCProtonEnergy(esd->GetZDCPEnergy());
+    evTag->SetZDCNeutron1Energy(esd->GetZDCN1Energy());
+    evTag->SetZDCProton1Energy(esd->GetZDCP1Energy());
+    evTag->SetZDCNeutron2Energy(esd->GetZDCN2Energy());
+    evTag->SetZDCProton2Energy(esd->GetZDCP2Energy());
     evTag->SetZDCEMEnergy(esd->GetZDCEMEnergy());
     evTag->SetNumOfParticipants(esd->GetZDCParticipants());
     
index fe1789a..21d395d 100644 (file)
@@ -404,9 +404,11 @@ void AliTagCreator::CreateTag(TFile* file, const char *guid, const char *md5, co
     
     evTag->SetTrigger(esd->GetTrigger());
     
-    evTag->SetZDCNeutronEnergy(esd->GetZDCNEnergy());
-    evTag->SetZDCProtonEnergy(esd->GetZDCPEnergy());
+    evTag->SetZDCNeutron1Energy(esd->GetZDCN1Energy());
+    evTag->SetZDCProton1Energy(esd->GetZDCP1Energy());
     evTag->SetZDCEMEnergy(esd->GetZDCEMEnergy());
+    evTag->SetZDCNeutron1Energy(esd->GetZDCN2Energy());
+    evTag->SetZDCProton1Energy(esd->GetZDCP2Energy());
     evTag->SetNumOfParticipants(esd->GetZDCParticipants());