]> git.uio.no Git - u/mrichter/AliRoot.git/commitdiff
Update the Tag framework to correspond to current datataking conditions
authorakisiel <akisiel@f7af4fe6-9843-0410-8265-dc069ae4e863>
Wed, 14 Apr 2010 08:14:02 +0000 (08:14 +0000)
committerakisiel <akisiel@f7af4fe6-9843-0410-8265-dc069ae4e863>
Wed, 14 Apr 2010 08:14:02 +0000 (08:14 +0000)
STEER/AliESDTagCreator.cxx
STEER/AliESDTagCreator.h
STEER/AliEventTag.cxx
STEER/AliEventTag.h
STEER/AliEventTagCuts.cxx
STEER/AliEventTagCuts.h
STEER/AliRunTag.cxx
STEER/AliRunTag.h
STEER/AliTagCreator.cxx
STEER/AliTagCreator.h

index 4a429ee25cdac8866479821eb9cc91a990fccd4d..7cbe9a9234122b0d5b849582a8890a9e0cfc289b 100644 (file)
@@ -204,38 +204,7 @@ void AliESDTagCreator::CreateTag(TChain* chain, const char *type) {
   TString fguid, fmd5, fturl;
   TString fTempGuid;
 
-  /////////////
-  //muon code//
-  ////////////
-  Double_t fMUONMASS = 0.105658369;
-  //Variables
-  Double_t fX,fY,fZ ;
-  Double_t fThetaX, fThetaY, fPyz, fChisquare;
-  Double_t fPxRec, fPyRec, fPzRec, fEnergy;
-  Int_t fCharge;
-  TLorentzVector fEPvector;
-
-  Float_t fLowPtCut      =  1.0;
-  Float_t fHighPtCut     =  3.0;
-  Float_t fVeryHighPtCut = 10.0;
-  ////////////
-
-  Double_t partFrac[5] = {0.01, 0.01, 0.85, 0.10, 0.05};
-
-  // Creates the tags for all the events in a given ESD file
-  Bool_t fIsSim = kTRUE;
-  Int_t ntrack;
-  Int_t nProtons, nKaons, nPions, nMuons, nElectrons, nFWMuons, nFWMatchedMuons;
-  Int_t nPos, nNeg, nNeutr;
-  Int_t nK0s, nNeutrons, nPi0s, nGamas;
-  Int_t nCh1GeV, nCh3GeV, nCh10GeV;
-  Int_t nMu1GeV, nMu3GeV, nMu10GeV;
-  Int_t nEl1GeV, nEl3GeV, nEl10GeV;
-  Float_t maxPt = .0, etamaxPt = -999., phimaxPt = -999., meanPt = .0, totalP = .0;
-  Int_t fVertexflag;
   Int_t iRunNumber = 0;
-  TString fVertexName;
-
   //gSystem->GetMemInfo(meminfo);
   //AliInfo(Form("After the tag initialization - Memory used: %d MB",meminfo->fMemUsed));
   //Int_t tempmem = meminfo->fMemUsed;
@@ -245,7 +214,7 @@ void AliESDTagCreator::CreateTag(TChain* chain, const char *type) {
   Int_t firstEvent = 0,lastEvent = 0;
   AliESDEvent *esd = new AliESDEvent();
   esd->ReadFromTree(chain);
-  AliESD *esdold = 0x0;
+  //  AliESD *esdold = 0x0;
   
   //gSystem->GetMemInfo(meminfo);
   //AliInfo(Form("After the esd initialization - Memory used: %d MB - Increase: %d MB",meminfo->fMemUsed,meminfo->fMemUsed - tempmem));
@@ -290,21 +259,22 @@ void AliESDTagCreator::CreateTag(TChain* chain, const char *type) {
   tag->SetMagneticField(esd->GetMagneticField());
   tag->SetBeamEnergy(esd->GetBeamEnergy());
   tag->SetBeamType(TString(esd->GetBeamType()));
-  
+
   for(Int_t iEventNumber = 0; iEventNumber < chain->GetEntries(); iEventNumber++) {
-    ntrack = 0; nPos = 0; nNeg = 0; nNeutr =0;
-    nK0s = 0; nNeutrons = 0; nPi0s = 0;
-    nGamas = 0; nProtons = 0; nKaons = 0;
-    nPions = 0; nMuons = 0; nElectrons = 0; nFWMuons = 0; nFWMatchedMuons = 0;   
-    nCh1GeV = 0; nCh3GeV = 0; nCh10GeV = 0;
-    nMu1GeV = 0; nMu3GeV = 0; nMu10GeV = 0;
-    nEl1GeV = 0; nEl3GeV = 0; nEl10GeV = 0;
-    maxPt = .0; etamaxPt = -999.; phimaxPt = -999.; meanPt = .0; totalP = .0;
-    fVertexflag = 1;
-    
-    chain->GetEntry(iEventNumber);    
-    esdold = esd->GetAliESDOld();
-    if(esdold) esd->CopyFromOldESD();
+    FillEventTag(chain, evTag, iEventNumber, esd);
+//     ntrack = 0; nPos = 0; nNeg = 0; nNeutr =0;
+//     nK0s = 0; nNeutrons = 0; nPi0s = 0;
+//     nGamas = 0; nProtons = 0; nKaons = 0;
+//     nPions = 0; nMuons = 0; nElectrons = 0; nFWMuons = 0; nFWMatchedMuons = 0;        
+//     nCh1GeV = 0; nCh3GeV = 0; nCh10GeV = 0;
+//     nMu1GeV = 0; nMu3GeV = 0; nMu10GeV = 0;
+//     nEl1GeV = 0; nEl3GeV = 0; nEl10GeV = 0;
+//     maxPt = .0; etamaxPt = -999.; phimaxPt = -999.; meanPt = .0; totalP = .0;
+//     fVertexflag = 1;
+    
+//     chain->GetEntry(iEventNumber);    
+//     esdold = esd->GetAliESDOld();
+//     if(esdold) esd->CopyFromOldESD();
 
     TFile *file = chain->GetFile();
     const TUrl *url = file->GetEndpointUrl();
@@ -319,144 +289,144 @@ void AliESDTagCreator::CreateTag(TChain* chain, const char *type) {
     iRunNumber = esd->GetRunNumber();
     if(iRunNumber != iInitRunNumber) AliFatal("Inconsistency of run numbers in the AliESD - You are trying to merge different runs!!!");
 
-    const AliESDVertex * vertexIn = esd->GetVertex();
-    fVertexName = vertexIn->GetName();
-    if(fVertexName == "default") fVertexflag = 0;
+//     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);
-      if(esdTrack->GetLabel() != 0) fIsSim = kTRUE;
-      else if(esdTrack->GetLabel() == 0) fIsSim = kFALSE;
-      UInt_t status = esdTrack->GetStatus();
+//     for (Int_t iTrackNumber = 0; iTrackNumber < esd->GetNumberOfTracks(); iTrackNumber++) {
+//       AliESDtrack * esdTrack = esd->GetTrack(iTrackNumber);
+//       if(esdTrack->GetLabel() != 0) fIsSim = kTRUE;
+//       else if(esdTrack->GetLabel() == 0) fIsSim = kFALSE;
+//       UInt_t status = esdTrack->GetStatus();
       
-      //select only tracks with ITS refit
-      if ((status&AliESDtrack::kITSrefit)==0) continue;
-      //select only tracks with TPC refit
-      if ((status&AliESDtrack::kTPCrefit)==0) continue;
+//       //select only tracks with ITS refit
+//       if ((status&AliESDtrack::kITSrefit)==0) continue;
+//       //select only tracks with TPC refit
+//       if ((status&AliESDtrack::kTPCrefit)==0) continue;
       
-      //select only tracks with the "combined PID"
-      if ((status&AliESDtrack::kESDpid)==0) continue;
-      Double_t p[3];
-      esdTrack->GetPxPyPz(p);
-      Double_t pt2 = p[0]*p[0]+p[1]*p[1];
-      Double_t momentum = TMath::Sqrt(pt2+p[2]*p[2]);
-      Double_t fPt = TMath::Sqrt(pt2);
-      totalP += momentum;
-      meanPt += fPt;
-      if(fPt > maxPt) {
-         maxPt = fPt;
-         phimaxPt = esdTrack->Phi();
-         etamaxPt = esdTrack->Eta();
-      }
+//       //select only tracks with the "combined PID"
+//       if ((status&AliESDtrack::kESDpid)==0) continue;
+//       Double_t p[3];
+//       esdTrack->GetPxPyPz(p);
+//       Double_t pt2 = p[0]*p[0]+p[1]*p[1];
+//       Double_t momentum = TMath::Sqrt(pt2+p[2]*p[2]);
+//       Double_t fPt = TMath::Sqrt(pt2);
+//       totalP += momentum;
+//       meanPt += fPt;
+//       if(fPt > maxPt) {
+//       maxPt = fPt;
+//       phimaxPt = esdTrack->Phi();
+//       etamaxPt = esdTrack->Eta();
+//       }
       
-      if(esdTrack->GetSign() > 0) {
-       nPos++;
-       if(fPt > fLowPtCut) nCh1GeV++;
-       if(fPt > fHighPtCut) nCh3GeV++;
-       if(fPt > fVeryHighPtCut) nCh10GeV++;
-      }
-      if(esdTrack->GetSign() < 0) {
-       nNeg++;
-       if(fPt > fLowPtCut) nCh1GeV++;
-       if(fPt > fHighPtCut) nCh3GeV++;
-       if(fPt > fVeryHighPtCut) nCh10GeV++;
-      }
-      if(esdTrack->GetSign() == 0) nNeutr++;
+//       if(esdTrack->GetSign() > 0) {
+//     nPos++;
+//     if(fPt > fLowPtCut) nCh1GeV++;
+//     if(fPt > fHighPtCut) nCh3GeV++;
+//     if(fPt > fVeryHighPtCut) nCh10GeV++;
+//       }
+//       if(esdTrack->GetSign() < 0) {
+//     nNeg++;
+//     if(fPt > fLowPtCut) nCh1GeV++;
+//     if(fPt > fHighPtCut) nCh3GeV++;
+//     if(fPt > fVeryHighPtCut) nCh10GeV++;
+//       }
+//       if(esdTrack->GetSign() == 0) nNeutr++;
       
-      //PID
-      Double_t prob[5];
-      esdTrack->GetESDpid(prob);
+//       //PID
+//       Double_t prob[5];
+//       esdTrack->GetESDpid(prob);
       
-      Double_t rcc = 0.0;
-      for(Int_t i = 0; i < AliPID::kSPECIES; i++) rcc += prob[i]*partFrac[i];
-      if(rcc == 0.0) continue;
-      //Bayes' formula
-      Double_t w[5];
-      for(Int_t i = 0; i < AliPID::kSPECIES; i++) w[i] = prob[i]*partFrac[i]/rcc;
+//       Double_t rcc = 0.0;
+//       for(Int_t i = 0; i < AliPID::kSPECIES; i++) rcc += prob[i]*partFrac[i];
+//       if(rcc == 0.0) continue;
+//       //Bayes' formula
+//       Double_t w[5];
+//       for(Int_t i = 0; i < AliPID::kSPECIES; i++) w[i] = prob[i]*partFrac[i]/rcc;
       
-      //protons
-      if ((w[4]>w[3])&&(w[4]>w[2])&&(w[4]>w[1])&&(w[4]>w[0])) nProtons++;
-      //kaons
-      if ((w[3]>w[4])&&(w[3]>w[2])&&(w[3]>w[1])&&(w[3]>w[0])) nKaons++;
-      //pions
-      if ((w[2]>w[4])&&(w[2]>w[3])&&(w[2]>w[1])&&(w[2]>w[0])) nPions++; 
-      //electrons
-      if ((w[0]>w[4])&&(w[0]>w[3])&&(w[0]>w[2])&&(w[0]>w[1])) {
-       nElectrons++;
-       if(fPt > fLowPtCut) nEl1GeV++;
-       if(fPt > fHighPtCut) nEl3GeV++;
-       if(fPt > fVeryHighPtCut) nEl10GeV++;
-      }          
-      ntrack++;
-    }//esd track loop
-    
-    /////////////
-    //muon code//
-    ////////////
-    Int_t nMuonTracks = esd->GetNumberOfMuonTracks();
-    // loop over all reconstructed tracks (also first track of combination)
-    for (Int_t iTrack = 0; iTrack <  nMuonTracks;  iTrack++) {
-      AliESDMuonTrack* muonTrack = esd->GetMuonTrack(iTrack);
-      if (muonTrack == 0x0) continue;
+//       //protons
+//       if ((w[4]>w[3])&&(w[4]>w[2])&&(w[4]>w[1])&&(w[4]>w[0])) nProtons++;
+//       //kaons
+//       if ((w[3]>w[4])&&(w[3]>w[2])&&(w[3]>w[1])&&(w[3]>w[0])) nKaons++;
+//       //pions
+//       if ((w[2]>w[4])&&(w[2]>w[3])&&(w[2]>w[1])&&(w[2]>w[0])) nPions++; 
+//       //electrons
+//       if ((w[0]>w[4])&&(w[0]>w[3])&&(w[0]>w[2])&&(w[0]>w[1])) {
+//     nElectrons++;
+//     if(fPt > fLowPtCut) nEl1GeV++;
+//     if(fPt > fHighPtCut) nEl3GeV++;
+//     if(fPt > fVeryHighPtCut) nEl10GeV++;
+//       }       
+//       ntrack++;
+//     }//esd track loop
+    
+//     /////////////
+//     //muon code//
+//     ////////////
+//     Int_t nMuonTracks = esd->GetNumberOfMuonTracks();
+//     // loop over all reconstructed tracks (also first track of combination)
+//     for (Int_t iTrack = 0; iTrack <  nMuonTracks;  iTrack++) {
+//       AliESDMuonTrack* muonTrack = esd->GetMuonTrack(iTrack);
+//       if (muonTrack == 0x0) continue;
       
-      // Coordinates at vertex
-      fZ = muonTrack->GetZ(); 
-      fY = muonTrack->GetBendingCoor();
-      fX = muonTrack->GetNonBendingCoor(); 
+//       // Coordinates at vertex
+//       fZ = muonTrack->GetZ(); 
+//       fY = muonTrack->GetBendingCoor();
+//       fX = muonTrack->GetNonBendingCoor(); 
       
-      fThetaX = muonTrack->GetThetaX();
-      fThetaY = muonTrack->GetThetaY();
+//       fThetaX = muonTrack->GetThetaX();
+//       fThetaY = muonTrack->GetThetaY();
       
-      fPyz = 1./TMath::Abs(muonTrack->GetInverseBendingMomentum());
-      fPzRec = - fPyz / TMath::Sqrt(1.0 + TMath::Tan(fThetaY)*TMath::Tan(fThetaY));
-      fPxRec = fPzRec * TMath::Tan(fThetaX);
-      fPyRec = fPzRec * TMath::Tan(fThetaY);
-      fCharge = Int_t(TMath::Sign(1.,muonTrack->GetInverseBendingMomentum()));
+//       fPyz = 1./TMath::Abs(muonTrack->GetInverseBendingMomentum());
+//       fPzRec = - fPyz / TMath::Sqrt(1.0 + TMath::Tan(fThetaY)*TMath::Tan(fThetaY));
+//       fPxRec = fPzRec * TMath::Tan(fThetaX);
+//       fPyRec = fPzRec * TMath::Tan(fThetaY);
+//       fCharge = Int_t(TMath::Sign(1.,muonTrack->GetInverseBendingMomentum()));
       
-      //ChiSquare of the track if needed
-      fChisquare = muonTrack->GetChi2()/(2.0 * muonTrack->GetNHit() - 5);
-      fEnergy = TMath::Sqrt(fMUONMASS * fMUONMASS + fPxRec * fPxRec + fPyRec * fPyRec + fPzRec * fPzRec);
-      fEPvector.SetPxPyPzE(fPxRec, fPyRec, fPzRec, fEnergy);
+//       //ChiSquare of the track if needed
+//       fChisquare = muonTrack->GetChi2()/(2.0 * muonTrack->GetNHit() - 5);
+//       fEnergy = TMath::Sqrt(fMUONMASS * fMUONMASS + fPxRec * fPxRec + fPyRec * fPyRec + fPzRec * fPzRec);
+//       fEPvector.SetPxPyPzE(fPxRec, fPyRec, fPzRec, fEnergy);
       
-      if (muonTrack->GetMatchTrigger()>0) nFWMatchedMuons++;
+//       if (muonTrack->GetMatchTrigger()>0) nFWMatchedMuons++;
       
-      nMuons++;
-      nFWMuons++;
-      if(fEPvector.Pt() > fLowPtCut) {
-        nMu1GeV++; 
-        if(fEPvector.Pt() > fHighPtCut) {
-          nMu3GeV++; 
-          if (fEPvector.Pt() > fVeryHighPtCut) {
-            nMu10GeV++;
-          }
-        }
-      }
-    }//muon track loop
-    
-    // Fill the event tags 
-    if(ntrack != 0) meanPt = meanPt/ntrack;
-    
-    //AliInfo(Form("====================================="));
-    //AliInfo(Form("URL: %s - GUID: %s",fturl.Data(),fguid.Data()));
-    //AliInfo(Form("====================================="));
-
-    //First physics data
-    const AliMultiplicity *spdMult = esd->GetMultiplicity();
-    evTag->SetNumberOfFiredChipsLayer1(spdMult->GetNumberOfFiredChips(0));
-    evTag->SetNumberOfFiredChipsLayer2(spdMult->GetNumberOfFiredChips(1));
-    evTag->SetNumberOfSPDTracklets(spdMult->GetNumberOfTracklets());
-
-    AliESDVZERO *vzeroData = esd->GetVZEROData();
-    evTag->SetMTotV0A(vzeroData->GetMTotV0A());
-    evTag->SetMTotV0C(vzeroData->GetMTotV0C());
-    evTag->SetNbPMV0A(vzeroData->GetNbPMV0A());
-    evTag->SetNbPMV0C(vzeroData->GetNbPMV0C());
-
-    //evTag->SetEventId(iEventNumber+1);
-    evTag->SetPeriodNumber(esd->GetPeriodNumber());
-    evTag->SetOrbitNumber(esd->GetOrbitNumber());
-    evTag->SetBunchCrossNumber(esd->GetBunchCrossNumber());
-    evTag->SetGUID(fguid);
+//       nMuons++;
+//       nFWMuons++;
+//       if(fEPvector.Pt() > fLowPtCut) {
+//         nMu1GeV++; 
+//         if(fEPvector.Pt() > fHighPtCut) {
+//           nMu3GeV++; 
+//           if (fEPvector.Pt() > fVeryHighPtCut) {
+//             nMu10GeV++;
+//           }
+//         }
+//       }
+//     }//muon track loop
+    
+//     // Fill the event tags 
+//     if(ntrack != 0) meanPt = meanPt/ntrack;
+    
+//     //AliInfo(Form("====================================="));
+//     //AliInfo(Form("URL: %s - GUID: %s",fturl.Data(),fguid.Data()));
+//     //AliInfo(Form("====================================="));
+
+//     //First physics data
+//     const AliMultiplicity *spdMult = esd->GetMultiplicity();
+//     evTag->SetNumberOfFiredChipsLayer1(spdMult->GetNumberOfFiredChips(0));
+//     evTag->SetNumberOfFiredChipsLayer2(spdMult->GetNumberOfFiredChips(1));
+//     evTag->SetNumberOfSPDTracklets(spdMult->GetNumberOfTracklets());
+
+//     AliESDVZERO *vzeroData = esd->GetVZEROData();
+//     evTag->SetMTotV0A(vzeroData->GetMTotV0A());
+//     evTag->SetMTotV0C(vzeroData->GetMTotV0C());
+//     evTag->SetNbPMV0A(vzeroData->GetNbPMV0A());
+//     evTag->SetNbPMV0C(vzeroData->GetNbPMV0C());
+
+//     //evTag->SetEventId(iEventNumber+1);
+//     evTag->SetPeriodNumber(esd->GetPeriodNumber());
+//     evTag->SetOrbitNumber(esd->GetOrbitNumber());
+//     evTag->SetBunchCrossNumber(esd->GetBunchCrossNumber());
+//     evTag->SetGUID(fguid);
     if(fSession == "grid") {
       evTag->SetMD5("");
       evTag->SetTURL(fturl);
@@ -464,74 +434,74 @@ void AliESDTagCreator::CreateTag(TChain* chain, const char *type) {
     }
     else evTag->SetPath(fturl);
     
-    evTag->SetVertexX(vertexIn->GetXv());
-    evTag->SetVertexY(vertexIn->GetYv());
-    evTag->SetVertexZ(vertexIn->GetZv());
-    evTag->SetVertexZError(vertexIn->GetZRes());
-    evTag->SetVertexFlag(fVertexflag);
-    
-    evTag->SetT0VertexZ(esd->GetT0zVertex());
-    
-    evTag->SetTriggerMask(esd->GetTriggerMask());
-    evTag->SetTriggerCluster(esd->GetTriggerCluster());
-    
-    evTag->SetEventType(esd->GetEventType());
-    evTag->SetFiredTriggerClasses(esd->GetFiredTriggerClasses());
-
-    evTag->SetZDCNeutron1Energy(esd->GetZDCN1Energy());
-    evTag->SetZDCProton1Energy(esd->GetZDCP1Energy());
-    evTag->SetZDCEMEnergy(esd->GetZDCEMEnergy(0),esd->GetZDCEMEnergy(1));
-    evTag->SetZDCNeutron1Energy(esd->GetZDCN2Energy());
-    evTag->SetZDCProton1Energy(esd->GetZDCP2Energy());
-    evTag->SetNumOfParticipants(esd->GetZDCParticipants());
-    
-    
-    evTag->SetNumOfTracks(esd->GetNumberOfTracks());
-    evTag->SetNumOfPosTracks(nPos);
-    evTag->SetNumOfNegTracks(nNeg);
-    evTag->SetNumOfNeutrTracks(nNeutr);
-    
-    evTag->SetNumOfV0s(esd->GetNumberOfV0s());
-    evTag->SetNumOfCascades(esd->GetNumberOfCascades());
-    evTag->SetNumOfKinks(esd->GetNumberOfKinks());
-    evTag->SetNumOfPMDTracks(esd->GetNumberOfPmdTracks());
-    
-    evTag->SetNumOfProtons(nProtons);
-    evTag->SetNumOfKaons(nKaons);
-    evTag->SetNumOfPions(nPions);
-    evTag->SetNumOfMuons(nMuons);
-    evTag->SetNumOfFWMuons(nFWMuons);
-    evTag->SetNumOfFWMatchedMuons(nFWMatchedMuons);
-    evTag->SetNumOfElectrons(nElectrons);
-    evTag->SetNumOfPhotons(nGamas);
-    evTag->SetNumOfPi0s(nPi0s);
-    evTag->SetNumOfNeutrons(nNeutrons);
-    evTag->SetNumOfKaon0s(nK0s);
-    
-    evTag->SetNumOfChargedAbove1GeV(nCh1GeV);
-    evTag->SetNumOfChargedAbove3GeV(nCh3GeV);
-    evTag->SetNumOfChargedAbove10GeV(nCh10GeV);
-    evTag->SetNumOfMuonsAbove1GeV(nMu1GeV);
-    evTag->SetNumOfMuonsAbove3GeV(nMu3GeV);
-    evTag->SetNumOfMuonsAbove10GeV(nMu10GeV);
-    evTag->SetNumOfElectronsAbove1GeV(nEl1GeV);
-    evTag->SetNumOfElectronsAbove3GeV(nEl3GeV);
-    evTag->SetNumOfElectronsAbove10GeV(nEl10GeV);
-    
-    tmp.Clear();
-    evTag->SetNumOfPHOSClusters(esd->GetPHOSClusters(&tmp));
-    tmp.Clear();
-    evTag->SetNumOfEMCALClusters(esd->GetEMCALClusters(&tmp));
-    
-    evTag->SetTotalMomentum(totalP);
-    evTag->SetMeanPt(meanPt);
-    evTag->SetMaxPt(maxPt);
-    evTag->SetEtaMaxPt(etamaxPt);
-    evTag->SetPhiMaxPt(phimaxPt);
+//     evTag->SetVertexX(vertexIn->GetXv());
+//     evTag->SetVertexY(vertexIn->GetYv());
+//     evTag->SetVertexZ(vertexIn->GetZv());
+//     evTag->SetVertexZError(vertexIn->GetZRes());
+//     evTag->SetVertexFlag(fVertexflag);
+    
+//     evTag->SetT0VertexZ(esd->GetT0zVertex());
+    
+//     evTag->SetTriggerMask(esd->GetTriggerMask());
+//     evTag->SetTriggerCluster(esd->GetTriggerCluster());
+    
+//     evTag->SetEventType(esd->GetEventType());
+//     evTag->SetFiredTriggerClasses(esd->GetFiredTriggerClasses());
+
+//     evTag->SetZDCNeutron1Energy(esd->GetZDCN1Energy());
+//     evTag->SetZDCProton1Energy(esd->GetZDCP1Energy());
+//     evTag->SetZDCEMEnergy(esd->GetZDCEMEnergy(0),esd->GetZDCEMEnergy(1));
+//     evTag->SetZDCNeutron1Energy(esd->GetZDCN2Energy());
+//     evTag->SetZDCProton1Energy(esd->GetZDCP2Energy());
+//     evTag->SetNumOfParticipants(esd->GetZDCParticipants());
+    
+    
+//     evTag->SetNumOfTracks(esd->GetNumberOfTracks());
+//     evTag->SetNumOfPosTracks(nPos);
+//     evTag->SetNumOfNegTracks(nNeg);
+//     evTag->SetNumOfNeutrTracks(nNeutr);
+    
+//     evTag->SetNumOfV0s(esd->GetNumberOfV0s());
+//     evTag->SetNumOfCascades(esd->GetNumberOfCascades());
+//     evTag->SetNumOfKinks(esd->GetNumberOfKinks());
+//     evTag->SetNumOfPMDTracks(esd->GetNumberOfPmdTracks());
+    
+//     evTag->SetNumOfProtons(nProtons);
+//     evTag->SetNumOfKaons(nKaons);
+//     evTag->SetNumOfPions(nPions);
+//     evTag->SetNumOfMuons(nMuons);
+//     evTag->SetNumOfFWMuons(nFWMuons);
+//     evTag->SetNumOfFWMatchedMuons(nFWMatchedMuons);
+//     evTag->SetNumOfElectrons(nElectrons);
+//     evTag->SetNumOfPhotons(nGamas);
+//     evTag->SetNumOfPi0s(nPi0s);
+//     evTag->SetNumOfNeutrons(nNeutrons);
+//     evTag->SetNumOfKaon0s(nK0s);
+    
+//     evTag->SetNumOfChargedAbove1GeV(nCh1GeV);
+//     evTag->SetNumOfChargedAbove3GeV(nCh3GeV);
+//     evTag->SetNumOfChargedAbove10GeV(nCh10GeV);
+//     evTag->SetNumOfMuonsAbove1GeV(nMu1GeV);
+//     evTag->SetNumOfMuonsAbove3GeV(nMu3GeV);
+//     evTag->SetNumOfMuonsAbove10GeV(nMu10GeV);
+//     evTag->SetNumOfElectronsAbove1GeV(nEl1GeV);
+//     evTag->SetNumOfElectronsAbove3GeV(nEl3GeV);
+//     evTag->SetNumOfElectronsAbove10GeV(nEl10GeV);
+    
+//     tmp.Clear();
+//     evTag->SetNumOfPHOSClusters(esd->GetPHOSClusters(&tmp));
+//     tmp.Clear();
+//     evTag->SetNumOfEMCALClusters(esd->GetEMCALClusters(&tmp));
+    
+//     evTag->SetTotalMomentum(totalP);
+//     evTag->SetMeanPt(meanPt);
+//     evTag->SetMaxPt(maxPt);
+//     evTag->SetEtaMaxPt(etamaxPt);
+//     evTag->SetPhiMaxPt(phimaxPt);
     
     tag->SetRunId(iInitRunNumber);
-    if(fIsSim) tag->SetDataType(0);
-    else tag->SetDataType(1);
+//     if(fIsSim) tag->SetDataType(0);
+//     else tag->SetDataType(1);
 
     if(fguid != fTempGuid) {
       fTempGuid = fguid;
@@ -582,35 +552,35 @@ void AliESDTagCreator::CreateTag(TFile* file, const char *guid, const char *md5,
   /////////////
   //muon code//
   ////////////
-  Double_t fMUONMASS = 0.105658369;
+    //  Double_t fMUONMASS = 0.105658369;
   //Variables
-  Double_t fX,fY,fZ ;
-  Double_t fThetaX, fThetaY, fPyz, fChisquare;
-  Double_t fPxRec, fPyRec, fPzRec, fEnergy;
-  Int_t fCharge;
-  TLorentzVector fEPvector;
-
-  Float_t fLowPtCut = 1.0;
-  Float_t fHighPtCut = 3.0;
-  Float_t fVeryHighPtCut = 10.0;
+//   Double_t fX,fY,fZ ;
+//   Double_t fThetaX, fThetaY, fPyz, fChisquare;
+//   Double_t fPxRec, fPyRec, fPzRec, fEnergy;
+//   Int_t fCharge;
+//   TLorentzVector fEPvector;
+
+//   Float_t fLowPtCut = 1.0;
+//   Float_t fHighPtCut = 3.0;
+//   Float_t fVeryHighPtCut = 10.0;
   ////////////
 
-  Double_t partFrac[5] = {0.01, 0.01, 0.85, 0.10, 0.05};
+//   Double_t partFrac[5] = {0.01, 0.01, 0.85, 0.10, 0.05};
 
   // Creates the tags for all the events in a given ESD file
   Bool_t fIsSim = kTRUE;
-  Int_t ntrack;
-  Int_t nProtons, nKaons, nPions, nMuons, nElectrons, nFWMuons, nFWMatchedMuons;
-  Int_t nPos, nNeg, nNeutr;
-  Int_t nK0s, nNeutrons, nPi0s, nGamas;
-  Int_t nCh1GeV, nCh3GeV, nCh10GeV;
-  Int_t nMu1GeV, nMu3GeV, nMu10GeV;
-  Int_t nEl1GeV, nEl3GeV, nEl10GeV;
-  Float_t maxPt = .0, etamaxPt = -999., phimaxPt = -999., meanPt = .0, totalP = .0;
-  Int_t fVertexflag;
+//   Int_t ntrack;
+//   Int_t nProtons, nKaons, nPions, nMuons, nElectrons, nFWMuons, nFWMatchedMuons;
+//   Int_t nPos, nNeg, nNeutr;
+//   Int_t nK0s, nNeutrons, nPi0s, nGamas;
+//   Int_t nCh1GeV, nCh3GeV, nCh10GeV;
+//   Int_t nMu1GeV, nMu3GeV, nMu10GeV;
+//   Int_t nEl1GeV, nEl3GeV, nEl10GeV;
+//   Float_t maxPt = .0, etamaxPt = -999., phimaxPt = -999., meanPt = .0, totalP = .0;
+//   Int_t fVertexflag;
   Int_t iRunNumber = 0;
-  TString fVertexName;
-  TRefArray tmp;
+//   TString fVertexName;
+//   TRefArray tmp;
 
   AliRunTag *tag = new AliRunTag();
   AliEventTag *evTag = new AliEventTag();
@@ -637,243 +607,244 @@ void AliESDTagCreator::CreateTag(TFile* file, const char *guid, const char *md5,
 
   Int_t iNumberOfEvents = (Int_t)t->GetEntries();
   for (Int_t iEventNumber = 0; iEventNumber < iNumberOfEvents; iEventNumber++) {
-    ntrack = 0;
-    nPos = 0;
-    nNeg = 0;
-    nNeutr =0;
-    nK0s = 0;
-    nNeutrons = 0;
-    nPi0s = 0;
-    nGamas = 0;
-    nProtons = 0;
-    nKaons = 0;
-    nPions = 0;
-    nMuons = 0;
-    nFWMuons = 0;
-    nFWMatchedMuons = 0;
-    nElectrons = 0;      
-    nCh1GeV = 0;
-    nCh3GeV = 0;
-    nCh10GeV = 0;
-    nMu1GeV = 0;
-    nMu3GeV = 0;
-    nMu10GeV = 0;
-    nEl1GeV = 0;
-    nEl3GeV = 0;
-    nEl10GeV = 0;
-    maxPt = .0;
-    etamaxPt = -999.;
-    phimaxPt = -999.;
-    meanPt = .0;
-    totalP = .0;
-    fVertexflag = 1;
-    
-    t->GetEntry(iEventNumber);
+    FillEventTag(t, evTag, iEventNumber, esd);
+//     ntrack = 0;
+//     nPos = 0;
+//     nNeg = 0;
+//     nNeutr =0;
+//     nK0s = 0;
+//     nNeutrons = 0;
+//     nPi0s = 0;
+//     nGamas = 0;
+//     nProtons = 0;
+//     nKaons = 0;
+//     nPions = 0;
+//     nMuons = 0;
+//     nFWMuons = 0;
+//     nFWMatchedMuons = 0;
+//     nElectrons = 0;   
+//     nCh1GeV = 0;
+//     nCh3GeV = 0;
+//     nCh10GeV = 0;
+//     nMu1GeV = 0;
+//     nMu3GeV = 0;
+//     nMu10GeV = 0;
+//     nEl1GeV = 0;
+//     nEl3GeV = 0;
+//     nEl10GeV = 0;
+//     maxPt = .0;
+//     etamaxPt = -999.;
+//     phimaxPt = -999.;
+//     meanPt = .0;
+//     totalP = .0;
+//     fVertexflag = 1;
+    
+//     t->GetEntry(iEventNumber);
     iRunNumber = esd->GetRunNumber();
     if(iRunNumber != iInitRunNumber) AliFatal("Inconsistency of run numbers in the AliESD!!!");
-    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);
-      if(esdTrack->GetLabel() != 0) fIsSim = kTRUE;
-      else if(esdTrack->GetLabel() == 0) fIsSim = kFALSE;
-      UInt_t status = esdTrack->GetStatus();
+//     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);
+//       if(esdTrack->GetLabel() != 0) fIsSim = kTRUE;
+//       else if(esdTrack->GetLabel() == 0) fIsSim = kFALSE;
+//       UInt_t status = esdTrack->GetStatus();
       
-      //select only tracks with ITS refit
-      if ((status&AliESDtrack::kITSrefit)==0) continue;
-      //select only tracks with TPC refit
-      if ((status&AliESDtrack::kTPCrefit)==0) continue;
+//       //select only tracks with ITS refit
+//       if ((status&AliESDtrack::kITSrefit)==0) continue;
+//       //select only tracks with TPC refit
+//       if ((status&AliESDtrack::kTPCrefit)==0) continue;
       
-      //select only tracks with the "combined PID"
-      if ((status&AliESDtrack::kESDpid)==0) continue;
-      Double_t p[3];
-      esdTrack->GetPxPyPz(p);
-      Double_t pt2 = p[0]*p[0]+p[1]*p[1];
-      Double_t momentum = TMath::Sqrt(pt2+p[2]*p[2]);
-      Double_t fPt = TMath::Sqrt(pt2);
-      totalP += momentum;
-      meanPt += fPt;
-      if(fPt > maxPt) {
-         maxPt = fPt;
-         etamaxPt = esdTrack->Eta();
-         phimaxPt = esdTrack->Phi();
-      }
+//       //select only tracks with the "combined PID"
+//       if ((status&AliESDtrack::kESDpid)==0) continue;
+//       Double_t p[3];
+//       esdTrack->GetPxPyPz(p);
+//       Double_t pt2 = p[0]*p[0]+p[1]*p[1];
+//       Double_t momentum = TMath::Sqrt(pt2+p[2]*p[2]);
+//       Double_t fPt = TMath::Sqrt(pt2);
+//       totalP += momentum;
+//       meanPt += fPt;
+//       if(fPt > maxPt) {
+//       maxPt = fPt;
+//       etamaxPt = esdTrack->Eta();
+//       phimaxPt = esdTrack->Phi();
+//       }
       
              
-      if(esdTrack->GetSign() > 0) {
-       nPos++;
-       if(fPt > fLowPtCut) nCh1GeV++;
-       if(fPt > fHighPtCut) nCh3GeV++;
-       if(fPt > fVeryHighPtCut) nCh10GeV++;
-      }
-      if(esdTrack->GetSign() < 0) {
-       nNeg++;
-       if(fPt > fLowPtCut) nCh1GeV++;
-       if(fPt > fHighPtCut) nCh3GeV++;
-       if(fPt > fVeryHighPtCut) nCh10GeV++;
-      }
-      if(esdTrack->GetSign() == 0) nNeutr++;
+//       if(esdTrack->GetSign() > 0) {
+//     nPos++;
+//     if(fPt > fLowPtCut) nCh1GeV++;
+//     if(fPt > fHighPtCut) nCh3GeV++;
+//     if(fPt > fVeryHighPtCut) nCh10GeV++;
+//       }
+//       if(esdTrack->GetSign() < 0) {
+//     nNeg++;
+//     if(fPt > fLowPtCut) nCh1GeV++;
+//     if(fPt > fHighPtCut) nCh3GeV++;
+//     if(fPt > fVeryHighPtCut) nCh10GeV++;
+//       }
+//       if(esdTrack->GetSign() == 0) nNeutr++;
       
-      //PID
-      Double_t prob[5];
-      esdTrack->GetESDpid(prob);
+//       //PID
+//       Double_t prob[5];
+//       esdTrack->GetESDpid(prob);
       
-      Double_t rcc = 0.0;
-      for(Int_t i = 0; i < AliPID::kSPECIES; i++) rcc += prob[i]*partFrac[i];
-      if(rcc == 0.0) continue;
-      //Bayes' formula
-      Double_t w[5];
-      for(Int_t i = 0; i < AliPID::kSPECIES; i++) w[i] = prob[i]*partFrac[i]/rcc;
+//       Double_t rcc = 0.0;
+//       for(Int_t i = 0; i < AliPID::kSPECIES; i++) rcc += prob[i]*partFrac[i];
+//       if(rcc == 0.0) continue;
+//       //Bayes' formula
+//       Double_t w[5];
+//       for(Int_t i = 0; i < AliPID::kSPECIES; i++) w[i] = prob[i]*partFrac[i]/rcc;
       
-      //protons
-      if ((w[4]>w[3])&&(w[4]>w[2])&&(w[4]>w[1])&&(w[4]>w[0])) nProtons++;
-      //kaons
-      if ((w[3]>w[4])&&(w[3]>w[2])&&(w[3]>w[1])&&(w[3]>w[0])) nKaons++;
-      //pions
-      if ((w[2]>w[4])&&(w[2]>w[3])&&(w[2]>w[1])&&(w[2]>w[0])) nPions++; 
-      //electrons
-      if ((w[0]>w[4])&&(w[0]>w[3])&&(w[0]>w[2])&&(w[0]>w[1])) {
-       nElectrons++;
-       if(fPt > fLowPtCut) nEl1GeV++;
-       if(fPt > fHighPtCut) nEl3GeV++;
-       if(fPt > fVeryHighPtCut) nEl10GeV++;
-      }          
-      ntrack++;
-    }//esd track loop
-    
-    /////////////
-    //muon code//
-    ////////////
-    Int_t nMuonTracks = esd->GetNumberOfMuonTracks();
-    // loop over all reconstructed tracks (also first track of combination)
-    for (Int_t iTrack = 0; iTrack <  nMuonTracks;  iTrack++) {
-      AliESDMuonTrack* muonTrack = esd->GetMuonTrack(iTrack);
-      if (muonTrack == 0x0) continue;
+//       //protons
+//       if ((w[4]>w[3])&&(w[4]>w[2])&&(w[4]>w[1])&&(w[4]>w[0])) nProtons++;
+//       //kaons
+//       if ((w[3]>w[4])&&(w[3]>w[2])&&(w[3]>w[1])&&(w[3]>w[0])) nKaons++;
+//       //pions
+//       if ((w[2]>w[4])&&(w[2]>w[3])&&(w[2]>w[1])&&(w[2]>w[0])) nPions++; 
+//       //electrons
+//       if ((w[0]>w[4])&&(w[0]>w[3])&&(w[0]>w[2])&&(w[0]>w[1])) {
+//     nElectrons++;
+//     if(fPt > fLowPtCut) nEl1GeV++;
+//     if(fPt > fHighPtCut) nEl3GeV++;
+//     if(fPt > fVeryHighPtCut) nEl10GeV++;
+//       }       
+//       ntrack++;
+//     }//esd track loop
+    
+//     /////////////
+//     //muon code//
+//     ////////////
+//     Int_t nMuonTracks = esd->GetNumberOfMuonTracks();
+//     // loop over all reconstructed tracks (also first track of combination)
+//     for (Int_t iTrack = 0; iTrack <  nMuonTracks;  iTrack++) {
+//       AliESDMuonTrack* muonTrack = esd->GetMuonTrack(iTrack);
+//       if (muonTrack == 0x0) continue;
       
-      // Coordinates at vertex
-      fZ = muonTrack->GetZ(); 
-      fY = muonTrack->GetBendingCoor();
-      fX = muonTrack->GetNonBendingCoor(); 
+//       // Coordinates at vertex
+//       fZ = muonTrack->GetZ(); 
+//       fY = muonTrack->GetBendingCoor();
+//       fX = muonTrack->GetNonBendingCoor(); 
       
-      fThetaX = muonTrack->GetThetaX();
-      fThetaY = muonTrack->GetThetaY();
+//       fThetaX = muonTrack->GetThetaX();
+//       fThetaY = muonTrack->GetThetaY();
       
-      fPyz = 1./TMath::Abs(muonTrack->GetInverseBendingMomentum());
-      fPzRec = - fPyz / TMath::Sqrt(1.0 + TMath::Tan(fThetaY)*TMath::Tan(fThetaY));
-      fPxRec = fPzRec * TMath::Tan(fThetaX);
-      fPyRec = fPzRec * TMath::Tan(fThetaY);
-      fCharge = Int_t(TMath::Sign(1.,muonTrack->GetInverseBendingMomentum()));
+//       fPyz = 1./TMath::Abs(muonTrack->GetInverseBendingMomentum());
+//       fPzRec = - fPyz / TMath::Sqrt(1.0 + TMath::Tan(fThetaY)*TMath::Tan(fThetaY));
+//       fPxRec = fPzRec * TMath::Tan(fThetaX);
+//       fPyRec = fPzRec * TMath::Tan(fThetaY);
+//       fCharge = Int_t(TMath::Sign(1.,muonTrack->GetInverseBendingMomentum()));
       
-      //ChiSquare of the track if needed
-      fChisquare = muonTrack->GetChi2()/(2.0 * muonTrack->GetNHit() - 5);
-      fEnergy = TMath::Sqrt(fMUONMASS * fMUONMASS + fPxRec * fPxRec + fPyRec * fPyRec + fPzRec * fPzRec);
-      fEPvector.SetPxPyPzE(fPxRec, fPyRec, fPzRec, fEnergy);
+//       //ChiSquare of the track if needed
+//       fChisquare = muonTrack->GetChi2()/(2.0 * muonTrack->GetNHit() - 5);
+//       fEnergy = TMath::Sqrt(fMUONMASS * fMUONMASS + fPxRec * fPxRec + fPyRec * fPyRec + fPzRec * fPzRec);
+//       fEPvector.SetPxPyPzE(fPxRec, fPyRec, fPzRec, fEnergy);
       
-      if (muonTrack->GetMatchTrigger()>0) nFWMatchedMuons++;
+//       if (muonTrack->GetMatchTrigger()>0) nFWMatchedMuons++;
       
-      nMuons++;
-      nFWMuons++;
-      if(fEPvector.Pt() > fLowPtCut) {
-        nMu1GeV++; 
-        if(fEPvector.Pt() > fHighPtCut) {
-          nMu3GeV++; 
-          if (fEPvector.Pt() > fVeryHighPtCut) {
-            nMu10GeV++;
-          }
-        }
-      }
-    }//muon track loop
+//       nMuons++;
+//       nFWMuons++;
+//       if(fEPvector.Pt() > fLowPtCut) {
+//         nMu1GeV++; 
+//         if(fEPvector.Pt() > fHighPtCut) {
+//           nMu3GeV++; 
+//           if (fEPvector.Pt() > fVeryHighPtCut) {
+//             nMu10GeV++;
+//           }
+//         }
+//       }
+//     }//muon track loop
     
-    // Fill the event tags 
-    if(ntrack != 0) meanPt = meanPt/ntrack;
+//     // Fill the event tags 
+//     if(ntrack != 0) meanPt = meanPt/ntrack;
     
-    //First physics data
-    const AliMultiplicity *spdMult = esd->GetMultiplicity();
-    evTag->SetNumberOfFiredChipsLayer1(spdMult->GetNumberOfFiredChips(0));
-    evTag->SetNumberOfFiredChipsLayer2(spdMult->GetNumberOfFiredChips(1));
-    evTag->SetNumberOfSPDTracklets(spdMult->GetNumberOfTracklets());
-
-    AliESDVZERO *vzeroData = esd->GetVZEROData();
-    evTag->SetMTotV0A(vzeroData->GetMTotV0A());
-    evTag->SetMTotV0C(vzeroData->GetMTotV0C());
-    evTag->SetNbPMV0A(vzeroData->GetNbPMV0A());
-    evTag->SetNbPMV0C(vzeroData->GetNbPMV0C());
-
-    //evTag->SetEventId(iEventNumber+1);
-    evTag->SetPeriodNumber(esd->GetPeriodNumber());
-    evTag->SetOrbitNumber(esd->GetOrbitNumber());
-    evTag->SetBunchCrossNumber(esd->GetBunchCrossNumber());
-
-    evTag->SetGUID(fguid);
+//     //First physics data
+//     const AliMultiplicity *spdMult = esd->GetMultiplicity();
+//     evTag->SetNumberOfFiredChipsLayer1(spdMult->GetNumberOfFiredChips(0));
+//     evTag->SetNumberOfFiredChipsLayer2(spdMult->GetNumberOfFiredChips(1));
+//     evTag->SetNumberOfSPDTracklets(spdMult->GetNumberOfTracklets());
+
+//     AliESDVZERO *vzeroData = esd->GetVZEROData();
+//     evTag->SetMTotV0A(vzeroData->GetMTotV0A());
+//     evTag->SetMTotV0C(vzeroData->GetMTotV0C());
+//     evTag->SetNbPMV0A(vzeroData->GetNbPMV0A());
+//     evTag->SetNbPMV0C(vzeroData->GetNbPMV0C());
+
+//     //evTag->SetEventId(iEventNumber+1);
+//     evTag->SetPeriodNumber(esd->GetPeriodNumber());
+//     evTag->SetOrbitNumber(esd->GetOrbitNumber());
+//     evTag->SetBunchCrossNumber(esd->GetBunchCrossNumber());
+
+//     evTag->SetGUID(fguid);
     evTag->SetMD5(fmd5);
     evTag->SetTURL(fturl);
     evTag->SetSize(size);
-    evTag->SetVertexX(vertexIn->GetXv());
-    evTag->SetVertexY(vertexIn->GetYv());
-    evTag->SetVertexZ(vertexIn->GetZv());
-    evTag->SetVertexZError(vertexIn->GetZRes());
-    evTag->SetVertexFlag(fVertexflag);
-    
-    evTag->SetT0VertexZ(esd->GetT0zVertex());
-    
-    evTag->SetTriggerMask(esd->GetTriggerMask());
-    evTag->SetTriggerCluster(esd->GetTriggerCluster());
-    
-    evTag->SetEventType(esd->GetEventType());
-    evTag->SetFiredTriggerClasses(esd->GetFiredTriggerClasses());
-
-    evTag->SetZDCNeutron1Energy(esd->GetZDCN1Energy());
-    evTag->SetZDCProton1Energy(esd->GetZDCP1Energy());
-    evTag->SetZDCEMEnergy(esd->GetZDCEMEnergy(0),esd->GetZDCEMEnergy(1));
-    evTag->SetZDCNeutron1Energy(esd->GetZDCN2Energy());
-    evTag->SetZDCProton1Energy(esd->GetZDCP2Energy());
-    evTag->SetNumOfParticipants(esd->GetZDCParticipants());
-    
-    
-    evTag->SetNumOfTracks(esd->GetNumberOfTracks());
-    evTag->SetNumOfPosTracks(nPos);
-    evTag->SetNumOfNegTracks(nNeg);
-    evTag->SetNumOfNeutrTracks(nNeutr);
-    
-    evTag->SetNumOfV0s(esd->GetNumberOfV0s());
-    evTag->SetNumOfCascades(esd->GetNumberOfCascades());
-    evTag->SetNumOfKinks(esd->GetNumberOfKinks());
-    evTag->SetNumOfPMDTracks(esd->GetNumberOfPmdTracks());
-    
-    evTag->SetNumOfProtons(nProtons);
-    evTag->SetNumOfKaons(nKaons);
-    evTag->SetNumOfPions(nPions);
-    evTag->SetNumOfMuons(nMuons);
-    evTag->SetNumOfFWMuons(nFWMuons);
-    evTag->SetNumOfFWMatchedMuons(nFWMatchedMuons);
-    evTag->SetNumOfElectrons(nElectrons);
-    evTag->SetNumOfPhotons(nGamas);
-    evTag->SetNumOfPi0s(nPi0s);
-    evTag->SetNumOfNeutrons(nNeutrons);
-    evTag->SetNumOfKaon0s(nK0s);
-    
-    evTag->SetNumOfChargedAbove1GeV(nCh1GeV);
-    evTag->SetNumOfChargedAbove3GeV(nCh3GeV);
-    evTag->SetNumOfChargedAbove10GeV(nCh10GeV);
-    evTag->SetNumOfMuonsAbove1GeV(nMu1GeV);
-    evTag->SetNumOfMuonsAbove3GeV(nMu3GeV);
-    evTag->SetNumOfMuonsAbove10GeV(nMu10GeV);
-    evTag->SetNumOfElectronsAbove1GeV(nEl1GeV);
-    evTag->SetNumOfElectronsAbove3GeV(nEl3GeV);
-    evTag->SetNumOfElectronsAbove10GeV(nEl10GeV);
-    
-    tmp.Clear();
-    evTag->SetNumOfPHOSClusters(esd->GetPHOSClusters(&tmp));
-    tmp.Clear();
-    evTag->SetNumOfEMCALClusters(esd->GetEMCALClusters(&tmp));
-    
-    evTag->SetTotalMomentum(totalP);
-    evTag->SetMeanPt(meanPt);
-    evTag->SetMaxPt(maxPt);
-    evTag->SetEtaMaxPt(etamaxPt);
-    evTag->SetPhiMaxPt(phimaxPt);
+//     evTag->SetVertexX(vertexIn->GetXv());
+//     evTag->SetVertexY(vertexIn->GetYv());
+//     evTag->SetVertexZ(vertexIn->GetZv());
+//     evTag->SetVertexZError(vertexIn->GetZRes());
+//     evTag->SetVertexFlag(fVertexflag);
+    
+//     evTag->SetT0VertexZ(esd->GetT0zVertex());
+    
+//     evTag->SetTriggerMask(esd->GetTriggerMask());
+//     evTag->SetTriggerCluster(esd->GetTriggerCluster());
+    
+//     evTag->SetEventType(esd->GetEventType());
+//     evTag->SetFiredTriggerClasses(esd->GetFiredTriggerClasses());
+
+//     evTag->SetZDCNeutron1Energy(esd->GetZDCN1Energy());
+//     evTag->SetZDCProton1Energy(esd->GetZDCP1Energy());
+//     evTag->SetZDCEMEnergy(esd->GetZDCEMEnergy(0),esd->GetZDCEMEnergy(1));
+//     evTag->SetZDCNeutron1Energy(esd->GetZDCN2Energy());
+//     evTag->SetZDCProton1Energy(esd->GetZDCP2Energy());
+//     evTag->SetNumOfParticipants(esd->GetZDCParticipants());
+    
+    
+//     evTag->SetNumOfTracks(esd->GetNumberOfTracks());
+//     evTag->SetNumOfPosTracks(nPos);
+//     evTag->SetNumOfNegTracks(nNeg);
+//     evTag->SetNumOfNeutrTracks(nNeutr);
+    
+//     evTag->SetNumOfV0s(esd->GetNumberOfV0s());
+//     evTag->SetNumOfCascades(esd->GetNumberOfCascades());
+//     evTag->SetNumOfKinks(esd->GetNumberOfKinks());
+//     evTag->SetNumOfPMDTracks(esd->GetNumberOfPmdTracks());
+    
+//     evTag->SetNumOfProtons(nProtons);
+//     evTag->SetNumOfKaons(nKaons);
+//     evTag->SetNumOfPions(nPions);
+//     evTag->SetNumOfMuons(nMuons);
+//     evTag->SetNumOfFWMuons(nFWMuons);
+//     evTag->SetNumOfFWMatchedMuons(nFWMatchedMuons);
+//     evTag->SetNumOfElectrons(nElectrons);
+//     evTag->SetNumOfPhotons(nGamas);
+//     evTag->SetNumOfPi0s(nPi0s);
+//     evTag->SetNumOfNeutrons(nNeutrons);
+//     evTag->SetNumOfKaon0s(nK0s);
+    
+//     evTag->SetNumOfChargedAbove1GeV(nCh1GeV);
+//     evTag->SetNumOfChargedAbove3GeV(nCh3GeV);
+//     evTag->SetNumOfChargedAbove10GeV(nCh10GeV);
+//     evTag->SetNumOfMuonsAbove1GeV(nMu1GeV);
+//     evTag->SetNumOfMuonsAbove3GeV(nMu3GeV);
+//     evTag->SetNumOfMuonsAbove10GeV(nMu10GeV);
+//     evTag->SetNumOfElectronsAbove1GeV(nEl1GeV);
+//     evTag->SetNumOfElectronsAbove3GeV(nEl3GeV);
+//     evTag->SetNumOfElectronsAbove10GeV(nEl10GeV);
+    
+//     tmp.Clear();
+//     evTag->SetNumOfPHOSClusters(esd->GetPHOSClusters(&tmp));
+//     tmp.Clear();
+//     evTag->SetNumOfEMCALClusters(esd->GetEMCALClusters(&tmp));
+    
+//     evTag->SetTotalMomentum(totalP);
+//     evTag->SetMeanPt(meanPt);
+//     evTag->SetMaxPt(maxPt);
+//     evTag->SetEtaMaxPt(etamaxPt);
+//     evTag->SetPhiMaxPt(phimaxPt);
     
     tag->SetRunId(iInitRunNumber);
     if(fIsSim) tag->SetDataType(0);
@@ -938,35 +909,35 @@ void AliESDTagCreator::CreateTag(TFile* file, const char *filepath, Int_t Counte
   /////////////
   //muon code//
   ////////////
-  Double_t fMUONMASS = 0.105658369;
+  //  Double_t fMUONMASS = 0.105658369;
   //Variables
-  Double_t fX,fY,fZ ;
-  Double_t fThetaX, fThetaY, fPyz, fChisquare;
-  Double_t fPxRec, fPyRec, fPzRec, fEnergy;
-  Int_t fCharge;
-  TLorentzVector fEPvector;
-
-  Float_t fLowPtCut = 1.0;
-  Float_t fHighPtCut = 3.0;
-  Float_t fVeryHighPtCut = 10.0;
+//   Double_t fX,fY,fZ ;
+//   Double_t fThetaX, fThetaY, fPyz, fChisquare;
+//   Double_t fPxRec, fPyRec, fPzRec, fEnergy;
+//   Int_t fCharge;
+//   TLorentzVector fEPvector;
+
+//   Float_t fLowPtCut = 1.0;
+//   Float_t fHighPtCut = 3.0;
+//   Float_t fVeryHighPtCut = 10.0;
   ////////////
 
-  Double_t partFrac[5] = {0.01, 0.01, 0.85, 0.10, 0.05};
+//   Double_t partFrac[5] = {0.01, 0.01, 0.85, 0.10, 0.05};
 
   // Creates the tags for all the events in a given ESD file
-  Bool_t fIsSim = kTRUE;
-  Int_t ntrack;
-  Int_t nProtons, nKaons, nPions, nMuons, nElectrons, nFWMuons, nFWMatchedMuons;
-  Int_t nPos, nNeg, nNeutr;
-  Int_t nK0s, nNeutrons, nPi0s, nGamas;
-  Int_t nCh1GeV, nCh3GeV, nCh10GeV;
-  Int_t nMu1GeV, nMu3GeV, nMu10GeV;
-  Int_t nEl1GeV, nEl3GeV, nEl10GeV;
-  Float_t maxPt = .0, etamaxPt = -999, phimaxPt = -999., meanPt = .0, totalP = .0;
-  Int_t fVertexflag;
+//   Bool_t fIsSim = kTRUE;
+//   Int_t ntrack;
+//   Int_t nProtons, nKaons, nPions, nMuons, nElectrons, nFWMuons, nFWMatchedMuons;
+//   Int_t nPos, nNeg, nNeutr;
+//   Int_t nK0s, nNeutrons, nPi0s, nGamas;
+//   Int_t nCh1GeV, nCh3GeV, nCh10GeV;
+//   Int_t nMu1GeV, nMu3GeV, nMu10GeV;
+//   Int_t nEl1GeV, nEl3GeV, nEl10GeV;
+//   Float_t maxPt = .0, etamaxPt = -999, phimaxPt = -999., meanPt = .0, totalP = .0;
+//   Int_t fVertexflag;
   Int_t iRunNumber = 0;
-  TString fVertexName;
-  TRefArray tmp;
+//   TString fVertexName;
+//   TRefArray tmp;
 
   AliRunTag *tag = new AliRunTag();
   AliEventTag *evTag = new AliEventTag();
@@ -987,244 +958,245 @@ void AliESDTagCreator::CreateTag(TFile* file, const char *filepath, Int_t Counte
 
   Int_t iNumberOfEvents = (Int_t)t->GetEntries();
   for (Int_t iEventNumber = 0; iEventNumber < iNumberOfEvents; iEventNumber++) {
-    ntrack = 0;
-    nPos = 0;
-    nNeg = 0;
-    nNeutr =0;
-    nK0s = 0;
-    nNeutrons = 0;
-    nPi0s = 0;
-    nGamas = 0;
-    nProtons = 0;
-    nKaons = 0;
-    nPions = 0;
-    nMuons = 0;
-    nFWMuons = 0;
-    nFWMatchedMuons = 0;
-    nElectrons = 0;      
-    nCh1GeV = 0;
-    nCh3GeV = 0;
-    nCh10GeV = 0;
-    nMu1GeV = 0;
-    nMu3GeV = 0;
-    nMu10GeV = 0;
-    nEl1GeV = 0;
-    nEl3GeV = 0;
-    nEl10GeV = 0;
-    maxPt = .0;
-    etamaxPt = -999.;
-    phimaxPt = -999.;
-    meanPt = .0;
-    totalP = .0;
-    fVertexflag = 1;
-    
-    t->GetEntry(iEventNumber);
+    FillEventTag(t, evTag, iEventNumber, esd);
+//     ntrack = 0;
+//     nPos = 0;
+//     nNeg = 0;
+//     nNeutr =0;
+//     nK0s = 0;
+//     nNeutrons = 0;
+//     nPi0s = 0;
+//     nGamas = 0;
+//     nProtons = 0;
+//     nKaons = 0;
+//     nPions = 0;
+//     nMuons = 0;
+//     nFWMuons = 0;
+//     nFWMatchedMuons = 0;
+//     nElectrons = 0;   
+//     nCh1GeV = 0;
+//     nCh3GeV = 0;
+//     nCh10GeV = 0;
+//     nMu1GeV = 0;
+//     nMu3GeV = 0;
+//     nMu10GeV = 0;
+//     nEl1GeV = 0;
+//     nEl3GeV = 0;
+//     nEl10GeV = 0;
+//     maxPt = .0;
+//     etamaxPt = -999.;
+//     phimaxPt = -999.;
+//     meanPt = .0;
+//     totalP = .0;
+//     fVertexflag = 1;
+    
+//     t->GetEntry(iEventNumber);
     iRunNumber = esd->GetRunNumber();
     if(iRunNumber != iInitRunNumber) AliFatal("Inconsistency of run numbers in the AliESD!!!");
-    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);
-      if(esdTrack->GetLabel() != 0) fIsSim = kTRUE;
-      else if(esdTrack->GetLabel() == 0) fIsSim = kFALSE;
-      UInt_t status = esdTrack->GetStatus();
+//     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);
+//       if(esdTrack->GetLabel() != 0) fIsSim = kTRUE;
+//       else if(esdTrack->GetLabel() == 0) fIsSim = kFALSE;
+//       UInt_t status = esdTrack->GetStatus();
       
-      //select only tracks with ITS refit
-      if ((status&AliESDtrack::kITSrefit)==0) continue;
-      //select only tracks with TPC refit
-      if ((status&AliESDtrack::kTPCrefit)==0) continue;
+//       //select only tracks with ITS refit
+//       if ((status&AliESDtrack::kITSrefit)==0) continue;
+//       //select only tracks with TPC refit
+//       if ((status&AliESDtrack::kTPCrefit)==0) continue;
       
-      //select only tracks with the "combined PID"
-      if ((status&AliESDtrack::kESDpid)==0) continue;
-      Double_t p[3];
-      esdTrack->GetPxPyPz(p);
-      Double_t pt2 = p[0]*p[0]+p[1]*p[1];
-      Double_t momentum = TMath::Sqrt(pt2+p[2]*p[2]);
-      Double_t fPt = TMath::Sqrt(pt2);
-      totalP += momentum;
-      meanPt += fPt;
-      if(fPt > maxPt) {
-         maxPt = fPt;
-         etamaxPt = esdTrack->Eta();
-         phimaxPt = esdTrack->Phi();
-      }
+//       //select only tracks with the "combined PID"
+//       if ((status&AliESDtrack::kESDpid)==0) continue;
+//       Double_t p[3];
+//       esdTrack->GetPxPyPz(p);
+//       Double_t pt2 = p[0]*p[0]+p[1]*p[1];
+//       Double_t momentum = TMath::Sqrt(pt2+p[2]*p[2]);
+//       Double_t fPt = TMath::Sqrt(pt2);
+//       totalP += momentum;
+//       meanPt += fPt;
+//       if(fPt > maxPt) {
+//       maxPt = fPt;
+//       etamaxPt = esdTrack->Eta();
+//       phimaxPt = esdTrack->Phi();
+//       }
       
       
-      if(esdTrack->GetSign() > 0) {
-       nPos++;
-       if(fPt > fLowPtCut) nCh1GeV++;
-       if(fPt > fHighPtCut) nCh3GeV++;
-       if(fPt > fVeryHighPtCut) nCh10GeV++;
-      }
-      if(esdTrack->GetSign() < 0) {
-       nNeg++;
-       if(fPt > fLowPtCut) nCh1GeV++;
-       if(fPt > fHighPtCut) nCh3GeV++;
-       if(fPt > fVeryHighPtCut) nCh10GeV++;
-      }
-      if(esdTrack->GetSign() == 0) nNeutr++;
+//       if(esdTrack->GetSign() > 0) {
+//     nPos++;
+//     if(fPt > fLowPtCut) nCh1GeV++;
+//     if(fPt > fHighPtCut) nCh3GeV++;
+//     if(fPt > fVeryHighPtCut) nCh10GeV++;
+//       }
+//       if(esdTrack->GetSign() < 0) {
+//     nNeg++;
+//     if(fPt > fLowPtCut) nCh1GeV++;
+//     if(fPt > fHighPtCut) nCh3GeV++;
+//     if(fPt > fVeryHighPtCut) nCh10GeV++;
+//       }
+//       if(esdTrack->GetSign() == 0) nNeutr++;
       
-      //PID
-      Double_t prob[5];
-      esdTrack->GetESDpid(prob);
+//       //PID
+//       Double_t prob[5];
+//       esdTrack->GetESDpid(prob);
       
-      Double_t rcc = 0.0;
-      for(Int_t i = 0; i < AliPID::kSPECIES; i++) rcc += prob[i]*partFrac[i];
-      if(rcc == 0.0) continue;
-      //Bayes' formula
-      Double_t w[5];
-      for(Int_t i = 0; i < AliPID::kSPECIES; i++) w[i] = prob[i]*partFrac[i]/rcc;
+//       Double_t rcc = 0.0;
+//       for(Int_t i = 0; i < AliPID::kSPECIES; i++) rcc += prob[i]*partFrac[i];
+//       if(rcc == 0.0) continue;
+//       //Bayes' formula
+//       Double_t w[5];
+//       for(Int_t i = 0; i < AliPID::kSPECIES; i++) w[i] = prob[i]*partFrac[i]/rcc;
       
-      //protons
-      if ((w[4]>w[3])&&(w[4]>w[2])&&(w[4]>w[1])&&(w[4]>w[0])) nProtons++;
-      //kaons
-      if ((w[3]>w[4])&&(w[3]>w[2])&&(w[3]>w[1])&&(w[3]>w[0])) nKaons++;
-      //pions
-      if ((w[2]>w[4])&&(w[2]>w[3])&&(w[2]>w[1])&&(w[2]>w[0])) nPions++; 
-      //electrons
-      if ((w[0]>w[4])&&(w[0]>w[3])&&(w[0]>w[2])&&(w[0]>w[1])) {
-       nElectrons++;
-       if(fPt > fLowPtCut) nEl1GeV++;
-       if(fPt > fHighPtCut) nEl3GeV++;
-       if(fPt > fVeryHighPtCut) nEl10GeV++;
-      }          
-      ntrack++;
-    }//esd track loop
-    
-    /////////////
-    //muon code//
-    ////////////
-    Int_t nMuonTracks = esd->GetNumberOfMuonTracks();
-    // loop over all reconstructed tracks (also first track of combination)
-    for (Int_t iTrack = 0; iTrack <  nMuonTracks;  iTrack++) {
-      AliESDMuonTrack* muonTrack = esd->GetMuonTrack(iTrack);
-      if (muonTrack == 0x0) continue;
+//       //protons
+//       if ((w[4]>w[3])&&(w[4]>w[2])&&(w[4]>w[1])&&(w[4]>w[0])) nProtons++;
+//       //kaons
+//       if ((w[3]>w[4])&&(w[3]>w[2])&&(w[3]>w[1])&&(w[3]>w[0])) nKaons++;
+//       //pions
+//       if ((w[2]>w[4])&&(w[2]>w[3])&&(w[2]>w[1])&&(w[2]>w[0])) nPions++; 
+//       //electrons
+//       if ((w[0]>w[4])&&(w[0]>w[3])&&(w[0]>w[2])&&(w[0]>w[1])) {
+//     nElectrons++;
+//     if(fPt > fLowPtCut) nEl1GeV++;
+//     if(fPt > fHighPtCut) nEl3GeV++;
+//     if(fPt > fVeryHighPtCut) nEl10GeV++;
+//       }       
+//       ntrack++;
+//     }//esd track loop
+    
+//     /////////////
+//     //muon code//
+//     ////////////
+//     Int_t nMuonTracks = esd->GetNumberOfMuonTracks();
+//     // loop over all reconstructed tracks (also first track of combination)
+//     for (Int_t iTrack = 0; iTrack <  nMuonTracks;  iTrack++) {
+//       AliESDMuonTrack* muonTrack = esd->GetMuonTrack(iTrack);
+//       if (muonTrack == 0x0) continue;
       
-      // Coordinates at vertex
-      fZ = muonTrack->GetZ(); 
-      fY = muonTrack->GetBendingCoor();
-      fX = muonTrack->GetNonBendingCoor(); 
+//       // Coordinates at vertex
+//       fZ = muonTrack->GetZ(); 
+//       fY = muonTrack->GetBendingCoor();
+//       fX = muonTrack->GetNonBendingCoor(); 
       
-      fThetaX = muonTrack->GetThetaX();
-      fThetaY = muonTrack->GetThetaY();
+//       fThetaX = muonTrack->GetThetaX();
+//       fThetaY = muonTrack->GetThetaY();
       
-      fPyz = 1./TMath::Abs(muonTrack->GetInverseBendingMomentum());
-      fPzRec = - fPyz / TMath::Sqrt(1.0 + TMath::Tan(fThetaY)*TMath::Tan(fThetaY));
-      fPxRec = fPzRec * TMath::Tan(fThetaX);
-      fPyRec = fPzRec * TMath::Tan(fThetaY);
-      fCharge = Int_t(TMath::Sign(1.,muonTrack->GetInverseBendingMomentum()));
+//       fPyz = 1./TMath::Abs(muonTrack->GetInverseBendingMomentum());
+//       fPzRec = - fPyz / TMath::Sqrt(1.0 + TMath::Tan(fThetaY)*TMath::Tan(fThetaY));
+//       fPxRec = fPzRec * TMath::Tan(fThetaX);
+//       fPyRec = fPzRec * TMath::Tan(fThetaY);
+//       fCharge = Int_t(TMath::Sign(1.,muonTrack->GetInverseBendingMomentum()));
       
-      //ChiSquare of the track if needed
-      fChisquare = muonTrack->GetChi2()/(2.0 * muonTrack->GetNHit() - 5);
-      fEnergy = TMath::Sqrt(fMUONMASS * fMUONMASS + fPxRec * fPxRec + fPyRec * fPyRec + fPzRec * fPzRec);
-      fEPvector.SetPxPyPzE(fPxRec, fPyRec, fPzRec, fEnergy);
+//       //ChiSquare of the track if needed
+//       fChisquare = muonTrack->GetChi2()/(2.0 * muonTrack->GetNHit() - 5);
+//       fEnergy = TMath::Sqrt(fMUONMASS * fMUONMASS + fPxRec * fPxRec + fPyRec * fPyRec + fPzRec * fPzRec);
+//       fEPvector.SetPxPyPzE(fPxRec, fPyRec, fPzRec, fEnergy);
       
-      if (muonTrack->GetMatchTrigger()>0) nFWMatchedMuons++;
-
-      nMuons++;
-      nFWMuons++;
-      if(fEPvector.Pt() > fLowPtCut) {
-        nMu1GeV++; 
-        if(fEPvector.Pt() > fHighPtCut) {
-          nMu3GeV++; 
-          if (fEPvector.Pt() > fVeryHighPtCut) {
-            nMu10GeV++;
-          }
-        }
-      }
-    }//muon track loop
-    
-    // Fill the event tags 
-    if(ntrack != 0) meanPt = meanPt/ntrack;
-    
-    //First physics data
-    const AliMultiplicity *spdMult = esd->GetMultiplicity();
-    evTag->SetNumberOfFiredChipsLayer1(spdMult->GetNumberOfFiredChips(0));
-    evTag->SetNumberOfFiredChipsLayer2(spdMult->GetNumberOfFiredChips(1));
-    evTag->SetNumberOfSPDTracklets(spdMult->GetNumberOfTracklets());
-
-    AliESDVZERO *vzeroData = esd->GetVZEROData();
-    evTag->SetMTotV0A(vzeroData->GetMTotV0A());
-    evTag->SetMTotV0C(vzeroData->GetMTotV0C());
-    evTag->SetNbPMV0A(vzeroData->GetNbPMV0A());
-    evTag->SetNbPMV0C(vzeroData->GetNbPMV0C());
-
-    //evTag->SetEventId(iEventNumber+1);
-    evTag->SetPeriodNumber(esd->GetPeriodNumber());
-    evTag->SetOrbitNumber(esd->GetOrbitNumber());
-    evTag->SetBunchCrossNumber(esd->GetBunchCrossNumber());
+//       if (muonTrack->GetMatchTrigger()>0) nFWMatchedMuons++;
+
+//       nMuons++;
+//       nFWMuons++;
+//       if(fEPvector.Pt() > fLowPtCut) {
+//         nMu1GeV++; 
+//         if(fEPvector.Pt() > fHighPtCut) {
+//           nMu3GeV++; 
+//           if (fEPvector.Pt() > fVeryHighPtCut) {
+//             nMu10GeV++;
+//           }
+//         }
+//       }
+//     }//muon track loop
+    
+//     // Fill the event tags 
+//     if(ntrack != 0) meanPt = meanPt/ntrack;
+    
+//     //First physics data
+//     const AliMultiplicity *spdMult = esd->GetMultiplicity();
+//     evTag->SetNumberOfFiredChipsLayer1(spdMult->GetNumberOfFiredChips(0));
+//     evTag->SetNumberOfFiredChipsLayer2(spdMult->GetNumberOfFiredChips(1));
+//     evTag->SetNumberOfSPDTracklets(spdMult->GetNumberOfTracklets());
+
+//     AliESDVZERO *vzeroData = esd->GetVZEROData();
+//     evTag->SetMTotV0A(vzeroData->GetMTotV0A());
+//     evTag->SetMTotV0C(vzeroData->GetMTotV0C());
+//     evTag->SetNbPMV0A(vzeroData->GetNbPMV0A());
+//     evTag->SetNbPMV0C(vzeroData->GetNbPMV0C());
+
+//     //evTag->SetEventId(iEventNumber+1);
+//     evTag->SetPeriodNumber(esd->GetPeriodNumber());
+//     evTag->SetOrbitNumber(esd->GetOrbitNumber());
+//     evTag->SetBunchCrossNumber(esd->GetBunchCrossNumber());
     evTag->SetPath(filepath);
  
-    evTag->SetVertexX(vertexIn->GetXv());
-    evTag->SetVertexY(vertexIn->GetYv());
-    evTag->SetVertexZ(vertexIn->GetZv());
-    evTag->SetVertexZError(vertexIn->GetZRes());
-    evTag->SetVertexFlag(fVertexflag);
-    
-    evTag->SetT0VertexZ(esd->GetT0zVertex());
-    
-    evTag->SetTriggerMask(esd->GetTriggerMask());
-    evTag->SetTriggerCluster(esd->GetTriggerCluster());
-    
-    evTag->SetEventType(esd->GetEventType());
-    evTag->SetFiredTriggerClasses(esd->GetFiredTriggerClasses());
-
-    evTag->SetZDCNeutron1Energy(esd->GetZDCN1Energy());
-    evTag->SetZDCProton1Energy(esd->GetZDCP1Energy());
-    evTag->SetZDCEMEnergy(esd->GetZDCEMEnergy(0),esd->GetZDCEMEnergy(1));
-    evTag->SetZDCNeutron1Energy(esd->GetZDCN2Energy());
-    evTag->SetZDCProton1Energy(esd->GetZDCP2Energy());
-    evTag->SetNumOfParticipants(esd->GetZDCParticipants());
-    
-    
-    evTag->SetNumOfTracks(esd->GetNumberOfTracks());
-    evTag->SetNumOfPosTracks(nPos);
-    evTag->SetNumOfNegTracks(nNeg);
-    evTag->SetNumOfNeutrTracks(nNeutr);
-    
-    evTag->SetNumOfV0s(esd->GetNumberOfV0s());
-    evTag->SetNumOfCascades(esd->GetNumberOfCascades());
-    evTag->SetNumOfKinks(esd->GetNumberOfKinks());
-    evTag->SetNumOfPMDTracks(esd->GetNumberOfPmdTracks());
-    
-    evTag->SetNumOfProtons(nProtons);
-    evTag->SetNumOfKaons(nKaons);
-    evTag->SetNumOfPions(nPions);
-    evTag->SetNumOfMuons(nMuons);
-    evTag->SetNumOfFWMuons(nFWMuons);
-    evTag->SetNumOfFWMatchedMuons(nFWMatchedMuons);
-    evTag->SetNumOfElectrons(nElectrons);
-    evTag->SetNumOfPhotons(nGamas);
-    evTag->SetNumOfPi0s(nPi0s);
-    evTag->SetNumOfNeutrons(nNeutrons);
-    evTag->SetNumOfKaon0s(nK0s);
-    
-    evTag->SetNumOfChargedAbove1GeV(nCh1GeV);
-    evTag->SetNumOfChargedAbove3GeV(nCh3GeV);
-    evTag->SetNumOfChargedAbove10GeV(nCh10GeV);
-    evTag->SetNumOfMuonsAbove1GeV(nMu1GeV);
-    evTag->SetNumOfMuonsAbove3GeV(nMu3GeV);
-    evTag->SetNumOfMuonsAbove10GeV(nMu10GeV);
-    evTag->SetNumOfElectronsAbove1GeV(nEl1GeV);
-    evTag->SetNumOfElectronsAbove3GeV(nEl3GeV);
-    evTag->SetNumOfElectronsAbove10GeV(nEl10GeV);
-    
-    tmp.Clear();
-    evTag->SetNumOfPHOSClusters(esd->GetPHOSClusters(&tmp));
-    tmp.Clear();
-    evTag->SetNumOfEMCALClusters(esd->GetEMCALClusters(&tmp));
-    
-    evTag->SetTotalMomentum(totalP);
-    evTag->SetMeanPt(meanPt);
-    evTag->SetMaxPt(maxPt);
-    evTag->SetEtaMaxPt(etamaxPt);
-    evTag->SetPhiMaxPt(phimaxPt);
+//     evTag->SetVertexX(vertexIn->GetXv());
+//     evTag->SetVertexY(vertexIn->GetYv());
+//     evTag->SetVertexZ(vertexIn->GetZv());
+//     evTag->SetVertexZError(vertexIn->GetZRes());
+//     evTag->SetVertexFlag(fVertexflag);
+    
+//     evTag->SetT0VertexZ(esd->GetT0zVertex());
+    
+//     evTag->SetTriggerMask(esd->GetTriggerMask());
+//     evTag->SetTriggerCluster(esd->GetTriggerCluster());
+    
+//     evTag->SetEventType(esd->GetEventType());
+//     evTag->SetFiredTriggerClasses(esd->GetFiredTriggerClasses());
+
+//     evTag->SetZDCNeutron1Energy(esd->GetZDCN1Energy());
+//     evTag->SetZDCProton1Energy(esd->GetZDCP1Energy());
+//     evTag->SetZDCEMEnergy(esd->GetZDCEMEnergy(0),esd->GetZDCEMEnergy(1));
+//     evTag->SetZDCNeutron1Energy(esd->GetZDCN2Energy());
+//     evTag->SetZDCProton1Energy(esd->GetZDCP2Energy());
+//     evTag->SetNumOfParticipants(esd->GetZDCParticipants());
+    
+    
+//     evTag->SetNumOfTracks(esd->GetNumberOfTracks());
+//     evTag->SetNumOfPosTracks(nPos);
+//     evTag->SetNumOfNegTracks(nNeg);
+//     evTag->SetNumOfNeutrTracks(nNeutr);
+    
+//     evTag->SetNumOfV0s(esd->GetNumberOfV0s());
+//     evTag->SetNumOfCascades(esd->GetNumberOfCascades());
+//     evTag->SetNumOfKinks(esd->GetNumberOfKinks());
+//     evTag->SetNumOfPMDTracks(esd->GetNumberOfPmdTracks());
+    
+//     evTag->SetNumOfProtons(nProtons);
+//     evTag->SetNumOfKaons(nKaons);
+//     evTag->SetNumOfPions(nPions);
+//     evTag->SetNumOfMuons(nMuons);
+//     evTag->SetNumOfFWMuons(nFWMuons);
+//     evTag->SetNumOfFWMatchedMuons(nFWMatchedMuons);
+//     evTag->SetNumOfElectrons(nElectrons);
+//     evTag->SetNumOfPhotons(nGamas);
+//     evTag->SetNumOfPi0s(nPi0s);
+//     evTag->SetNumOfNeutrons(nNeutrons);
+//     evTag->SetNumOfKaon0s(nK0s);
+    
+//     evTag->SetNumOfChargedAbove1GeV(nCh1GeV);
+//     evTag->SetNumOfChargedAbove3GeV(nCh3GeV);
+//     evTag->SetNumOfChargedAbove10GeV(nCh10GeV);
+//     evTag->SetNumOfMuonsAbove1GeV(nMu1GeV);
+//     evTag->SetNumOfMuonsAbove3GeV(nMu3GeV);
+//     evTag->SetNumOfMuonsAbove10GeV(nMu10GeV);
+//     evTag->SetNumOfElectronsAbove1GeV(nEl1GeV);
+//     evTag->SetNumOfElectronsAbove3GeV(nEl3GeV);
+//     evTag->SetNumOfElectronsAbove10GeV(nEl10GeV);
+    
+//     tmp.Clear();
+//     evTag->SetNumOfPHOSClusters(esd->GetPHOSClusters(&tmp));
+//     tmp.Clear();
+//     evTag->SetNumOfEMCALClusters(esd->GetEMCALClusters(&tmp));
+    
+//     evTag->SetTotalMomentum(totalP);
+//     evTag->SetMeanPt(meanPt);
+//     evTag->SetMaxPt(maxPt);
+//     evTag->SetEtaMaxPt(etamaxPt);
+//     evTag->SetPhiMaxPt(phimaxPt);
     
     tag->SetRunId(iInitRunNumber);
-    if(fIsSim) tag->SetDataType(0);
-    else tag->SetDataType(1);
+//     if(fIsSim) tag->SetDataType(0);
+//     else tag->SetDataType(1);
     tag->AddEventTag(*evTag);
   }//event loop
   lastEvent = iNumberOfEvents;
@@ -1286,45 +1258,46 @@ void AliESDTagCreator::CreateESDTags(Int_t fFirstEvent, Int_t fLastEvent, AliGRP
   /////////////
   //muon code//
   ////////////
-  Double_t fMUONMASS = 0.105658369;
+//   Double_t fMUONMASS = 0.105658369;
   //Variables
-  Double_t fX,fY,fZ ;
-  Double_t fThetaX, fThetaY, fPyz, fChisquare;
-  Double_t fPxRec,fPyRec, fPzRec, fEnergy;
-  Int_t fCharge;
-  TLorentzVector fEPvector;
-
-  Float_t fLowPtCut = 1.0;
-  Float_t fHighPtCut = 3.0;
-  Float_t fVeryHighPtCut = 10.0;
+//   Double_t fX,fY,fZ ;
+//   Double_t fThetaX, fThetaY, fPyz, fChisquare;
+//   Double_t fPxRec,fPyRec, fPzRec, fEnergy;
+//   Int_t fCharge;
+//   TLorentzVector fEPvector;
+
+//   Float_t fLowPtCut = 1.0;
+//   Float_t fHighPtCut = 3.0;
+//   Float_t fVeryHighPtCut = 10.0;
   ////////////
 
-  Double_t partFrac[5] = {0.01, 0.01, 0.85, 0.10, 0.05};
+//   Double_t partFrac[5] = {0.01, 0.01, 0.85, 0.10, 0.05};
 
   // Creates the tags for all the events in a given ESD file
-  Int_t ntrack;
-  Int_t nProtons, nKaons, nPions, nMuons, nElectrons, nFWMuons, nFWMatchedMuons;
-  Int_t nPos, nNeg, nNeutr;
-  Int_t nK0s, nNeutrons, nPi0s, nGamas;
-  Int_t nCh1GeV, nCh3GeV, nCh10GeV;
-  Int_t nMu1GeV, nMu3GeV, nMu10GeV;
-  Int_t nEl1GeV, nEl3GeV, nEl10GeV;
-  Float_t maxPt = .0, etamaxPt = -999., phimaxPt = -999., meanPt = .0, totalP = .0;
-  Int_t fVertexflag;
+//   Int_t ntrack;
+//   Int_t nProtons, nKaons, nPions, nMuons, nElectrons, nFWMuons, nFWMatchedMuons;
+//   Int_t nPos, nNeg, nNeutr;
+//   Int_t nK0s, nNeutrons, nPi0s, nGamas;
+//   Int_t nCh1GeV, nCh3GeV, nCh10GeV;
+//   Int_t nMu1GeV, nMu3GeV, nMu10GeV;
+//   Int_t nEl1GeV, nEl3GeV, nEl10GeV;
+//   Float_t maxPt = .0, etamaxPt = -999., phimaxPt = -999., meanPt = .0, totalP = .0;
+//   Int_t fVertexflag;
   Int_t iRunNumber = 0;
-  TString fVertexName("default");
-  TRefArray tmp;
+  TString fguid, fmd5, fturl;
+//   TString fVertexName("default");
+//   TRefArray tmp;
   
   AliInfo(Form("Creating the ESD tags......."));       
 
-  TFile *file = TFile::Open("AliESDs.root");
-  if (!file || !file->IsOpen()) {
+  TFile *esdfile = TFile::Open("AliESDs.root");
+  if (!esdfile || !esdfile->IsOpen()) {
     AliError(Form("opening failed"));
-    delete file;
+    delete esdfile;
     return ;
   }  
   Int_t lastEvent = 0;
-  TTree *b = (TTree*) file->Get("esdTree");
+  TTree *b = (TTree*) esdfile->Get("esdTree");
   AliESDEvent *esd = new AliESDEvent();
   esd->ReadFromTree(b);
 
@@ -1353,263 +1326,465 @@ void AliESDTagCreator::CreateESDTags(Int_t fFirstEvent, Int_t fLastEvent, AliGRP
   if ((fLastEvent != -1) && ((Int_t) b->GetEntries() > fLastEvent)) 
     iNumberOfEvents = fLastEvent + 1;
   for (Int_t iEventNumber = fFirstEvent; iEventNumber < iNumberOfEvents; iEventNumber++) {
-    ntrack = 0;
-    nPos = 0;
-    nNeg = 0;
-    nNeutr =0;
-    nK0s = 0;
-    nNeutrons = 0;
-    nPi0s = 0;
-    nGamas = 0;
-    nProtons = 0;
-    nKaons = 0;
-    nPions = 0;
-    nMuons = 0;
-    nFWMuons = 0;
-    nFWMatchedMuons = 0;
-    nElectrons = 0;      
-    nCh1GeV = 0;
-    nCh3GeV = 0;
-    nCh10GeV = 0;
-    nMu1GeV = 0;
-    nMu3GeV = 0;
-    nMu10GeV = 0;
-    nEl1GeV = 0;
-    nEl3GeV = 0;
-    nEl10GeV = 0;
-    maxPt = .0;
-    etamaxPt = -999.;
-    phimaxPt = -999.;
-    meanPt = .0;
-    totalP = .0;
-    fVertexflag = 0;
-
-    b->GetEntry(iEventNumber);
+    FillEventTag(b, evTag, iEventNumber, esd);
+//     ntrack = 0;
+//     nPos = 0;
+//     nNeg = 0;
+//     nNeutr =0;
+//     nK0s = 0;
+//     nNeutrons = 0;
+//     nPi0s = 0;
+//     nGamas = 0;
+//     nProtons = 0;
+//     nKaons = 0;
+//     nPions = 0;
+//     nMuons = 0;
+//     nFWMuons = 0;
+//     nFWMatchedMuons = 0;
+//     nElectrons = 0;   
+//     nCh1GeV = 0;
+//     nCh3GeV = 0;
+//     nCh10GeV = 0;
+//     nMu1GeV = 0;
+//     nMu3GeV = 0;
+//     nMu10GeV = 0;
+//     nEl1GeV = 0;
+//     nEl3GeV = 0;
+//     nEl10GeV = 0;
+//     maxPt = .0;
+//     etamaxPt = -999.;
+//     phimaxPt = -999.;
+//     meanPt = .0;
+//     totalP = .0;
+//     fVertexflag = 0;
+
+//     b->GetEntry(iEventNumber);
     iRunNumber = esd->GetRunNumber();
     if(iRunNumber != iInitRunNumber) AliFatal("Inconsistency of run numbers in the AliESD!!!");
-    const AliESDVertex * vertexIn = esd->GetVertex();
-    if (!vertexIn) AliError("ESD has not defined vertex.");
-    if (vertexIn) fVertexName = vertexIn->GetName();
-    if(fVertexName != "default") fVertexflag = 1;
-    for (Int_t iTrackNumber = 0; iTrackNumber < esd->GetNumberOfTracks(); iTrackNumber++) {
-      AliESDtrack * esdTrack = esd->GetTrack(iTrackNumber);
-      UInt_t status = esdTrack->GetStatus();
+
+    TFile *file = b->GetCurrentFile();
+    const TUrl *url = file->GetEndpointUrl();
+    fguid = file->GetUUID().AsString();
+    if(fStorage == 1) {
+      TString fturltemp = "alien://"; fturltemp += url->GetFile();
+      fturl = fturltemp(0,fturltemp.Index(".root",5,0,TString::kExact)+5);
+    }
+    else fturl = url->GetFile();
+
+    evTag->SetGUID(fguid);
+    if(fStorage == 1) {
+      evTag->SetMD5("");
+      evTag->SetTURL(fturl);
+      evTag->SetSize(0);
+    }
+    else evTag->SetPath(fturl);
+//     const AliESDVertex * vertexIn = esd->GetVertex();
+//     if (!vertexIn) AliError("ESD has not defined vertex.");
+//     if (vertexIn) fVertexName = vertexIn->GetName();
+//     if(fVertexName != "default") fVertexflag = 1;
+//     for (Int_t iTrackNumber = 0; iTrackNumber < esd->GetNumberOfTracks(); iTrackNumber++) {
+//       AliESDtrack * esdTrack = esd->GetTrack(iTrackNumber);
+//       UInt_t status = esdTrack->GetStatus();
       
-      //select only tracks with ITS refit
-      if ((status&AliESDtrack::kITSrefit)==0) continue;
-      //select only tracks with TPC refit
-      if ((status&AliESDtrack::kTPCrefit)==0) continue;
+//       //select only tracks with ITS refit
+//       if ((status&AliESDtrack::kITSrefit)==0) continue;
+//       //select only tracks with TPC refit
+//       if ((status&AliESDtrack::kTPCrefit)==0) continue;
       
-      //select only tracks with the "combined PID"
-      if ((status&AliESDtrack::kESDpid)==0) continue;
-      Double_t p[3];
-      esdTrack->GetPxPyPz(p);
-      Double_t pt2 = p[0]*p[0]+p[1]*p[1];
-      Double_t momentum = TMath::Sqrt(pt2+p[2]*p[2]);
-      Double_t fPt = TMath::Sqrt(pt2);
-      totalP += momentum;
-      meanPt += fPt;
-      if(fPt > maxPt) {
-         maxPt = fPt;
-         phimaxPt = esdTrack->Eta();
-         etamaxPt = esdTrack->Phi();
-      }
+//       //select only tracks with the "combined PID"
+//       if ((status&AliESDtrack::kESDpid)==0) continue;
+//       Double_t p[3];
+//       esdTrack->GetPxPyPz(p);
+//       Double_t pt2 = p[0]*p[0]+p[1]*p[1];
+//       Double_t momentum = TMath::Sqrt(pt2+p[2]*p[2]);
+//       Double_t fPt = TMath::Sqrt(pt2);
+//       totalP += momentum;
+//       meanPt += fPt;
+//       if(fPt > maxPt) {
+//       maxPt = fPt;
+//       phimaxPt = esdTrack->Eta();
+//       etamaxPt = esdTrack->Phi();
+//       }
       
-      if(esdTrack->GetSign() > 0) {
-       nPos++;
-       if(fPt > fLowPtCut) nCh1GeV++;
-       if(fPt > fHighPtCut) nCh3GeV++;
-       if(fPt > fVeryHighPtCut) nCh10GeV++;
-      }
-      if(esdTrack->GetSign() < 0) {
-       nNeg++;
-       if(fPt > fLowPtCut) nCh1GeV++;
-       if(fPt > fHighPtCut) nCh3GeV++;
-       if(fPt > fVeryHighPtCut) nCh10GeV++;
-      }
-      if(esdTrack->GetSign() == 0) nNeutr++;
+//       if(esdTrack->GetSign() > 0) {
+//     nPos++;
+//     if(fPt > fLowPtCut) nCh1GeV++;
+//     if(fPt > fHighPtCut) nCh3GeV++;
+//     if(fPt > fVeryHighPtCut) nCh10GeV++;
+//       }
+//       if(esdTrack->GetSign() < 0) {
+//     nNeg++;
+//     if(fPt > fLowPtCut) nCh1GeV++;
+//     if(fPt > fHighPtCut) nCh3GeV++;
+//     if(fPt > fVeryHighPtCut) nCh10GeV++;
+//       }
+//       if(esdTrack->GetSign() == 0) nNeutr++;
       
-      //PID
-      Double_t prob[5];
-      esdTrack->GetESDpid(prob);
+//       //PID
+//       Double_t prob[5];
+//       esdTrack->GetESDpid(prob);
       
-      Double_t rcc = 0.0;
-      for(Int_t i = 0; i < AliPID::kSPECIES; i++) rcc += prob[i]*partFrac[i];
-      if(rcc == 0.0) continue;
-      //Bayes' formula
-      Double_t w[5];
-      for(Int_t i = 0; i < AliPID::kSPECIES; i++) w[i] = prob[i]*partFrac[i]/rcc;
+//       Double_t rcc = 0.0;
+//       for(Int_t i = 0; i < AliPID::kSPECIES; i++) rcc += prob[i]*partFrac[i];
+//       if(rcc == 0.0) continue;
+//       //Bayes' formula
+//       Double_t w[5];
+//       for(Int_t i = 0; i < AliPID::kSPECIES; i++) w[i] = prob[i]*partFrac[i]/rcc;
       
-      //protons
-      if ((w[4]>w[3])&&(w[4]>w[2])&&(w[4]>w[1])&&(w[4]>w[0])) nProtons++;
-      //kaons
-      if ((w[3]>w[4])&&(w[3]>w[2])&&(w[3]>w[1])&&(w[3]>w[0])) nKaons++;
-      //pions
-      if ((w[2]>w[4])&&(w[2]>w[3])&&(w[2]>w[1])&&(w[2]>w[0])) nPions++; 
-      //electrons
-      if ((w[0]>w[4])&&(w[0]>w[3])&&(w[0]>w[2])&&(w[0]>w[1])) {
-       nElectrons++;
-       if(fPt > fLowPtCut) nEl1GeV++;
-       if(fPt > fHighPtCut) nEl3GeV++;
-       if(fPt > fVeryHighPtCut) nEl10GeV++;
-      }          
-      ntrack++;
-    }//track loop
-    
-    /////////////
-    //muon code//
-    ////////////
-    Int_t nMuonTracks = esd->GetNumberOfMuonTracks();
-    // loop over all reconstructed tracks (also first track of combination)
-    for (Int_t iTrack = 0; iTrack <  nMuonTracks;  iTrack++) {
-      AliESDMuonTrack* muonTrack = esd->GetMuonTrack(iTrack);
-      if (muonTrack == 0x0) continue;
+//       //protons
+//       if ((w[4]>w[3])&&(w[4]>w[2])&&(w[4]>w[1])&&(w[4]>w[0])) nProtons++;
+//       //kaons
+//       if ((w[3]>w[4])&&(w[3]>w[2])&&(w[3]>w[1])&&(w[3]>w[0])) nKaons++;
+//       //pions
+//       if ((w[2]>w[4])&&(w[2]>w[3])&&(w[2]>w[1])&&(w[2]>w[0])) nPions++; 
+//       //electrons
+//       if ((w[0]>w[4])&&(w[0]>w[3])&&(w[0]>w[2])&&(w[0]>w[1])) {
+//     nElectrons++;
+//     if(fPt > fLowPtCut) nEl1GeV++;
+//     if(fPt > fHighPtCut) nEl3GeV++;
+//     if(fPt > fVeryHighPtCut) nEl10GeV++;
+//       }       
+//       ntrack++;
+//     }//track loop
+    
+//     /////////////
+//     //muon code//
+//     ////////////
+//     Int_t nMuonTracks = esd->GetNumberOfMuonTracks();
+//     // loop over all reconstructed tracks (also first track of combination)
+//     for (Int_t iTrack = 0; iTrack <  nMuonTracks;  iTrack++) {
+//       AliESDMuonTrack* muonTrack = esd->GetMuonTrack(iTrack);
+//       if (muonTrack == 0x0) continue;
       
-      // Coordinates at vertex
-      fZ = muonTrack->GetZ(); 
-      fY = muonTrack->GetBendingCoor();
-      fX = muonTrack->GetNonBendingCoor(); 
+//       // Coordinates at vertex
+//       fZ = muonTrack->GetZ(); 
+//       fY = muonTrack->GetBendingCoor();
+//       fX = muonTrack->GetNonBendingCoor(); 
       
-      fThetaX = muonTrack->GetThetaX();
-      fThetaY = muonTrack->GetThetaY();
+//       fThetaX = muonTrack->GetThetaX();
+//       fThetaY = muonTrack->GetThetaY();
       
-      fPyz = 1./TMath::Abs(muonTrack->GetInverseBendingMomentum());
-      fPzRec = - fPyz / TMath::Sqrt(1.0 + TMath::Tan(fThetaY)*TMath::Tan(fThetaY));
-      fPxRec = fPzRec * TMath::Tan(fThetaX);
-      fPyRec = fPzRec * TMath::Tan(fThetaY);
-      fCharge = Int_t(TMath::Sign(1.,muonTrack->GetInverseBendingMomentum()));
+//       fPyz = 1./TMath::Abs(muonTrack->GetInverseBendingMomentum());
+//       fPzRec = - fPyz / TMath::Sqrt(1.0 + TMath::Tan(fThetaY)*TMath::Tan(fThetaY));
+//       fPxRec = fPzRec * TMath::Tan(fThetaX);
+//       fPyRec = fPzRec * TMath::Tan(fThetaY);
+//       fCharge = Int_t(TMath::Sign(1.,muonTrack->GetInverseBendingMomentum()));
       
-      //ChiSquare of the track if needed
-      fChisquare = muonTrack->GetChi2()/(2.0 * muonTrack->GetNHit() - 5);
-      fEnergy = TMath::Sqrt(fMUONMASS * fMUONMASS + fPxRec * fPxRec + fPyRec * fPyRec + fPzRec * fPzRec);
-      fEPvector.SetPxPyPzE(fPxRec, fPyRec, fPzRec, fEnergy);
+//       //ChiSquare of the track if needed
+//       fChisquare = muonTrack->GetChi2()/(2.0 * muonTrack->GetNHit() - 5);
+//       fEnergy = TMath::Sqrt(fMUONMASS * fMUONMASS + fPxRec * fPxRec + fPyRec * fPyRec + fPzRec * fPzRec);
+//       fEPvector.SetPxPyPzE(fPxRec, fPyRec, fPzRec, fEnergy);
       
-      if (muonTrack->GetMatchTrigger()>0) nFWMatchedMuons++;
-
-      nMuons++;
-      nFWMuons++;
-      if(fEPvector.Pt() > fLowPtCut) {
-        nMu1GeV++; 
-        if(fEPvector.Pt() > fHighPtCut) {
-          nMu3GeV++; 
-          if (fEPvector.Pt() > fVeryHighPtCut) {
-            nMu10GeV++;
-          }
-        }
-      }
-    }//muon track loop
-
-    
-    // Fill the event tags 
-    if(ntrack != 0)
-      meanPt = meanPt/ntrack;
-
-    //First physics data
-    const AliMultiplicity *spdMult = esd->GetMultiplicity();
-    evTag->SetNumberOfFiredChipsLayer1(spdMult->GetNumberOfFiredChips(0));
-    evTag->SetNumberOfFiredChipsLayer2(spdMult->GetNumberOfFiredChips(1));
-    evTag->SetNumberOfSPDTracklets(spdMult->GetNumberOfTracklets());
-
-    AliESDVZERO *vzeroData = esd->GetVZEROData();
-    evTag->SetMTotV0A(vzeroData->GetMTotV0A());
-    evTag->SetMTotV0C(vzeroData->GetMTotV0C());
-    evTag->SetNbPMV0A(vzeroData->GetNbPMV0A());
-    evTag->SetNbPMV0C(vzeroData->GetNbPMV0C());
-
-    //evTag->SetEventId(iEventNumber+1);
-    evTag->SetPeriodNumber(esd->GetPeriodNumber());
-    evTag->SetOrbitNumber(esd->GetOrbitNumber());
-    evTag->SetBunchCrossNumber(esd->GetBunchCrossNumber());
-    if (vertexIn) {
-      evTag->SetVertexX(vertexIn->GetXv());
-      evTag->SetVertexY(vertexIn->GetYv());
-      evTag->SetVertexZ(vertexIn->GetZv());
-      evTag->SetVertexZError(vertexIn->GetZRes());
-    }  
-    evTag->SetVertexFlag(fVertexflag);
-
-    evTag->SetT0VertexZ(esd->GetT0zVertex());
-    
-    evTag->SetTriggerMask(esd->GetTriggerMask());
-    evTag->SetTriggerCluster(esd->GetTriggerCluster());
-    
-    evTag->SetEventType(esd->GetEventType());
-    evTag->SetFiredTriggerClasses(esd->GetFiredTriggerClasses());
-
-    evTag->SetZDCNeutron1Energy(esd->GetZDCN1Energy());
-    evTag->SetZDCProton1Energy(esd->GetZDCP1Energy());
-    evTag->SetZDCNeutron2Energy(esd->GetZDCN2Energy());
-    evTag->SetZDCProton2Energy(esd->GetZDCP2Energy());
-    evTag->SetZDCEMEnergy(esd->GetZDCEMEnergy(0),esd->GetZDCEMEnergy(1));
-    evTag->SetNumOfParticipants(esd->GetZDCParticipants());
-    
-    
-    evTag->SetNumOfTracks(esd->GetNumberOfTracks());
-    evTag->SetNumOfPosTracks(nPos);
-    evTag->SetNumOfNegTracks(nNeg);
-    evTag->SetNumOfNeutrTracks(nNeutr);
-    
-    evTag->SetNumOfV0s(esd->GetNumberOfV0s());
-    evTag->SetNumOfCascades(esd->GetNumberOfCascades());
-    evTag->SetNumOfKinks(esd->GetNumberOfKinks());
-    evTag->SetNumOfPMDTracks(esd->GetNumberOfPmdTracks());
-    
-    evTag->SetNumOfProtons(nProtons);
-    evTag->SetNumOfKaons(nKaons);
-    evTag->SetNumOfPions(nPions);
-    evTag->SetNumOfMuons(nMuons);
-    evTag->SetNumOfFWMuons(nFWMuons);
-    evTag->SetNumOfFWMatchedMuons(nFWMatchedMuons);
-    evTag->SetNumOfElectrons(nElectrons);
-    evTag->SetNumOfPhotons(nGamas);
-    evTag->SetNumOfPi0s(nPi0s);
-    evTag->SetNumOfNeutrons(nNeutrons);
-    evTag->SetNumOfKaon0s(nK0s);
-    
-    evTag->SetNumOfChargedAbove1GeV(nCh1GeV);
-    evTag->SetNumOfChargedAbove3GeV(nCh3GeV);
-    evTag->SetNumOfChargedAbove10GeV(nCh10GeV);
-    evTag->SetNumOfMuonsAbove1GeV(nMu1GeV);
-    evTag->SetNumOfMuonsAbove3GeV(nMu3GeV);
-    evTag->SetNumOfMuonsAbove10GeV(nMu10GeV);
-    evTag->SetNumOfElectronsAbove1GeV(nEl1GeV);
-    evTag->SetNumOfElectronsAbove3GeV(nEl3GeV);
-    evTag->SetNumOfElectronsAbove10GeV(nEl10GeV);
-    
-    tmp.Clear();
-    evTag->SetNumOfPHOSClusters(esd->GetPHOSClusters(&tmp));
-    tmp.Clear();
-    evTag->SetNumOfEMCALClusters(esd->GetEMCALClusters(&tmp));
-    
-    evTag->SetTotalMomentum(totalP);
-    evTag->SetMeanPt(meanPt);
-    evTag->SetMaxPt(maxPt);
-    evTag->SetEtaMaxPt(etamaxPt);
-    evTag->SetPhiMaxPt(phimaxPt);
-    
-    tag->SetLHCTag(lhcLuminosity,lhcState);
-    tag->SetDetectorTag(detectorMask);
+//       if (muonTrack->GetMatchTrigger()>0) nFWMatchedMuons++;
+
+//       nMuons++;
+//       nFWMuons++;
+//       if(fEPvector.Pt() > fLowPtCut) {
+//         nMu1GeV++; 
+//         if(fEPvector.Pt() > fHighPtCut) {
+//           nMu3GeV++; 
+//           if (fEPvector.Pt() > fVeryHighPtCut) {
+//             nMu10GeV++;
+//           }
+//         }
+//       }
+//     }//muon track loop
 
-    tag->SetRunId(iInitRunNumber);
-    tag->SetRunStartTime(t1.GetDate());
-    tag->SetRunStopTime(t2.GetDate());
-    tag->SetBeamEnergy(beamenergy);
-    tag->SetBeamType(beamtype);
     
-    //QA setting 
-    tag->SetQAArray(qa, qalength) ; 
-    tag->SetEventSpecies(es, eslength) ;
+//     // Fill the event tags 
+//     if(ntrack != 0)
+//       meanPt = meanPt/ntrack;
+
+//     //First physics data
+//     const AliMultiplicity *spdMult = esd->GetMultiplicity();
+//     evTag->SetNumberOfFiredChipsLayer1(spdMult->GetNumberOfFiredChips(0));
+//     evTag->SetNumberOfFiredChipsLayer2(spdMult->GetNumberOfFiredChips(1));
+//     evTag->SetNumberOfSPDTracklets(spdMult->GetNumberOfTracklets());
+
+//     AliESDVZERO *vzeroData = esd->GetVZEROData();
+//     evTag->SetMTotV0A(vzeroData->GetMTotV0A());
+//     evTag->SetMTotV0C(vzeroData->GetMTotV0C());
+//     evTag->SetNbPMV0A(vzeroData->GetNbPMV0A());
+//     evTag->SetNbPMV0C(vzeroData->GetNbPMV0C());
+
+//     //evTag->SetEventId(iEventNumber+1);
+//     evTag->SetPeriodNumber(esd->GetPeriodNumber());
+//     evTag->SetOrbitNumber(esd->GetOrbitNumber());
+//     evTag->SetBunchCrossNumber(esd->GetBunchCrossNumber());
+//     if (vertexIn) {
+//       evTag->SetVertexX(vertexIn->GetXv());
+//       evTag->SetVertexY(vertexIn->GetYv());
+//       evTag->SetVertexZ(vertexIn->GetZv());
+//       evTag->SetVertexZError(vertexIn->GetZRes());
+//     }  
+//     evTag->SetVertexFlag(fVertexflag);
+
+//     evTag->SetT0VertexZ(esd->GetT0zVertex());
+    
+//     evTag->SetTriggerMask(esd->GetTriggerMask());
+//     evTag->SetTriggerCluster(esd->GetTriggerCluster());
+    
+//     evTag->SetEventType(esd->GetEventType());
+//     evTag->SetFiredTriggerClasses(esd->GetFiredTriggerClasses());
+
+//     evTag->SetZDCNeutron1Energy(esd->GetZDCN1Energy());
+//     evTag->SetZDCProton1Energy(esd->GetZDCP1Energy());
+//     evTag->SetZDCNeutron2Energy(esd->GetZDCN2Energy());
+//     evTag->SetZDCProton2Energy(esd->GetZDCP2Energy());
+//     evTag->SetZDCEMEnergy(esd->GetZDCEMEnergy(0),esd->GetZDCEMEnergy(1));
+//     evTag->SetNumOfParticipants(esd->GetZDCParticipants());
+    
+    
+//     evTag->SetNumOfTracks(esd->GetNumberOfTracks());
+//     evTag->SetNumOfPosTracks(nPos);
+//     evTag->SetNumOfNegTracks(nNeg);
+//     evTag->SetNumOfNeutrTracks(nNeutr);
+    
+//     evTag->SetNumOfV0s(esd->GetNumberOfV0s());
+//     evTag->SetNumOfCascades(esd->GetNumberOfCascades());
+//     evTag->SetNumOfKinks(esd->GetNumberOfKinks());
+//     evTag->SetNumOfPMDTracks(esd->GetNumberOfPmdTracks());
+    
+//     evTag->SetNumOfProtons(nProtons);
+//     evTag->SetNumOfKaons(nKaons);
+//     evTag->SetNumOfPions(nPions);
+//     evTag->SetNumOfMuons(nMuons);
+//     evTag->SetNumOfFWMuons(nFWMuons);
+//     evTag->SetNumOfFWMatchedMuons(nFWMatchedMuons);
+//     evTag->SetNumOfElectrons(nElectrons);
+//     evTag->SetNumOfPhotons(nGamas);
+//     evTag->SetNumOfPi0s(nPi0s);
+//     evTag->SetNumOfNeutrons(nNeutrons);
+//     evTag->SetNumOfKaon0s(nK0s);
+    
+//     evTag->SetNumOfChargedAbove1GeV(nCh1GeV);
+//     evTag->SetNumOfChargedAbove3GeV(nCh3GeV);
+//     evTag->SetNumOfChargedAbove10GeV(nCh10GeV);
+//     evTag->SetNumOfMuonsAbove1GeV(nMu1GeV);
+//     evTag->SetNumOfMuonsAbove3GeV(nMu3GeV);
+//     evTag->SetNumOfMuonsAbove10GeV(nMu10GeV);
+//     evTag->SetNumOfElectronsAbove1GeV(nEl1GeV);
+//     evTag->SetNumOfElectronsAbove3GeV(nEl3GeV);
+//     evTag->SetNumOfElectronsAbove10GeV(nEl10GeV);
+    
+//     tmp.Clear();
+//     evTag->SetNumOfPHOSClusters(esd->GetPHOSClusters(&tmp));
+//     tmp.Clear();
+//     evTag->SetNumOfEMCALClusters(esd->GetEMCALClusters(&tmp));
+    
+//     evTag->SetTotalMomentum(totalP);
+//     evTag->SetMeanPt(meanPt);
+//     evTag->SetMaxPt(maxPt);
+//     evTag->SetEtaMaxPt(etamaxPt);
+//     evTag->SetPhiMaxPt(phimaxPt);
+    tag->AddEventTag(*evTag);
+  }    
+  
+  tag->SetLHCTag(lhcLuminosity,lhcState);
+  tag->SetDetectorTag(detectorMask);
+  
+  // Get magnetic field info
+  Bool_t ok = kTRUE;
+  
+  Float_t l3Current = grpData->GetL3Current((AliGRPObject::Stats)0);
+  if (l3Current == AliGRPObject::GetInvalidFloat()) {
+    AliError("GRP/GRP/Data entry:  missing value for the L3 current !");
+    ok = kFALSE;
+  }
+  
+  Char_t l3Polarity = grpData->GetL3Polarity();
+  if (l3Polarity == AliGRPObject::GetInvalidChar()) {
+    AliError("GRP/GRP/Data entry:  missing value for the L3 polarity !");
+    ok = kFALSE;
+  }
+  
+  // Dipole
+  Float_t diCurrent = grpData->GetDipoleCurrent((AliGRPObject::Stats)0);
+  if (diCurrent == AliGRPObject::GetInvalidFloat()) {
+    AliError("GRP/GRP/Data entry:  missing value for the dipole current !");
+    ok = kFALSE;
+  }
+  
+  Char_t diPolarity = grpData->GetDipolePolarity();
+  if (diPolarity == AliGRPObject::GetInvalidChar()) {
+    AliError("GRP/GRP/Data entry:  missing value for the dipole polarity !");
+    ok = kFALSE;
+  }
+  
+  if (ok && grpData->IsPolarityConventionLHC()) {
+    if ((TMath::Abs(l3Current) > 29000.0) && (l3Polarity == 1))
+      tag->SetMagneticField(-0.5);
+    if ((TMath::Abs(l3Current) > 29000.0) && (l3Polarity == 0)) 
+      tag->SetMagneticField(0.5);
+    if (TMath::Abs(l3Current) < 2000.0) 
+      tag->SetMagneticField(0.0);
+    
+    if ((TMath::Abs(diCurrent) > 5900.0) && (diPolarity == 1))
+      tag->SetDipoleField(-0.2);
+    if ((TMath::Abs(diCurrent) > 5900.0) && (diPolarity == 0))
+      tag->SetDipoleField(0.2);
+    if (TMath::Abs(diCurrent) < 500.0)
+      tag->SetDipoleField(0.0);
+  }
+  
+  tag->SetRunId(iInitRunNumber);
+  tag->SetRunStartTime(t1.GetDate());
+  tag->SetRunStopTime(t2.GetDate());
+  tag->SetBeamEnergy(beamenergy);
+  tag->SetBeamType(beamtype);
+  
+  //QA setting 
+  tag->SetQAArray(qa, qalength) ; 
+  tag->SetEventSpecies(es, eslength) ;
+       
+  ftag->cd();
+  ttag->Fill();
+  tag->Clear();
+  ttag->Write();
+  ftag->Close();
+  esdfile->cd();
+  delete esdfile;
+  delete ftag;
+  delete esd;
+  delete tag;
+  delete evTag;
+}
+
+void AliESDTagCreator::CreateESDTagsFullRun(TTree *chain, AliGRPObject *grpData, ULong_t * qa, Bool_t * es, Int_t qalength, Int_t eslength)
+{
+  //GRP
+  Float_t lhcLuminosity = 0.0;
+  TString lhcState = "test";
+  //UInt_t detectorMask = 0;
+  Int_t detectorMask = 0;
+
+  detectorMask = grpData->GetDetectorMask();
+  time_t startTime = grpData->GetTimeStart();
+  TTimeStamp t1(startTime);
+  time_t endTime = grpData->GetTimeEnd();
+  TTimeStamp t2(endTime);
+  const char* beamtype = grpData->GetBeamType();
+  Float_t beamenergy = grpData->GetBeamEnergy();
+
+  Int_t iRunNumber = 0;
+  TString fguid, fmd5, fturl;
+
+  AliInfo(Form("Creating the ESD tags......."));       
+
+  AliESDEvent *esd = new AliESDEvent();
+  esd->ReadFromTree(chain);
+
+  chain->GetEntry(0);
+  Int_t iInitRunNumber = esd->GetRunNumber();
+  
+  Int_t iNumberOfEvents = (Int_t)chain->GetEntries();
+  Int_t iFirstEvent = 0;
+
+  char fileName[256];
+  sprintf(fileName, "Run%d.Event%d_%d.ESD.tag.root", 
+         iInitRunNumber,iFirstEvent,iNumberOfEvents);
+  AliInfo(Form("writing tags to file %s", fileName));
+  AliDebug(1, Form("writing tags to file %s", fileName));
+  TFile* ftag = TFile::Open(fileName, "recreate");
+  AliRunTag *tag = new AliRunTag();
+  AliEventTag *evTag = new AliEventTag();
+  TTree * ttag = new TTree("T","A Tree with event tags");
+  TBranch * btag = ttag->Branch("AliTAG", &tag);
+  btag->SetCompressionLevel(9);
+
+  for (Int_t iEventNumber = iFirstEvent; iEventNumber < iNumberOfEvents; iEventNumber++) {
+    FillEventTag(chain, evTag, iEventNumber, esd);
+
+    iRunNumber = esd->GetRunNumber();
+    if(iRunNumber != iInitRunNumber) AliFatal("Inconsistency of run numbers in the AliESD!!!");
+    
+    TFile *file = chain->GetCurrentFile();
+    const TUrl *url = file->GetEndpointUrl();
+    fguid = file->GetUUID().AsString();
+    if(fStorage == 1) {
+      TString fturltemp = "alien://"; fturltemp += url->GetFile();
+      fturl = fturltemp(0,fturltemp.Index(".root",5,0,TString::kExact)+5);
+    }
+    else fturl = url->GetFile();
+
+    evTag->SetGUID(fguid);
+    if(fStorage == 1) {
+      evTag->SetMD5("");
+      evTag->SetTURL(fturl);
+      evTag->SetSize(0);
+    }
+    else {
+      evTag->SetPath(fturl);
+      evTag->SetTURL(fturl);
+    }
 
     tag->AddEventTag(*evTag);
   }
-       
+
+  tag->SetLHCTag(lhcLuminosity,lhcState);
+  tag->SetDetectorTag(detectorMask);
+  
+  // Get magnetic field info
+  Bool_t ok = kTRUE;
+  
+  Float_t l3Current = grpData->GetL3Current((AliGRPObject::Stats)0);
+  if (l3Current == AliGRPObject::GetInvalidFloat()) {
+    AliError("GRP/GRP/Data entry:  missing value for the L3 current !");
+    ok = kFALSE;
+  }
+  
+  Char_t l3Polarity = grpData->GetL3Polarity();
+  if (l3Polarity == AliGRPObject::GetInvalidChar()) {
+    AliError("GRP/GRP/Data entry:  missing value for the L3 polarity !");
+    ok = kFALSE;
+  }
+  
+  // Dipole
+  Float_t diCurrent = grpData->GetDipoleCurrent((AliGRPObject::Stats)0);
+  if (diCurrent == AliGRPObject::GetInvalidFloat()) {
+    AliError("GRP/GRP/Data entry:  missing value for the dipole current !");
+    ok = kFALSE;
+  }
+  
+  Char_t diPolarity = grpData->GetDipolePolarity();
+  if (diPolarity == AliGRPObject::GetInvalidChar()) {
+    AliError("GRP/GRP/Data entry:  missing value for the dipole polarity !");
+    ok = kFALSE;
+  }
+  
+  if (ok && grpData->IsPolarityConventionLHC()) {
+    if ((TMath::Abs(l3Current) > 29000.0) && (l3Polarity == 1))
+      tag->SetMagneticField(-0.5);
+    if ((TMath::Abs(l3Current) > 29000.0) && (l3Polarity == 0)) 
+      tag->SetMagneticField(0.5);
+    if (TMath::Abs(l3Current) < 2000.0) 
+      tag->SetMagneticField(0.0);
+    
+    if ((TMath::Abs(diCurrent) > 5900.0) && (diPolarity == 1))
+      tag->SetDipoleField(-0.2);
+    if ((TMath::Abs(diCurrent) > 5900.0) && (diPolarity == 0))
+      tag->SetDipoleField(0.2);
+    if (TMath::Abs(diCurrent) < 500.0)
+      tag->SetDipoleField(0.0);
+  }
+  
+  tag->SetRunId(iInitRunNumber);
+  tag->SetRunStartTime(t1.GetDate());
+  tag->SetRunStopTime(t2.GetDate());
+  tag->SetBeamEnergy(beamenergy);
+  tag->SetBeamType(beamtype);
+  
+  //QA setting 
+  tag->SetQAArray(qa, qalength) ; 
+  tag->SetEventSpecies(es, eslength) ;
+  
   ftag->cd();
   ttag->Fill();
   tag->Clear();
   ttag->Write();
   ftag->Close();
-  file->cd();
-  delete file;
   delete ftag;
   delete esd;
   delete tag;
@@ -1628,3 +1803,318 @@ void AliESDTagCreator::SwitchOffBranches() const {
     AliInfo(Form("Branch %s switched off \n", str.Data()));
   }
 }
+
+//_____________________________________________________________________________
+void AliESDTagCreator::FillEventTag(TTree *chain, AliEventTag *evTag, Int_t iEventNumber, AliESDEvent *esd)
+{
+  // Fill the event specific information in the EventTag
+  AliESD *esdold = 0x0;
+
+  TString fTempGuid;
+
+  /////////////
+  //muon code//
+  ////////////
+  Double_t fMUONMASS = 0.105658369;
+  //Variables
+  Double_t fX,fY,fZ ;
+  Double_t fThetaX, fThetaY, fPyz, fChisquare;
+  Double_t fPxRec, fPyRec, fPzRec, fEnergy;
+  Int_t fCharge;
+  TLorentzVector fEPvector;
+
+  Float_t fLowPtCut      =  1.0;
+  Float_t fHighPtCut     =  3.0;
+  Float_t fVeryHighPtCut = 10.0;
+  ////////////
+
+  Double_t partFrac[5] = {0.01, 0.01, 0.85, 0.10, 0.05};
+
+  // Creates the tags for all the events in a given ESD file
+  Bool_t fIsSim = kTRUE;
+  Int_t ntrack;
+  Int_t nProtons, nKaons, nPions, nMuons, nElectrons, nFWMuons, nFWMatchedMuons;
+  Int_t nPos, nNeg, nNeutr;
+  Int_t nK0s, nLambdas, nNeutrons, nPi0s, nGamas;
+  Int_t nCh1GeV, nCh3GeV, nCh10GeV;
+  Int_t nMu1GeV, nMu3GeV, nMu10GeV;
+  Int_t nEl1GeV, nEl3GeV, nEl10GeV;
+  Float_t maxPt = .0, etamaxPt = -999., phimaxPt = -999., meanPt = .0, totalP = .0;
+  Int_t fVertexflag;
+  TString fVertexName;
+
+  TRefArray tmp;
+  
+  ntrack = 0; nPos = 0; nNeg = 0; nNeutr =0;
+  nK0s = 0; nLambdas = 0; nNeutrons = 0; nPi0s = 0;
+  nGamas = 0; nProtons = 0; nKaons = 0;
+  nPions = 0; nMuons = 0; nElectrons = 0; nFWMuons = 0; nFWMatchedMuons = 0;     
+  nCh1GeV = 0; nCh3GeV = 0; nCh10GeV = 0;
+  nMu1GeV = 0; nMu3GeV = 0; nMu10GeV = 0;
+  nEl1GeV = 0; nEl3GeV = 0; nEl10GeV = 0;
+  maxPt = .0; etamaxPt = -999.; phimaxPt = -999.; meanPt = .0; totalP = .0;
+  fVertexflag = 1;
+  
+  chain->GetEntry(iEventNumber);    
+  esdold = esd->GetAliESDOld();
+  if(esdold) esd->CopyFromOldESD();
+  
+//   TFile *file = chain->GetFile();
+//   const TUrl *url = file->GetEndpointUrl();
+//   fguid = file->GetUUID().AsString();
+//   if(fSession == "grid") {
+//     TString fturltemp = "alien://"; fturltemp += url->GetFile();
+//     fturl = fturltemp(0,fturltemp.Index(".root",5,0,TString::kExact)+5);
+//   }
+//   else fturl = url->GetFile();
+  
+  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);
+    if(esdTrack->GetLabel() != 0) fIsSim = kTRUE;
+    else if(esdTrack->GetLabel() == 0) fIsSim = kFALSE;
+    UInt_t status = esdTrack->GetStatus();
+    
+    //select only tracks with ITS refit
+    if ((status&AliESDtrack::kITSrefit)==0) continue;
+    //select only tracks with TPC refit
+    if ((status&AliESDtrack::kTPCrefit)==0) continue;
+    
+    //select only tracks with the "combined PID"
+    if ((status&AliESDtrack::kESDpid)==0) continue;
+    Double_t p[3];
+    esdTrack->GetPxPyPz(p);
+    Double_t pt2 = p[0]*p[0]+p[1]*p[1];
+    Double_t momentum = TMath::Sqrt(pt2+p[2]*p[2]);
+    Double_t fPt = TMath::Sqrt(pt2);
+    totalP += momentum;
+    meanPt += fPt;
+    if(fPt > maxPt) {
+      maxPt = fPt;
+      phimaxPt = esdTrack->Phi();
+      etamaxPt = esdTrack->Eta();
+    }
+    
+    if(esdTrack->GetSign() > 0) {
+      nPos++;
+      if(fPt > fLowPtCut) nCh1GeV++;
+      if(fPt > fHighPtCut) nCh3GeV++;
+      if(fPt > fVeryHighPtCut) nCh10GeV++;
+    }
+    if(esdTrack->GetSign() < 0) {
+      nNeg++;
+      if(fPt > fLowPtCut) nCh1GeV++;
+      if(fPt > fHighPtCut) nCh3GeV++;
+      if(fPt > fVeryHighPtCut) nCh10GeV++;
+    }
+    if(esdTrack->GetSign() == 0) nNeutr++;
+    
+    //PID
+    Double_t prob[5];
+    esdTrack->GetESDpid(prob);
+    
+    Double_t rcc = 0.0;
+    for(Int_t i = 0; i < AliPID::kSPECIES; i++) rcc += prob[i]*partFrac[i];
+    if(rcc == 0.0) continue;
+    //Bayes' formula
+    Double_t w[5];
+    for(Int_t i = 0; i < AliPID::kSPECIES; i++) w[i] = prob[i]*partFrac[i]/rcc;
+    
+    //protons
+    if ((w[4]>w[3])&&(w[4]>w[2])&&(w[4]>w[1])&&(w[4]>w[0])) nProtons++;
+    //kaons
+    if ((w[3]>w[4])&&(w[3]>w[2])&&(w[3]>w[1])&&(w[3]>w[0])) nKaons++;
+    //pions
+    if ((w[2]>w[4])&&(w[2]>w[3])&&(w[2]>w[1])&&(w[2]>w[0])) nPions++; 
+    //electrons
+    if ((w[0]>w[4])&&(w[0]>w[3])&&(w[0]>w[2])&&(w[0]>w[1])) {
+      nElectrons++;
+      if(fPt > fLowPtCut) nEl1GeV++;
+      if(fPt > fHighPtCut) nEl3GeV++;
+      if(fPt > fVeryHighPtCut) nEl10GeV++;
+    }    
+    ntrack++;
+  }
+  //esd track loop
+  
+  /* muon code */
+  Int_t nMuonTracks = esd->GetNumberOfMuonTracks();
+  // loop over all reconstructed tracks (also first track of combination)
+  for (Int_t iTrack = 0; iTrack <  nMuonTracks;  iTrack++) {
+    AliESDMuonTrack* muonTrack = esd->GetMuonTrack(iTrack);
+    if (muonTrack == 0x0) continue;
+    
+    // Coordinates at vertex
+    fZ = muonTrack->GetZ(); 
+    fY = muonTrack->GetBendingCoor();
+    fX = muonTrack->GetNonBendingCoor(); 
+    
+    fThetaX = muonTrack->GetThetaX();
+    fThetaY = muonTrack->GetThetaY();
+    
+    fPyz = 1./TMath::Abs(muonTrack->GetInverseBendingMomentum());
+    fPzRec = - fPyz / TMath::Sqrt(1.0 + TMath::Tan(fThetaY)*TMath::Tan(fThetaY));
+    fPxRec = fPzRec * TMath::Tan(fThetaX);
+    fPyRec = fPzRec * TMath::Tan(fThetaY);
+    fCharge = Int_t(TMath::Sign(1.,muonTrack->GetInverseBendingMomentum()));
+    
+    //ChiSquare of the track if needed
+    fChisquare = muonTrack->GetChi2()/(2.0 * muonTrack->GetNHit() - 5);
+    fEnergy = TMath::Sqrt(fMUONMASS * fMUONMASS + fPxRec * fPxRec + fPyRec * fPyRec + fPzRec * fPzRec);
+    fEPvector.SetPxPyPzE(fPxRec, fPyRec, fPzRec, fEnergy);
+    
+    if (muonTrack->GetMatchTrigger()>0) nFWMatchedMuons++;
+    
+    nMuons++;
+    nFWMuons++;
+    if(fEPvector.Pt() > fLowPtCut) {
+      nMu1GeV++; 
+      if(fEPvector.Pt() > fHighPtCut) {
+       nMu3GeV++; 
+       if (fEPvector.Pt() > fVeryHighPtCut) {
+         nMu10GeV++;
+       }
+      }
+    }
+  }//muon track loop
+  
+  // Fill the event tags 
+  if(ntrack != 0) meanPt = meanPt/ntrack;
+  
+  //AliInfo(Form("====================================="));
+  //AliInfo(Form("URL: %s - GUID: %s",fturl.Data(),fguid.Data()));
+  //AliInfo(Form("====================================="));
+  
+  //First physics data
+  const AliMultiplicity *spdMult = esd->GetMultiplicity();
+  evTag->SetNumberOfFiredChipsLayer1(spdMult->GetNumberOfFiredChips(0));
+  evTag->SetNumberOfFiredChipsLayer2(spdMult->GetNumberOfFiredChips(1));
+  evTag->SetNumberOfSPDTracklets(spdMult->GetNumberOfTracklets());
+  
+  AliESDVZERO *vzeroData = esd->GetVZEROData();
+  evTag->SetMTotV0A(vzeroData->GetMTotV0A());
+  evTag->SetMTotV0C(vzeroData->GetMTotV0C());
+  evTag->SetNbPMV0A(vzeroData->GetNbPMV0A());
+  evTag->SetNbPMV0C(vzeroData->GetNbPMV0C());
+  
+  //evTag->SetEventId(iEventNumber+1);
+  evTag->SetPeriodNumber(esd->GetPeriodNumber());
+  evTag->SetOrbitNumber(esd->GetOrbitNumber());
+  evTag->SetBunchCrossNumber(esd->GetBunchCrossNumber());
+  //  evTag->SetGUID(fguid);
+//   if(fSession == "grid") {
+//     evTag->SetMD5("");
+//     evTag->SetTURL(fturl);
+//     evTag->SetSize(0);
+//   }
+//   else evTag->SetPath(fturl);
+  
+  evTag->SetVertexX(vertexIn->GetXv());
+  evTag->SetVertexY(vertexIn->GetYv());
+  evTag->SetVertexZ(vertexIn->GetZv());
+  evTag->SetVertexZError(vertexIn->GetZRes());
+  evTag->SetVertexFlag(fVertexflag);
+  
+  evTag->SetT0VertexZ(esd->GetT0zVertex());
+  
+  evTag->SetTriggerMask(esd->GetTriggerMask());
+  evTag->SetTriggerCluster(esd->GetTriggerCluster());
+  
+  evTag->SetEventType(esd->GetEventType());
+  evTag->SetFiredTriggerClasses(esd->GetFiredTriggerClasses());
+  
+  evTag->SetZDCNeutron1Energy(esd->GetZDCN1Energy());
+  evTag->SetZDCProton1Energy(esd->GetZDCP1Energy());
+  evTag->SetZDCEMEnergy(esd->GetZDCEMEnergy(0),esd->GetZDCEMEnergy(1));
+  evTag->SetZDCNeutron2Energy(esd->GetZDCN2Energy());
+  evTag->SetZDCProton2Energy(esd->GetZDCP2Energy());
+  evTag->SetNumOfParticipants(esd->GetZDCParticipants());
+  
+  evTag->SetNumOfTracks(esd->GetNumberOfTracks());
+  evTag->SetNumOfPosTracks(nPos);
+  evTag->SetNumOfNegTracks(nNeg);
+  evTag->SetNumOfNeutrTracks(nNeutr);
+  
+  evTag->SetNumOfV0s(esd->GetNumberOfV0s());
+  evTag->SetNumOfCascades(esd->GetNumberOfCascades());
+  evTag->SetNumOfKinks(esd->GetNumberOfKinks());
+  evTag->SetNumOfPMDTracks(esd->GetNumberOfPmdTracks());
+  
+  evTag->SetNumOfProtons(nProtons);
+  evTag->SetNumOfKaons(nKaons);
+  evTag->SetNumOfPions(nPions);
+  evTag->SetNumOfMuons(nMuons);
+  evTag->SetNumOfFWMuons(nFWMuons);
+  evTag->SetNumOfFWMatchedMuons(nFWMatchedMuons);
+  evTag->SetNumOfElectrons(nElectrons);
+  evTag->SetNumOfPhotons(nGamas);
+  evTag->SetNumOfPi0s(nPi0s);
+  evTag->SetNumOfNeutrons(nNeutrons);
+  evTag->SetNumOfKaon0s(nK0s);
+  evTag->SetNumOfLambdas(nLambdas);
+  
+  evTag->SetNumOfChargedAbove1GeV(nCh1GeV);
+  evTag->SetNumOfChargedAbove3GeV(nCh3GeV);
+  evTag->SetNumOfChargedAbove10GeV(nCh10GeV);
+  evTag->SetNumOfMuonsAbove1GeV(nMu1GeV);
+  evTag->SetNumOfMuonsAbove3GeV(nMu3GeV);
+  evTag->SetNumOfMuonsAbove10GeV(nMu10GeV);
+  evTag->SetNumOfElectronsAbove1GeV(nEl1GeV);
+  evTag->SetNumOfElectronsAbove3GeV(nEl3GeV);
+  evTag->SetNumOfElectronsAbove10GeV(nEl10GeV);
+
+  tmp.Clear();
+  evTag->SetNumOfPHOSClusters(esd->GetPHOSClusters(&tmp));
+  tmp.Clear();
+  evTag->SetNumOfEMCALClusters(esd->GetEMCALClusters(&tmp));
+    
+  evTag->SetTotalMomentum(totalP);
+  evTag->SetMeanPt(meanPt);
+  evTag->SetMaxPt(maxPt);
+  evTag->SetEtaMaxPt(etamaxPt);
+  evTag->SetPhiMaxPt(phimaxPt);
+
+  evTag->SetPhysicsFlag(kTRUE);
+  evTag->SetBackgroungFlag(kFALSE);
+}
+
+void AliESDTagCreator::CreateESDRunTagSummary(TTree *chain)
+{
+  // Merge all tags from a run into a single RunTag
+  // with as many EventTags as there is files
+  AliRunTag *rtag;
+  chain->SetBranchAddress("AliTAG", &rtag);
+
+  TFile* ftag = TFile::Open("RunTagSummary.tag.root", "recreate");
+
+  AliRunTag *tag = new AliRunTag();
+  TTree * ttag = new TTree("T","A Tree with event tags");
+  TBranch * btag = ttag->Branch("AliTAG", &tag);
+  btag->SetCompressionLevel(9);
+  
+  for (int itag=0; itag<chain->GetEntries(); itag++) {
+    chain->GetEntry(itag);
+    tag->CopyStandardContent(rtag);
+    
+    TString curguid="";
+
+    for (int iev=0; iev<rtag->GetEventTags()->GetEntries(); iev++) {
+      if (!curguid.Contains(((AliEventTag *) rtag->GetEventTags()->At(iev))->GetGUID())) {
+       curguid = ((AliEventTag *) rtag->GetEventTags()->At(iev))->GetGUID();
+       cout << "Adding " << curguid << endl;
+       tag->AddEventTag(*((AliEventTag *) rtag->GetEventTags()->At(iev)));
+      }
+    }
+
+    ttag->Fill();
+    tag->Clear();
+  }
+
+  ftag->cd();
+  ttag->Write();
+  ftag->Close();
+  
+}
index fe76f04ddf909f4037bb98434bc57e8d77c0c9b2..9e2eb34201e66dcd84bc9dee5f90e6c07a123f65 100644 (file)
@@ -35,6 +35,7 @@ class TFile;
 class TGridResult;
 
 class AliGRPObject;
+class AliEventTag;
 
 //___________________________________________________________________________
 class AliESDTagCreator : public AliTagCreator {
@@ -44,6 +45,8 @@ class AliESDTagCreator : public AliTagCreator {
   ~AliESDTagCreator(); 
 
   void CreateESDTags(Int_t fFirstEvent, Int_t fLastEvent, AliGRPObject *grpData, ULong_t * qa, Bool_t * es, Int_t qalength, Int_t eslength);
+  void CreateESDTagsFullRun(TTree *chain, AliGRPObject *grpData, ULong_t * qa, Bool_t * es, Int_t qalength, Int_t eslength);
+  void CreateESDRunTagSummary(TTree *chain);
 
   void SetInactiveBranches(const char* branches) {fBranches = branches;}
 
@@ -56,15 +59,17 @@ class AliESDTagCreator : public AliTagCreator {
   void CreateTag(TFile* file, const char *guid, const char *md5, const char *turl, Long64_t size, Int_t Counter);
   void CreateTag(TFile* file, const char *filepath, Int_t Counter);
 
+  void FillEventTag(TTree *chain, AliEventTag *evTag, Int_t iEventNumber, AliESDEvent *esd);
+
  private:
   void SwitchOffBranches() const;
   AliESDTagCreator(const AliESDTagCreator& creator);             
   AliESDTagCreator& operator=(const AliESDTagCreator& creator);
   
-  TChain *fChain; //chain of esd files
-  TList  *fGUIDList; //TList of guid TObjString
-  TList  *fMD5List; //TList of md5 TObjString
-  TList  *fTURLList; //TList of turl TObjString
+  TChain *fChain;     //chain of esd files
+  TList  *fGUIDList;  //TList of guid TObjString
+  TList  *fMD5List;   //TList of md5 TObjString
+  TList  *fTURLList;  //TList of turl TObjString
   TString fBranches;  //List of branches to be switched off (separated by space
   MemInfo_t *meminfo; //mem info
 
index 6eb15cdec3cc9474075db275da9fd9a6417ead55..5a1c4552a8d34ab685796de3a5413075908925e3 100644 (file)
@@ -33,6 +33,8 @@ ClassImp(AliEventTag)
     fBunchCrossNumber(0),
     fFiredTriggerClasses(),
     fEventType(0),
+    fPhysicsFlag(0),
+    fBackgroundFlag(0),
     fGUID(0),
     fPath(0),
     fsize(0),
@@ -120,6 +122,8 @@ AliEventTag::AliEventTag(const AliEventTag & evTag) :
   fBunchCrossNumber(evTag.fBunchCrossNumber),
   fFiredTriggerClasses(evTag.fFiredTriggerClasses),
   fEventType(evTag.fEventType),
+  fPhysicsFlag(evTag.fPhysicsFlag),
+  fBackgroundFlag(evTag.fBackgroundFlag),
   fGUID(evTag.fGUID),
   fPath(evTag.fPath),
   fsize(evTag.fsize),
@@ -209,6 +213,8 @@ AliEventTag & AliEventTag::operator=(const AliEventTag &evTag) {
     SetBunchCrossNumber(evTag.GetBunchCrossNumber());
     SetFiredTriggerClasses(evTag.GetFiredTriggerClasses());
     SetEventType(evTag.GetEventType());
+    SetPhysicsFlag(evTag.GetPhysicsFlag());
+    SetBackgroungFlag(evTag.GetBackgroundFlag());
     SetGUID(evTag.GetGUID());
     SetPath(evTag.GetPath());
     SetMD5(evTag.GetMD5());
index 960fae9eb09df38cfe6772d5e21209596742475e..9cbe4f248d73b7013bd1af6ec25c940745483f74 100644 (file)
@@ -32,6 +32,8 @@ class AliEventTag : public TObject {
 
   void SetFiredTriggerClasses(TString names) {fFiredTriggerClasses = names;}
   void SetEventType(UInt_t ntype) {fEventType = ntype;}
+  void SetPhysicsFlag(UShort_t nflag) {fPhysicsFlag = nflag;}
+  void SetBackgroungFlag(UShort_t nflag) {fBackgroundFlag = nflag;}
 
   void SetGUID(TString Pid) {fGUID = Pid;}
   void SetPath(TString Pid) {fPath = Pid;}
@@ -119,6 +121,8 @@ class AliEventTag : public TObject {
 
   TString GetFiredTriggerClasses() const {return fFiredTriggerClasses;}
   UInt_t GetEventType() const {return fEventType;}
+  UShort_t GetPhysicsFlag() const {return fPhysicsFlag;}
+  UShort_t GetBackgroundFlag() const {return fBackgroundFlag;}
 
   const char *GetGUID() const {return fGUID.Data();}
   const char *GetPath() const {return fPath.Data();}
@@ -205,6 +209,8 @@ class AliEventTag : public TObject {
   UShort_t  fBunchCrossNumber;              //The BC number
   TString   fFiredTriggerClasses;           //List of the fired trigger class names
   UInt_t    fEventType;                     //event type == 7 ==> PHYSICS_EVENT
+  UShort_t  fPhysicsFlag;                   //1 - flagged as correct physics event
+  UShort_t  fBackgroundFlag;                //1 - flagged by the background rejection procedure
 
   TString   fGUID;                         //The unique identifier of the file
   TString   fPath;                         //The file's path (local storage)
@@ -284,7 +290,7 @@ class AliEventTag : public TObject {
   Short_t   fNbPMV0A;                       //Total number of fired channels in V0 A side
   Short_t   fNbPMV0C;                       //Total number of fired channels in V0 C side
 
-  ClassDef(AliEventTag,15)  //(ClassName, ClassVersion)
+  ClassDef(AliEventTag,16)  //(ClassName, ClassVersion)
       };
 //___________________________________________________________________________
 
index fb90f087fda5a601bb909d349ff42f62d529f5f1..718b191acbe2c698d9a0895b50f3b4d5e99a2761 100644 (file)
@@ -169,7 +169,10 @@ AliEventTagCuts::AliEventTagCuts() :
   fNumberOfFiredChipsLayer2Min(0), fNumberOfFiredChipsLayer2Max(100000),
   fNumberOfFiredChipsLayer2Flag(kFALSE),
   fNumberOfSPDTrackletsMin(0), fNumberOfSPDTrackletsMax(100000),
-  fNumberOfSPDTrackletsFlag(kFALSE)
+  fNumberOfSPDTrackletsFlag(kFALSE),
+  
+  fFiredTriggerCleassFlag(kFALSE), fFiredTriggerCleass("")
+
 {
   //Default constructor which calls the Reset method.
   Reset();
@@ -335,6 +338,9 @@ void AliEventTagCuts::Reset() {
   fNumberOfFiredChipsLayer1Min = 0, fNumberOfFiredChipsLayer1Max = 100000;
   fNumberOfFiredChipsLayer2Min = 0, fNumberOfFiredChipsLayer2Max = 100000;
   fNumberOfSPDTrackletsMin = 0, fNumberOfSPDTrackletsMax = 100000;
+
+  fFiredTriggerCleass = "";
+  fFiredTriggerCleassFlag = kFALSE;
 }
 
 //___________________________________________________________________________
@@ -936,6 +942,12 @@ void AliEventTagCuts::SetHBTRadiiRange(Float_t low, Float_t high) {
   fHBTRadiiFlag = kTRUE;
 }
 
+void AliEventTagCuts::SetFiredTriggerClass(TString aclass)
+{
+  fFiredTriggerCleass = aclass;
+  fFiredTriggerCleassFlag = kTRUE;
+}
+
 //___________________________________________________________________________
 Bool_t AliEventTagCuts::IsAccepted(AliEventTag *EvTag) const {
   //Returns true if the event is accepted otherwise false.
@@ -1207,6 +1219,10 @@ Bool_t AliEventTagCuts::IsAccepted(AliEventTag *EvTag) const {
   if(fHBTRadiiFlag)
     if((EvTag->GetHBTRadii() < fHBTRadiiMin) || (EvTag->GetHBTRadii() > fHBTRadiiMax))
       return kFALSE; 
+
+  if (fFiredTriggerCleassFlag)
+    if (!EvTag->GetFiredTriggerClasses().Contains(fFiredTriggerCleass))
+      return kFALSE;
   
   return kTRUE;
 }
index a4c66eb1fcf00d701d4900720423c9a579e53b33..d3d35a663119da37ab3634d59c38a35730cd5bb5 100644 (file)
@@ -103,6 +103,9 @@ class AliEventTagCuts : public TObject {
   void SetNumberOfFiredChipsLayer2Range(Int_t low, Int_t high);
   void SetNumberOfSPDTrackletsRange(Int_t low, Int_t high);
 
+  // Trigger
+  void SetFiredTriggerClass(TString aclass);
+
   Bool_t IsAccepted(AliEventTag *EvTag) const;
 
   //____________________________________________________//
@@ -257,6 +260,8 @@ class AliEventTagCuts : public TObject {
   Int_t fNumberOfSPDTrackletsMin, fNumberOfSPDTrackletsMax;   //min/max number of SPD tracklets
   Bool_t fNumberOfSPDTrackletsFlag;                          // Shows whether this cut is used or not
 
+  Bool_t fFiredTriggerCleassFlag;                             // Shows whether this cut is used or not
+  TString fFiredTriggerCleass;                                // Triger class must be present to accept event
 
   ClassDef(AliEventTagCuts, 3)
 };
index 38844880833ebef4e8b043e217876000454bdf3a..5c1fa8250fb709beec557c10d5f7f104ce24b8ab 100644 (file)
@@ -32,11 +32,15 @@ ClassImp(AliRunTag)
     TObject(),
     fAliceRunId(-1),
     fAliceMagneticField(0.0),
+    fAliceDipoleField(0.0),
     fAliceRunStartTime(0),
     fAliceRunStopTime(0),
     fAlirootVersion(0),
     fRootVersion(0),
     fGeant3Version(0),
+    fLHCPeriod(0),
+    fRecPass(0),
+    fProductionName(0),
     fAliceRunQuality(0),
     fAliceBeamEnergy(0.0),
     fAliceBeamType(0),
@@ -71,11 +75,15 @@ AliRunTag::AliRunTag(const AliRunTag& tag):
 TObject(),
 fAliceRunId(tag.fAliceRunId),
 fAliceMagneticField(tag.fAliceMagneticField),
+fAliceDipoleField(tag.fAliceDipoleField),
 fAliceRunStartTime(tag.fAliceRunStartTime),
 fAliceRunStopTime(fAliceRunStopTime),
 fAlirootVersion(tag.fAlirootVersion),
 fRootVersion(tag.fRootVersion),
 fGeant3Version(tag.fGeant3Version),
+fLHCPeriod(tag.fLHCPeriod),
+fRecPass(tag.fRecPass),
+fProductionName(tag.fProductionName),
 fAliceRunQuality(tag.fAliceRunQuality),
 fAliceBeamEnergy(tag.fAliceBeamEnergy),
 fAliceBeamType(tag.fAliceBeamType),
@@ -113,11 +121,15 @@ AliRunTag& AliRunTag::operator = (const AliRunTag& tag) {
   if(&tag != this) {
     fAliceRunId               = tag.fAliceRunId ; 
     fAliceMagneticField       = tag.fAliceMagneticField ;
+    fAliceDipoleField         = tag.fAliceDipoleField ;
     fAliceRunStartTime        = tag.fAliceRunStartTime ; 
     fAliceRunStopTime         = tag.fAliceRunStopTime ; 
     fAlirootVersion           = tag.fAlirootVersion ; 
     fRootVersion              = tag.fRootVersion ;
     fGeant3Version            = tag.fGeant3Version ; 
+    fLHCPeriod                = tag.fLHCPeriod ; 
+    fRecPass                  = tag.fRecPass ; 
+    fProductionName           = tag.fProductionName ; 
     fAliceRunQuality          = tag.fAliceRunQuality ; 
     fAliceBeamEnergy          = tag.fAliceBeamEnergy ;
     fAliceBeamType            = tag.fAliceBeamType ; 
@@ -156,11 +168,15 @@ void AliRunTag::CopyStandardContent(AliRunTag *oldtag) {
   //function that copies the run, lhc and detector levels
   SetRunId(oldtag->GetRunId());
   SetMagneticField(oldtag->GetMagneticField());
+  SetDipoleField(oldtag->GetDipoleField());
   SetRunStartTime(oldtag->GetRunStartTime());
   SetRunStopTime(oldtag->GetRunStopTime());
   SetAlirootVersion(oldtag->GetAlirootVersion());
   SetRootVersion(oldtag->GetRootVersion());
   SetGeant3Version(oldtag->GetGeant3Version());
+  SetLHCPeriod(oldtag->GetLHCPeriod());
+  SetReconstructionPass(oldtag->GetReconstructionPass());
+  SetProductionName(oldtag->GetProductionName());
   SetRunQuality(oldtag->GetRunQuality());
   SetBeamEnergy(oldtag->GetBeamEnergy());
   SetBeamType(oldtag->GetBeamType());
@@ -170,7 +186,7 @@ void AliRunTag::CopyStandardContent(AliRunTag *oldtag) {
   SetDetectorTag(oldtag->GetDetectorTags()->GetIntDetectorMask());
   SetQA(*(oldtag->GetQA())) ;          
   SetQAArray(oldtag->GetQAArray(), oldtag->GetQALength()) ;  
-       SetEventSpecies(oldtag->GetEventSpecies(), oldtag->GetESLength()) ;  
+  SetEventSpecies(oldtag->GetEventSpecies(), oldtag->GetESLength()) ;  
 }
 
 //___________________________________________________________________________
@@ -208,6 +224,7 @@ void AliRunTag::SetLHCTag(Float_t lumin, TString type) {
 void AliRunTag::SetDetectorTag(UInt_t mask) {
   //Setter for the detector tags
   fDetectorTag.SetDetectorMask(mask);
+  fNumDetectors = fDetectorTag.GetDetectorMask()->GetEntries();
 }
 
 //___________________________________________________________________________
index 7672f8bd20558f6004f4b6ea845345c555cefd0e..c159610d6ca70e67d5048d6c8d84d25611a5fe58 100644 (file)
@@ -34,11 +34,15 @@ class AliRunTag : public TObject {
   //____________________________________________________//
   void SetRunId(Int_t Pid) {fAliceRunId = Pid;}
   void SetMagneticField(Float_t Pmag) {fAliceMagneticField = Pmag;}
+  void SetDipoleField(Float_t Pmag) {fAliceDipoleField = Pmag;}
   void SetRunStartTime(Int_t Pt0) {fAliceRunStartTime = Pt0;}
   void SetRunStopTime(Int_t Pt1) {fAliceRunStopTime = Pt1;}
   void SetAlirootVersion(TString v) {fAlirootVersion = v;}
   void SetRootVersion(TString v) {fRootVersion = v;}
   void SetGeant3Version(TString v) {fGeant3Version = v;}
+  void SetLHCPeriod(TString v) {fLHCPeriod = v; }
+  void SetReconstructionPass(TString v) {fRecPass = v; }
+  void SetProductionName(TString v) {fProductionName = v; }
   void SetRunQuality(Int_t Pn) {fAliceRunQuality = Pn;}
   void SetBeamEnergy(Float_t PE) {fAliceBeamEnergy = PE;}
   void SetBeamType(TString Ptype) {fAliceBeamType = Ptype;}
@@ -58,11 +62,15 @@ class AliRunTag : public TObject {
   //____________________________________________________//
   Int_t       GetRunId() const {return fAliceRunId;}
   Float_t     GetMagneticField() const {return fAliceMagneticField;}
+  Float_t     GetDipoleField() const {return fAliceDipoleField;}
   Int_t       GetRunStartTime() const {return fAliceRunStartTime;}
   Int_t       GetRunStopTime() const {return fAliceRunStopTime;}
   const char* GetAlirootVersion() const {return fAlirootVersion.Data();}
   const char* GetRootVersion() const {return fRootVersion.Data();}
   const char* GetGeant3Version() const {return fGeant3Version.Data();}
+  const char* GetLHCPeriod() const {return fLHCPeriod.Data();}
+  const char* GetReconstructionPass() const {return fRecPass.Data();}
+  const char* GetProductionName() const {return fProductionName.Data();}
   Int_t       GetRunQuality() const {return fAliceRunQuality;}
   Float_t     GetBeamEnergy() const {return fAliceBeamEnergy;}
   const char *GetBeamType() const {return fAliceBeamType.Data();}
@@ -82,11 +90,15 @@ class AliRunTag : public TObject {
  private:
   Int_t        fAliceRunId;              //the run id
   Float_t      fAliceMagneticField;      //value of the magnetic field
+  Float_t      fAliceDipoleField;        //value of the magnetic field in dipole
   Int_t        fAliceRunStartTime;       //run start date
   Int_t        fAliceRunStopTime;        //run stop date
   TString      fAlirootVersion;          //aliroot version
   TString      fRootVersion;             //root version
   TString      fGeant3Version;           //geant3 version
+  TString      fLHCPeriod;               //datataking period
+  TString      fRecPass;                 //Reconstruction pass number
+  TString      fProductionName;          //production name
   Bool_t       fAliceRunQuality;         //validation script
   Float_t      fAliceBeamEnergy;         //beam energy cm
   TString      fAliceBeamType;           //run type (pp, AA, pA)
@@ -103,7 +115,7 @@ class AliRunTag : public TObject {
   Int_t        fESLength;                // Length of the Event Specie Length
   Bool_t *     fEventSpecies;           //[fESLength] EventSpecies in this run 
   
-  ClassDef(AliRunTag,6)  //(ClassName, ClassVersion)
+  ClassDef(AliRunTag,7)  //(ClassName, ClassVersion)
 };
 //___________________________________________________________________________
 
index db9f2ed082060b3cf33c4746d11674d74ff8ab73..c7c1106a28547a6fc3410f9ff06516b78af424f1 100644 (file)
@@ -136,6 +136,80 @@ Bool_t AliTagCreator::MergeTags(const char *type) {
   return kTRUE;
 }
 
+
+//__________________________________________________________________________
+Bool_t AliTagCreator::MergeTags(const char *type, const char *inflist) {
+  //Merges the tags and stores the merged tag file 
+  //locally if fStorage=0 or in the grid if fStorage=1
+  AliInfo(Form("Merging tags....."));
+  TChain *fgChain = new TChain("T");
+  TString tagPattern = type; tagPattern += ".tag.root"; 
+
+//   if(fStorage == 0) {
+//     // Open the working directory
+//     void * dirp = gSystem->OpenDirectory(gSystem->pwd());
+//     const char * name = 0x0;
+//     // Add all files matching *pattern* to the chain
+//     while((name = gSystem->GetDirEntry(dirp))) {
+//       if (strstr(name,tagPattern)) fgChain->Add(name);  
+//     }//directory loop
+//     AliInfo(Form("Chained tag files: %d",fgChain->GetEntries()));
+//   }//local mode
+
+//   else if(fStorage == 1) {
+//     TString alienLocation = gGrid->Pwd();
+//     alienLocation += fgridpath.Data();
+//     alienLocation += "/";
+//     TString queryPattern = "*."; queryPattern += tagPattern;
+//     TGridResult *tagresult = gGrid->Query(alienLocation,queryPattern.Data(),"","");
+//     Int_t nEntries = tagresult->GetEntries();
+//     for(Int_t i = 0; i < nEntries; i++) {
+//       TString alienUrl = tagresult->GetKey(i,"turl");
+//       fgChain->Add(alienUrl);
+//     }//grid result loop      
+//     AliInfo(Form("Chained tag files: %d",fgChain->GetEntries()));
+//   }//grid mode
+
+  if (fStorage == 0) {
+    ifstream *istr = new ifstream(inflist);
+    char fname[200];
+    while (!(istr->eof())) {
+      (*istr) >> fname;
+      if (strstr(fname, tagPattern)) fgChain->Add(fname);
+    }
+    AliInfo(Form("Chained tag files: %d",fgChain->GetEntries()));
+  }
+  AliRunTag *tag = new AliRunTag;
+  fgChain->SetBranchAddress("AliTAG",&tag);
+  fgChain->GetEntry(0);
+  TString localFileName = "Run"; localFileName += tag->GetRunId(); 
+  localFileName += ".Merged."; localFileName += tagPattern.Data();
+     
+  TString filename;
+  
+  if(fStorage == 0) {
+    filename = localFileName.Data();      
+    AliInfo(Form("Writing merged tags to local file: %s",filename.Data()));
+  } 
+  else if(fStorage == 1) {
+    TString alienFileName = "/alien";
+    alienFileName += gGrid->Pwd();
+    alienFileName += fgridpath.Data();
+    alienFileName += "/";
+    alienFileName +=  localFileName;
+    alienFileName += "?se=";
+    alienFileName += fSE.Data();
+    filename = alienFileName.Data();
+    AliInfo(Form("Writing merged tags to grid file: %s",filename.Data()));     
+  }
+
+  fgChain->Merge(filename);
+  gSystem->Exec("rm Run*.Event*");
+
+  return kTRUE;
+}
+
 //__________________________________________________________________________
 Bool_t AliTagCreator::MergeTags(const char *type, TGridResult *result) {
   //Merges the tags that are listed in the TGridResult 
@@ -180,3 +254,235 @@ Bool_t AliTagCreator::MergeTags(const char *type, TGridResult *result) {
 
   return kTRUE;
 }
+
+Bool_t AliTagCreator::MergeTagsForRun(const char* type) {
+  //Merges the tags and stores the merged tag file 
+  //locally if fStorage=0 or in the grid if fStorage=1
+  AliInfo(Form("Merging tags....."));
+  TChain *fgChain = new TChain("T");
+  TString tagPattern = type; tagPattern += ".tag.root"; 
+
+  if(fStorage == 0) {
+    // Open the working directory
+    void * dirp = gSystem->OpenDirectory(gSystem->pwd());
+    const char * name = 0x0;
+    // Add all files matching *pattern* to the chain
+    while((name = gSystem->GetDirEntry(dirp))) {
+      if (strstr(name,tagPattern)) fgChain->Add(name);  
+    }//directory loop
+    AliInfo(Form("Chained tag files: %d",fgChain->GetEntries()));
+  }//local mode
+
+  else if(fStorage == 1) {
+    TString alienLocation = gGrid->Pwd();
+    alienLocation += fgridpath.Data();
+    alienLocation += "/";
+    TString queryPattern = "*."; queryPattern += tagPattern;
+    TGridResult *tagresult = gGrid->Query(alienLocation,queryPattern.Data(),"","");
+    Int_t nEntries = tagresult->GetEntries();
+    for(Int_t i = 0; i < nEntries; i++) {
+      TString alienUrl = tagresult->GetKey(i,"turl");
+      fgChain->Add(alienUrl);
+    }//grid result loop      
+    AliInfo(Form("Chained tag files: %d",fgChain->GetEntries()));
+  }//grid mode
+  AliRunTag *tag = new AliRunTag;
+  fgChain->SetBranchAddress("AliTAG",&tag);
+  fgChain->GetEntry(0);
+  TString localFileName = "Run"; localFileName += tag->GetRunId(); 
+  localFileName += ".Merged."; localFileName += tagPattern.Data();
+     
+  TString filename;
+  
+  if(fStorage == 0) {
+    filename = localFileName.Data();      
+    AliInfo(Form("Writing merged tags to local file: %s",filename.Data()));
+  } 
+  else if(fStorage == 1) {
+    TString alienFileName = "/alien";
+    alienFileName += gGrid->Pwd();
+    alienFileName += fgridpath.Data();
+    alienFileName += "/";
+    alienFileName +=  localFileName;
+    alienFileName += "?se=";
+    alienFileName += fSE.Data();
+    filename = alienFileName.Data();
+    AliInfo(Form("Writing merged tags to grid file: %s",filename.Data()));     
+  }
+
+  //  fgChain->Merge(filename);
+  MergeToSingleRunTag(fgChain, filename);
+
+  gSystem->Exec("rm Run*.Event*");
+
+  return kTRUE;
+}
+
+Bool_t AliTagCreator::MergeTagsForRun(const char* type, TGridResult *result) {
+  //Merges the tags that are listed in the TGridResult 
+  AliInfo(Form("Merging tags....."));
+  TChain *fgChain = new TChain("T");
+  TString tagPattern = "."; tagPattern += type; tagPattern += ".tag.root";
+
+  Int_t nEntries = result->GetEntries();
+
+  TString alienUrl;
+  for(Int_t i = 0; i < nEntries; i++) {
+    alienUrl = result->GetKey(i,"turl");
+    fgChain->Add(alienUrl);  
+  }
+  AliInfo(Form("Chained tag files: %d",fgChain->GetEntries()));
+  AliRunTag *tag = new AliRunTag;
+  fgChain->SetBranchAddress("AliTAG",&tag);
+  fgChain->GetEntry(0);
+    
+  TString localFileName = "Run"; localFileName += tag->GetRunId(); 
+  localFileName += ".Merged"; localFileName += tagPattern.Data();
+     
+  TString filename;
+  
+  if(fStorage == 0) {
+    filename = localFileName.Data();      
+    AliInfo(Form("Writing merged tags to local file: %s",filename.Data()));
+  } 
+  else if(fStorage == 1) {
+    TString alienFileName = "/alien";
+    alienFileName += gGrid->Pwd();
+    alienFileName += fgridpath.Data();
+    alienFileName += "/";
+    alienFileName +=  localFileName;
+    alienFileName += "?se=";
+    alienFileName += fSE.Data();
+    filename = alienFileName.Data();
+    AliInfo(Form("Writing merged tags to grid file: %s",filename.Data()));     
+  }
+  
+  //  fgChain->Merge(filename);
+  MergeToSingleRunTag(fgChain, filename);
+
+  return kTRUE;
+}
+
+Bool_t AliTagCreator::MergeTagsForRun(const char* type, const char *inflist) {
+  //Merges the tags and stores the merged tag file 
+  //locally if fStorage=0 or in the grid if fStorage=1
+  AliInfo(Form("Merging tags....."));
+  TChain *fgChain = new TChain("T");
+  TString tagPattern = type; tagPattern += ".tag.root"; 
+
+//   if(fStorage == 0) {
+//     // Open the working directory
+//     void * dirp = gSystem->OpenDirectory(gSystem->pwd());
+//     const char * name = 0x0;
+//     // Add all files matching *pattern* to the chain
+//     while((name = gSystem->GetDirEntry(dirp))) {
+//       if (strstr(name,tagPattern)) fgChain->Add(name);  
+//     }//directory loop
+//     AliInfo(Form("Chained tag files: %d",fgChain->GetEntries()));
+//   }//local mode
+
+//   else if(fStorage == 1) {
+//     TString alienLocation = gGrid->Pwd();
+//     alienLocation += fgridpath.Data();
+//     alienLocation += "/";
+//     TString queryPattern = "*."; queryPattern += tagPattern;
+//     TGridResult *tagresult = gGrid->Query(alienLocation,queryPattern.Data(),"","");
+//     Int_t nEntries = tagresult->GetEntries();
+//     for(Int_t i = 0; i < nEntries; i++) {
+//       TString alienUrl = tagresult->GetKey(i,"turl");
+//       fgChain->Add(alienUrl);
+//     }//grid result loop      
+//     AliInfo(Form("Chained tag files: %d",fgChain->GetEntries()));
+//   }//grid mode
+
+  if (fStorage == 0) {
+    ifstream *istr = new ifstream(inflist);
+    char fname[200];
+    while (!(istr->eof())) {
+      (*istr) >> fname;
+      if (strstr(fname, tagPattern)) fgChain->Add(fname);
+    }
+    AliInfo(Form("Chained tag files: %d",fgChain->GetEntries()));
+  }
+  AliRunTag *tag = new AliRunTag;
+  fgChain->SetBranchAddress("AliTAG",&tag);
+  fgChain->GetEntry(0);
+  TString localFileName = "Run"; localFileName += tag->GetRunId(); 
+  localFileName += ".Merged."; localFileName += tagPattern.Data();
+     
+  TString filename;
+  
+  if(fStorage == 0) {
+    filename = localFileName.Data();      
+    AliInfo(Form("Writing merged tags to local file: %s",filename.Data()));
+  } 
+  else if(fStorage == 1) {
+    TString alienFileName = "/alien";
+    alienFileName += gGrid->Pwd();
+    alienFileName += fgridpath.Data();
+    alienFileName += "/";
+    alienFileName +=  localFileName;
+    alienFileName += "?se=";
+    alienFileName += fSE.Data();
+    filename = alienFileName.Data();
+    AliInfo(Form("Writing merged tags to grid file: %s",filename.Data()));     
+  }
+
+  //  fgChain->Merge(filename);
+  MergeToSingleRunTag(fgChain, filename);
+
+  gSystem->Exec("rm Run*.Event*");
+
+  return kTRUE;
+}
+
+
+Bool_t AliTagCreator::MergeToSingleRunTag(TChain *chain, const char *filename)
+{
+  // Merge all tags for a given run into a single RunTag
+  TFile* ftag = TFile::Open(filename, "recreate");
+
+  AliRunTag *tag = new AliRunTag;
+  TTree * ttag = new TTree("T","A Tree with event tags");
+  TBranch * btag = ttag->Branch("AliTAG", &tag);
+  btag->SetCompressionLevel(9);
+
+  AliRunTag *rtag = new AliRunTag();
+  chain->SetBranchAddress("AliTAG", &rtag);
+
+  if (chain->GetEntries()) {
+    chain->GetEntry(0);
+    tag->CopyStandardContent(rtag);
+
+    int runno = rtag->GetRunId();
+
+    for (int iter=0; iter<chain->GetEntries(); iter++) {
+      chain->GetEntry(iter);
+      if (runno != rtag->GetRunId()) {
+       AliInfo(Form("Run tag ID %i is different from the Run ID for the merged run: %i\n", rtag->GetRunId(), runno));
+       continue;
+      }
+
+      for (int iev=0; iev<rtag->GetEventTags()->GetEntries(); iev++) {
+       tag->AddEventTag(*((AliEventTag *) rtag->GetEventTags()->At(iev)));
+      }
+    }
+  }
+  else {
+    AliInfo("Found no tag files to merge.");
+    return kFALSE;
+  }
+
+  ttag->Fill();
+
+  ftag->cd();
+  tag->Clear();
+  ttag->Write();
+  ftag->Close();
+  
+  return kTRUE;
+}
+
+
index 49aa1e590a0a282e98d78a260cabcca93307f97a..0316373310b33c2bc8d101f1972cd66aa9aea792 100644 (file)
@@ -27,7 +27,7 @@
 #include <TObject.h>
 
 class TGridResult;
-
+class TChain;
 
 //___________________________________________________________________________
 class AliTagCreator : public TObject {
@@ -39,6 +39,11 @@ class AliTagCreator : public TObject {
   //____________________________________________________//
   Bool_t MergeTags(const char* type);
   Bool_t MergeTags(const char* type, TGridResult *result);
+  Bool_t MergeTags(const char *type, const char *inflist);
+
+  Bool_t MergeTagsForRun(const char* type);
+  Bool_t MergeTagsForRun(const char* type, TGridResult *result);
+  Bool_t MergeTagsForRun(const char* type, const char *inflist);
 
   void SetSE(const char *se){fSE = se;}
   void SetStorage(Int_t storage);
@@ -46,6 +51,9 @@ class AliTagCreator : public TObject {
 
   //____________________________________________________//
  protected:
+
+  Bool_t MergeToSingleRunTag(TChain *chain, const char *filename);
+
   TString fSE;   //the defined storage element
   TString fgridpath;   //the alien location of the tag files
   Int_t fStorage;  //0:local - 1:grid