From 4c454ade741a4b8aa6d8173c8de5be1fb05c8c2a Mon Sep 17 00:00:00 2001 From: cvetan Date: Thu, 9 Apr 2009 12:52:27 +0000 Subject: [PATCH] Putting the correct vzero information in the tags - only total multiplicity and number of fired cells on the A and C side. Correct filling of these data in AliESDTagCreator class. --- STEER/AliESDTagCreator.cxx | 24 ++++++++++++++++++++++++ STEER/AliEventTag.cxx | 24 ++++++++++++++---------- STEER/AliEventTag.h | 20 +++++++++++++------- 3 files changed, 51 insertions(+), 17 deletions(-) diff --git a/STEER/AliESDTagCreator.cxx b/STEER/AliESDTagCreator.cxx index 7534263bd1f..ac5723755d9 100644 --- a/STEER/AliESDTagCreator.cxx +++ b/STEER/AliESDTagCreator.cxx @@ -434,6 +434,12 @@ void AliESDTagCreator::CreateTag(TChain* chain, const char *type) { 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()); @@ -766,6 +772,12 @@ void AliESDTagCreator::CreateTag(TFile* file, const char *guid, const char *md5, 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()); @@ -1097,6 +1109,12 @@ void AliESDTagCreator::CreateTag(TFile* file, const char *filepath, Int_t Counte 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()); @@ -1442,6 +1460,12 @@ void AliESDTagCreator::CreateESDTags(Int_t fFirstEvent, Int_t fLastEvent, AliGRP 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()); diff --git a/STEER/AliEventTag.cxx b/STEER/AliEventTag.cxx index f5000869dcc..55af91d0b62 100644 --- a/STEER/AliEventTag.cxx +++ b/STEER/AliEventTag.cxx @@ -98,12 +98,14 @@ ClassImp(AliEventTag) fHBTRadii(-10.0), fNumberOfFiredChipsLayer1(0), fNumberOfFiredChipsLayer2(0), - fNumberOfSPDTracklets(0) + fNumberOfSPDTracklets(0), + fMTotV0A(0), + fMTotV0C(0), + fNbPMV0A(0), + fNbPMV0C(0) { // AliEventTag default constructor for(Int_t i=0; i<2; i++) fZDCEMEnergy[i] = -10.0; - for(Int_t i1 = 0; i1 < 64; i1++) fVZEROADC[i1] = 0; - for(Int_t i2 = 0; i2 < 64; i2++) fVZEROTime[i2] = kFALSE; } @@ -180,12 +182,14 @@ AliEventTag::AliEventTag(const AliEventTag & evTag) : fHBTRadii(evTag.fHBTRadii), fNumberOfFiredChipsLayer1(evTag.fNumberOfFiredChipsLayer1), fNumberOfFiredChipsLayer2(evTag.fNumberOfFiredChipsLayer2), - fNumberOfSPDTracklets(evTag.fNumberOfSPDTracklets) + fNumberOfSPDTracklets(evTag.fNumberOfSPDTracklets), + fMTotV0A(evTag.fMTotV0A), + fMTotV0C(evTag.fMTotV0C), + fNbPMV0A(evTag.fNbPMV0A), + fNbPMV0C(evTag.fNbPMV0C) { // EventTag copy constructor for(Int_t i=0; i<2; i++) fZDCEMEnergy[i] = evTag.fZDCEMEnergy[i]; - for(Int_t i1 = 0; i1 < 64; i1++) fVZEROADC[i1] = 0; - for(Int_t i2 = 0; i2 < 64; i2++) fVZEROTime[i2] = kFALSE; } //___________________________________________________________________________ @@ -265,10 +269,10 @@ AliEventTag & AliEventTag::operator=(const AliEventTag &evTag) { SetNumberOfFiredChipsLayer1(evTag.GetNumberOfFiredChipsLayer1()); SetNumberOfFiredChipsLayer2(evTag.GetNumberOfFiredChipsLayer2()); SetNumberOfSPDTracklets(evTag.GetNumberOfSPDTracklets()); - for(Int_t i1 = 0; i1 < 64; i1++) - SetVZEROADC(i1,evTag.GetVZEROADC(i1)); - for(Int_t i2 = 0; i2 < 64; i2++) - SetVZEROTime(i2,evTag.GetVZEROTime(i2)); + SetMTotV0A(evTag.GetMTotV0A()); + SetMTotV0C(evTag.GetMTotV0C()); + SetNbPMV0A(evTag.GetNbPMV0A()); + SetNbPMV0C(evTag.GetNbPMV0C()); } return *this; } diff --git a/STEER/AliEventTag.h b/STEER/AliEventTag.h index 678a3590739..b98c1059dfe 100644 --- a/STEER/AliEventTag.h +++ b/STEER/AliEventTag.h @@ -104,8 +104,10 @@ class AliEventTag : public TObject { void SetNumberOfFiredChipsLayer2(Int_t n) {fNumberOfFiredChipsLayer2 = n;} void SetNumberOfSPDTracklets(Int_t n) {fNumberOfSPDTracklets = n;} - void SetVZEROADC(Int_t n, UShort_t adc) {fVZEROADC[n] = adc;} - void SetVZEROTime(Int_t n, Bool_t time) {fVZEROTime[n] = time;} + void SetMTotV0A(Int_t mult) {fMTotV0A = mult;} + void SetMTotV0C(Int_t mult) {fMTotV0C = mult;} + void SetNbPMV0A(Short_t npmt) {fNbPMV0A = npmt;} + void SetNbPMV0C(Short_t npmt) {fNbPMV0C = npmt;} //____________________________________________________// UInt_t GetPeriodNumber() const {return fPeriodNumber;} @@ -185,8 +187,10 @@ class AliEventTag : public TObject { Int_t GetNumberOfFiredChipsLayer2() const {return fNumberOfFiredChipsLayer2;} Int_t GetNumberOfSPDTracklets() const {return fNumberOfSPDTracklets;} - UShort_t GetVZEROADC(Int_t n) const {return fVZEROADC[n];} - UShort_t GetVZEROTime(Int_t n) const {return fVZEROTime[n];} + Int_t GetMTotV0A() const {return fMTotV0A;} + Int_t GetMTotV0C() const {return fMTotV0C;} + Short_t GetNbPMV0A() const {return fNbPMV0A;} + Short_t GetNbPMV0C() const {return fNbPMV0C;} //____________________________________________________// private: @@ -266,10 +270,12 @@ class AliEventTag : public TObject { Int_t fNumberOfFiredChipsLayer2; //number of fired chips - layer 2 Int_t fNumberOfSPDTracklets; //number of SPD tracklets - UShort_t fVZEROADC[64]; //V0 raw adc values - Bool_t fVZEROTime[64]; //Flag if V0 TDC time measured + Int_t fMTotV0A; //Total multiplicity in V0 A side + Int_t fMTotV0C; //Total multiplicity in V0 C side + 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,11) //(ClassName, ClassVersion) + ClassDef(AliEventTag,12) //(ClassName, ClassVersion) }; //___________________________________________________________________________ -- 2.43.0