Support for automatic pedestal estimation per pad (Marian and Matevz).

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

diff --git a/STEER/AliTagCreator.cxx b/STEER/AliTagCreator.cxx
index fe1789a1e456d3e15a7f9a6decc639fe3a912988..8e87fcbd7908fe414c8bbdb6eba04beea033b09b 100644 (file)
--- a/STEER/AliTagCreator.cxx
+++ b/STEER/AliTagCreator.cxx
@@ -197,7 +197,6 @@ Bool_t AliTagCreator::MergeTags()
   ftag->Close();
 
   delete tag;
-  delete evTag;
   delete newTag;
 
   return kTRUE;
@@ -236,6 +235,8 @@ void AliTagCreator::CreateTag(TFile* file, const char *guid, const char *md5, co
   Int_t nMu1GeV, nMu3GeV, nMu10GeV;
   Int_t nEl1GeV, nEl3GeV, nEl10GeV;
   Float_t maxPt = .0, meanPt = .0, totalP = .0;
+  Int_t fVertexflag;
+  TString fVertexName;
 
   AliRunTag *tag = new AliRunTag();
   AliEventTag *evTag = new AliEventTag();
@@ -280,10 +281,13 @@ void AliTagCreator::CreateTag(TFile* file, const char *guid, const char *md5, co
     maxPt = .0;
     meanPt = .0;
     totalP = .0;
+    fVertexflag = 1;
     
     b->GetEntry(iEventNumber);
     const AliESDVertex * vertexIn = esd->GetVertex();
-    
+    fVertexName = vertexIn->GetName();
+    if(fVertexName == "default") fVertexflag = 0;
+
     for (Int_t iTrackNumber = 0; iTrackNumber < esd->GetNumberOfTracks(); iTrackNumber++) {
       AliESDtrack * esdTrack = esd->GetTrack(iTrackNumber);
       UInt_t status = esdTrack->GetStatus();
@@ -399,14 +403,18 @@ void AliTagCreator::CreateTag(TFile* file, const char *guid, const char *md5, co
     evTag->SetVertexX(vertexIn->GetXv());
     evTag->SetVertexY(vertexIn->GetYv());
     evTag->SetVertexZ(vertexIn->GetZv());
+    evTag->SetVertexZError(vertexIn->GetZRes());
+    evTag->SetVertexFlag(fVertexflag);
     
     evTag->SetT0VertexZ(esd->GetT0zVertex());
     
-    evTag->SetTrigger(esd->GetTrigger());
+    evTag->SetTrigger(esd->GetTriggerMask());
     
-    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());
     
     
@@ -490,6 +498,5 @@ void AliTagCreator::CreateTag(TFile* file, const char *guid, const char *md5, co
   delete esd;
 
   delete tag;
-  delete evTag;
 }