Modification of the trigger fields in the event tag (Panos)

diff --git a/STEER/AliEventTag.cxx b/STEER/AliEventTag.cxx
index 218d82396b5c0ddde3791c41a65de1b5f77cba93..fd2e6ab126afe3d326958c7fe02e066003c780f1 100644 (file)
--- a/STEER/AliEventTag.cxx
+++ b/STEER/AliEventTag.cxx
@@ -40,7 +40,8 @@ ClassImp(AliEventTag)
     fPrimaryVertexY(-100.0),
     fPrimaryVertexZ(-100.0),
     fPrimaryVertexZError(-100.0),
     fPrimaryVertexY(-100.0),
     fPrimaryVertexZ(-100.0),
     fPrimaryVertexZError(-100.0),

-    fTriggerInfo(0),
+    fTriggerMask(0),
+    fTriggerCluster(0),

     fZDCNeutron1Energy(-10.0),
     fZDCProton1Energy(-10.0),
     fZDCNeutron2Energy(-10.0),
     fZDCNeutron1Energy(-10.0),
     fZDCProton1Energy(-10.0),
     fZDCNeutron2Energy(-10.0),


@@ -115,7 +116,8 @@ AliEventTag::AliEventTag(const AliEventTag & EvTag) : TObject(EvTag)
   SetVertexFlag(EvTag.GetVertexFlag());
   SetVertexZError(EvTag.GetVertexZError());
 
   SetVertexFlag(EvTag.GetVertexFlag());
   SetVertexZError(EvTag.GetVertexZError());
 

-  SetTrigger(EvTag.GetTrigger());
+  SetTriggerMask(EvTag.GetTriggerMask());
+  SetTriggerCluster(EvTag.GetTriggerCluster());

   
   SetZDCNeutron1Energy(EvTag.GetZDCNeutron1Energy());
   SetZDCProton1Energy(EvTag.GetZDCProton1Energy());
   
   SetZDCNeutron1Energy(EvTag.GetZDCNeutron1Energy());
   SetZDCProton1Energy(EvTag.GetZDCProton1Energy());


@@ -204,7 +206,8 @@ AliEventTag & AliEventTag::operator=(const AliEventTag &EvTag)
     SetVertexFlag(EvTag.GetVertexFlag());
     SetVertexZError(EvTag.GetVertexZError());
     
     SetVertexFlag(EvTag.GetVertexFlag());
     SetVertexZError(EvTag.GetVertexZError());
     

-    SetTrigger(EvTag.GetTrigger());
+    SetTriggerMask(EvTag.GetTriggerMask());
+    SetTriggerCluster(EvTag.GetTriggerCluster());

     
     SetZDCNeutron1Energy(EvTag.GetZDCNeutron1Energy());
     SetZDCProton1Energy(EvTag.GetZDCProton1Energy());
     
     SetZDCNeutron1Energy(EvTag.GetZDCNeutron1Energy());
     SetZDCProton1Energy(EvTag.GetZDCProton1Energy());

diff --git a/STEER/AliEventTag.h b/STEER/AliEventTag.h
index c5fcc2588b9d683af9b2ef24a749c8475c2f9f64..0a65a3eebdda275d4edcf7b7dc7a96d704bbc2ff 100644 (file)
--- a/STEER/AliEventTag.h
+++ b/STEER/AliEventTag.h
@@ -43,7 +43,8 @@ class AliEventTag : public TObject
   void   SetVertexFlag(Int_t i) {fPrimaryVertexFlag = i;}
   void   SetVertexZError(Float_t f) { fPrimaryVertexZError = f;}
 
   void   SetVertexFlag(Int_t i) {fPrimaryVertexFlag = i;}
   void   SetVertexZError(Float_t f) { fPrimaryVertexZError = f;}
 

-  void   SetTrigger(ULong64_t Ptr) {fTriggerInfo = Ptr;}
+  void   SetTriggerMask(ULong64_t Ptr) {fTriggerMask = Ptr;}
+  void   SetTriggerCluster(UChar_t n) {fTriggerCluster = n;}

 
   void   SetZDCNeutron1Energy(Float_t Pen) {fZDCNeutron1Energy = Pen;}
   void   SetZDCProton1Energy(Float_t Pen) {fZDCProton1Energy = Pen;}
 
   void   SetZDCNeutron1Energy(Float_t Pen) {fZDCNeutron1Energy = Pen;}
   void   SetZDCProton1Energy(Float_t Pen) {fZDCProton1Energy = Pen;}


@@ -126,7 +127,8 @@ class AliEventTag : public TObject
   Int_t GetVertexFlag() const {return fPrimaryVertexFlag;}
   Float_t GetVertexZError() const {return fPrimaryVertexZError;}
 
   Int_t GetVertexFlag() const {return fPrimaryVertexFlag;}
   Float_t GetVertexZError() const {return fPrimaryVertexZError;}
 

