Return to the original methods from AliLoader (Marco)

[u/mrichter/AliRoot.git] / STEER / AliEventTag.cxx

diff --git a/STEER/AliEventTag.cxx b/STEER/AliEventTag.cxx
index 085a58b6d9cb3c0c198dd6426daf117217b30c4b..154d564f2634c9e61aa3c677392efb5cacafaae7 100644 (file)
--- a/STEER/AliEventTag.cxx
+++ b/STEER/AliEventTag.cxx
@@ -41,8 +41,10 @@ ClassImp(AliEventTag)
     fPrimaryVertexZ(-100.0),
     fPrimaryVertexZError(-100.0),
     fTriggerInfo(-10),
-    fZDCNeutronEnergy(-10.0),
-    fZDCProtonEnergy(-10.0),
+    fZDCNeutron1Energy(-10.0),
+    fZDCProton1Energy(-10.0),
+    fZDCNeutron2Energy(-10.0),
+    fZDCProton2Energy(-10.0),
     fZDCEMEnergy(-10.0),
     fT0VertexZ(-10.0),
     fNumberOfTracks(-10),
@@ -53,9 +55,9 @@ ClassImp(AliEventTag)
     fNumberOfCascades(-10),
     fNumberOfKinks(-10),
     fNumberOfPMDTracks(-10),
-    fNumberOfPHOSTracks(-10),
-    fNumberOfEMCALTracks(-10),
     fNumberOfFMDTracks(-10),
+    fNumberOfPHOSClusters(-10),
+    fNumberOfEMCALClusters(-10),
     fNumberOfJetCandidates(-10),
     fMaxJetEnergy(-100.0),
     fNumberOfHardPhotonsCandidates(-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());
   
@@ -131,10 +135,10 @@ AliEventTag::AliEventTag(const AliEventTag & EvTag) : TObject(EvTag)
   SetNumOfKinks(EvTag.GetNumOfKinks());
   
   SetNumOfPMDTracks(EvTag.GetNumOfPMDTracks());
-  SetNumOfPHOSTracks(EvTag.GetNumOfPHOSTracks());
-  SetNumOfEMCALTracks(EvTag.GetNumOfEMCALTracks());
   SetNumOfFMDTracks(EvTag.GetNumOfFMDTracks());
-  
+  SetNumOfPHOSClusters(EvTag.GetNumOfPHOSClusters());
+  SetNumOfEMCALClusters(EvTag.GetNumOfEMCALClusters());
+
   SetNumOfJetCandidates(EvTag.GetNumOfJetCandidates());
   SetNumOfHardPhotonsCandidates(EvTag.GetNumOfHardPhotonsCandidates());
 
@@ -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());
@@ -218,9 +224,9 @@ AliEventTag & AliEventTag::operator=(const AliEventTag &EvTag)
     SetNumOfKinks(EvTag.GetNumOfKinks());
     
     SetNumOfPMDTracks(EvTag.GetNumOfPMDTracks());
-    SetNumOfPHOSTracks(EvTag.GetNumOfPHOSTracks());
-    SetNumOfEMCALTracks(EvTag.GetNumOfEMCALTracks());
     SetNumOfFMDTracks(EvTag.GetNumOfFMDTracks());
+    SetNumOfPHOSClusters(EvTag.GetNumOfPHOSClusters());
+    SetNumOfEMCALClusters(EvTag.GetNumOfEMCALClusters());
     
     SetNumOfJetCandidates(EvTag.GetNumOfJetCandidates());
     SetNumOfHardPhotonsCandidates(EvTag.GetNumOfHardPhotonsCandidates());