-  ULong64_t   GetTrigger() const {return fTriggerInfo;}
+  ULong64_t   GetTriggerMask() const {return fTriggerMask;}
+  UChar_t   GetTriggerCluster() const {return fTriggerCluster;}

 
   Float_t GetZDCNeutron1Energy() const {return fZDCNeutron1Energy;}
   Float_t GetZDCProton1Energy() const {return fZDCProton1Energy;}
 
   Float_t GetZDCNeutron1Energy() const {return fZDCNeutron1Energy;}
   Float_t GetZDCProton1Energy() const {return fZDCProton1Energy;}


@@ -209,7 +211,8 @@ class AliEventTag : public TObject
 
   Float_t  fPrimaryVertexZError;              //Primary vertex - Z coordinate - error
 
 
   Float_t  fPrimaryVertexZError;              //Primary vertex - Z coordinate - error
 

-  ULong64_t    fTriggerInfo;                  //Information from trigger
+  ULong64_t    fTriggerMask;                  //Information from trigger (trigger mask)
+  UChar_t      fTriggerCluster;                // Trigger cluster (mask)

   Float_t  fZDCNeutron1Energy;                //ZDC info - neutron
   Float_t  fZDCProton1Energy;                 //ZDC info - proton
   Float_t  fZDCNeutron2Energy;                //ZDC info - neutron
   Float_t  fZDCNeutron1Energy;                //ZDC info - neutron
   Float_t  fZDCProton1Energy;                 //ZDC info - proton
   Float_t  fZDCNeutron2Energy;                //ZDC info - neutron


@@ -273,7 +276,7 @@ class AliEventTag : public TObject
   Float_t  fEventPlaneAngle;                  //event plane info
   Float_t  fHBTRadii;                          //HBT info
 
   Float_t  fEventPlaneAngle;                  //event plane info
   Float_t  fHBTRadii;                          //HBT info
 

-  ClassDef(AliEventTag,6)  //(ClassName, ClassVersion)
+  ClassDef(AliEventTag,7)  //(ClassName, ClassVersion)

     };
 //______________________________________________________________________________
 
     };
 //______________________________________________________________________________
 

diff --git a/STEER/AliReconstruction.cxx b/STEER/AliReconstruction.cxx
index 7d07674fe47b355bda07573429a0dcb7a589b0bf..a39e532a713af474c69ed42d0b39232dc756a60b 100644 (file)
--- a/STEER/AliReconstruction.cxx
+++ b/STEER/AliReconstruction.cxx
@@ -1730,7 +1730,8 @@ void AliReconstruction::CreateTag(TFile* file)
 
     evTag->SetT0VertexZ(esd->GetT0zVertex());
     
 
     evTag->SetT0VertexZ(esd->GetT0zVertex());
     

-    evTag->SetTrigger(esd->GetTriggerMask());
+    evTag->SetTriggerMask(esd->GetTriggerMask());
+    evTag->SetTriggerCluster(esd->GetTriggerCluster());

     
     evTag->SetZDCNeutron1Energy(esd->GetZDCN1Energy());
     evTag->SetZDCProton1Energy(esd->GetZDCP1Energy());
     
     evTag->SetZDCNeutron1Energy(esd->GetZDCN1Energy());
     evTag->SetZDCProton1Energy(esd->GetZDCP1Energy());

diff --git a/STEER/AliTagCreator.cxx b/STEER/AliTagCreator.cxx
index 8e87fcbd7908fe414c8bbdb6eba04beea033b09b..f2978c5a441d72bcf87b6b44ad3a00f9c0876f2c 100644 (file)
--- a/STEER/AliTagCreator.cxx
+++ b/STEER/AliTagCreator.cxx
@@ -408,7 +408,8 @@ void AliTagCreator::CreateTag(TFile* file, const char *guid, const char *md5, co
     
     evTag->SetT0VertexZ(esd->GetT0zVertex());
     
     
     evTag->SetT0VertexZ(esd->GetT0zVertex());
     

-    evTag->SetTrigger(esd->GetTriggerMask());
+    evTag->SetTriggerMask(esd->GetTriggerMask());
+    evTag->SetTriggerCluster(esd->GetTriggerCluster());

     
     evTag->SetZDCNeutron1Energy(esd->GetZDCN1Energy());
     evTag->SetZDCProton1Energy(esd->GetZDCP1Energy());
     
     evTag->SetZDCNeutron1Energy(esd->GetZDCN1Energy());
     evTag->SetZDCProton1Energy(esd->GetZDCP1Energy());