Skip to content

Commit

Permalink
Merge pull request alisw#20017 from iarsene/master
Browse files Browse the repository at this point in the history 
Add additional centrality estimators and comply with the naming conventions for centrality estimators in 2015/2018 datasets
  • Loading branch information
@alibuild
alibuild authored Mar 14, 2022
2 parents cf49326 + 00ce444 commit c6096e2
Show file tree
Hide file tree
Showing 5 changed files with 54 additions and 16 deletions.
18 changes: 16 additions & 2 deletions PWGDQ/reducedTree/AliAnalysisTaskReducedTreeMaker.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -976,6 +976,7 @@ void AliAnalysisTaskReducedTreeMaker::FillEventInfo()
else {
multSelection = (AliMultSelection*)event->FindListObject("MultSelection");
if(multSelection) {
Bool_t is2015PbPb = (event->GetRunNumber() <= 246994 && event->GetRunNumber() >= 244917);
fReducedEvent->fCentrality[0] = multSelection->GetMultiplicityPercentile("V0M");
fReducedEvent->fCentrality[1] = multSelection->GetMultiplicityPercentile("CL1");
fReducedEvent->fCentrality[2] = multSelection->GetMultiplicityPercentile("TRK");
Expand All @@ -984,8 +985,21 @@ void AliAnalysisTaskReducedTreeMaker::FillEventInfo()
fReducedEvent->fCentrality[5] = multSelection->GetMultiplicityPercentile("V0C");
fReducedEvent->fCentrality[6] = multSelection->GetMultiplicityPercentile("ZNA");
fReducedEvent->fCentrality[7] = multSelection->GetMultiplicityPercentile("V0MNew");
fReducedEvent->fCentrality[8] = multSelection->GetMultiplicityPercentile("V0MNewPlus1");
fReducedEvent->fCentrality[9] = multSelection->GetMultiplicityPercentile("V0MNewMinus1");
if(!is2015PbPb) {
fReducedEvent->fCentrality[8] = multSelection->GetMultiplicityPercentile("V0MNewplus05");
fReducedEvent->fCentrality[9] = multSelection->GetMultiplicityPercentile("V0MNewminus05");
}
if (is2015PbPb) {
fReducedEvent->fCentrality[10] = multSelection->GetMultiplicityPercentile("V0MNewPlus1");
fReducedEvent->fCentrality[11] = multSelection->GetMultiplicityPercentile("V0MNewMinus1");
} else {
fReducedEvent->fCentrality[10] = multSelection->GetMultiplicityPercentile("V0MNewplus10");
fReducedEvent->fCentrality[11] = multSelection->GetMultiplicityPercentile("V0MNewminus10");
}
fReducedEvent->fCentrality[12] = multSelection->GetMultiplicityPercentile("V0Mplus05");
fReducedEvent->fCentrality[13] = multSelection->GetMultiplicityPercentile("V0Mminus05");
fReducedEvent->fCentrality[14] = multSelection->GetMultiplicityPercentile("V0Mplus10");
fReducedEvent->fCentrality[15] = multSelection->GetMultiplicityPercentile("V0Mminus10");
fReducedEvent->fCentQuality = multSelection->GetEvSelCode();
}
}
Expand Down
8 changes: 4 additions & 4 deletions PWGDQ/reducedTree/AliReducedBaseEvent.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ AliReducedBaseEvent::AliReducedBaseEvent() :
// Constructor
//
for(Int_t i=0; i<3; ++i) {fVtx[i]=-999.;}
for(Int_t i=0; i<10; ++i) fCentrality[i]=-1.;
for(Int_t i=0; i<16; ++i) fCentrality[i]=-1.;
fNtracks[0]=0; fNtracks[1]=0;
fNV0candidates[0]=0; fNV0candidates[1]=0;
}
Expand All @@ -63,7 +63,7 @@ AliReducedBaseEvent::AliReducedBaseEvent(const Char_t* /*name*/, Int_t trackOpti
// Constructor
//
for(Int_t i=0; i<3; ++i) {fVtx[i]=-999.;}
for(Int_t i=0; i<10; ++i) fCentrality[i]=-1.;
for(Int_t i=0; i<16; ++i) fCentrality[i]=-1.;
fNtracks[0]=0; fNtracks[1]=0;
fNV0candidates[0]=0; fNV0candidates[1]=0;

Expand Down Expand Up @@ -109,7 +109,7 @@ void AliReducedBaseEvent::CopyEventHeader(const AliReducedBaseEvent* other) {
fRunNo = other->fRunNo;
for(Int_t i=0; i<3; ++i) fVtx[i] = other->fVtx[i];
fNVtxContributors = other->fNVtxContributors;
for(Int_t i=0; i<10; ++i) fCentrality[i] = other->fCentrality[i];
for(Int_t i=0; i<16; ++i) fCentrality[i] = other->fCentrality[i];
fCentQuality = other->fCentQuality;
fNtracks[0] = other->fNtracks[0];
fNV0candidates[0] = other->fNV0candidates[0];
Expand All @@ -126,7 +126,7 @@ void AliReducedBaseEvent::ClearEvent() {
fEventTag = 0;
fRunNo = 0;
fCentQuality = 0;
for(Int_t i=0;i<10;++i) fCentrality[i] = -9999.0;
for(Int_t i=0;i<16;++i) fCentrality[i] = -9999.0;
fNtracks[0] = 0; fNtracks[1] = 0;
fNV0candidates[0] = 0; fNV0candidates[1] = 0;
for(Int_t i=0; i<3; ++i) {fVtx[i]=-9999.;}
Expand Down
14 changes: 10 additions & 4 deletions PWGDQ/reducedTree/AliReducedBaseEvent.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,14 @@ class AliReducedBaseEvent : public TObject {
Float_t CentralityVZEROC() const {return fCentrality[5];}
Float_t CentralityZNA() const {return fCentrality[6];}
Float_t CentralityV0MNew() const {return fCentrality[7];}
Float_t CentralityV0MNewPlus1() const {return fCentrality[8];}
Float_t CentralityV0MNewMinus1() const {return fCentrality[9];}
Float_t CentralityV0MNewPlus05() const {return fCentrality[8];}
Float_t CentralityV0MNewMinus05() const {return fCentrality[9];}
Float_t CentralityV0MNewPlus10() const {return fCentrality[10];}
Float_t CentralityV0MNewMinus10() const {return fCentrality[11];}
Float_t CentralityV0MPlus05() const {return fCentrality[12];}
Float_t CentralityV0MMinus05() const {return fCentrality[13];}
Float_t CentralityV0MPlus10() const {return fCentrality[14];}
Float_t CentralityV0MMinus10() const {return fCentrality[15];}
Int_t CentralityQuality() const {return fCentQuality;}
Int_t NTracksTotal() const {return fNtracks[0];}
Int_t NTracks() const {return fNtracks[1];}
Expand Down Expand Up @@ -98,7 +104,7 @@ class AliReducedBaseEvent : public TObject {
Int_t fRunNo; // run number
Float_t fVtx[3]; // global event vertex vector in cm
Int_t fNVtxContributors; // global event vertex contributors
Float_t fCentrality[10]; // centrality; 0-V0M, 1-CL1, 2-TRK, 3-ZEMvsZDC, 4-V0A, 5-V0C, 6-ZNA, 7-VOMNew, 8-V0MNewPlus1, 9-V0MNewMinus1
Float_t fCentrality[16]; // centrality; 0-V0M, 1-CL1, 2-TRK, 3-ZEMvsZDC, 4-V0A, 5-V0C, 6-ZNA, 7-VOMNew, 8-V0MNewPlus05, 9-V0MNewMinus05, 10-V0MNewPlus10, 11-V0MNewMinus10, 12-V0MPlus05, 13-V0MMinus05, 14-V0MPlus10, 15-V0MMinus10,
Int_t fCentQuality; // quality flag for the centrality
Int_t fNtracks[2]; // number of tracks, [0]-total, [1]-selected for the tree
Int_t fNV0candidates[2]; // number of V0 candidates, [0]-total, [1]-selected for the tree
Expand All @@ -115,7 +121,7 @@ class AliReducedBaseEvent : public TObject {
AliReducedBaseEvent& operator= (const AliReducedBaseEvent &c);
AliReducedBaseEvent(const AliReducedBaseEvent &c);

ClassDef(AliReducedBaseEvent, 4);
ClassDef(AliReducedBaseEvent, 5);
};

#endif
20 changes: 16 additions & 4 deletions PWGDQ/reducedTree/AliReducedVarManager.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -444,8 +444,14 @@ void AliReducedVarManager::FillEventInfo(BASEEVENT* baseEvent, Float_t* values,
values[kCentVZEROC] = baseEvent->CentralityVZEROC();
values[kCentZNA] = baseEvent->CentralityZNA();
values[kCentV0MNew] = baseEvent->CentralityV0MNew();
values[kCentV0MNewPlus1] = baseEvent->CentralityV0MNewPlus1();
values[kCentV0MNewMinus1] = baseEvent->CentralityV0MNewMinus1();
values[kCentV0MNewPlus10] = baseEvent->CentralityV0MNewPlus10();
values[kCentV0MNewMinus10] = baseEvent->CentralityV0MNewMinus10();
values[kCentV0MNewPlus05] = baseEvent->CentralityV0MNewPlus05();
values[kCentV0MNewMinus05] = baseEvent->CentralityV0MNewMinus05();
values[kCentV0MPlus10] = baseEvent->CentralityV0MPlus10();
values[kCentV0MMinus10] = baseEvent->CentralityV0MMinus10();
values[kCentV0MPlus05] = baseEvent->CentralityV0MPlus05();
values[kCentV0MMinus05] = baseEvent->CentralityV0MMinus05();
values[kCentQuality] = baseEvent->CentralityQuality();

values[kNV0total] = baseEvent->NV0CandidatesTotal();
Expand Down Expand Up @@ -3102,8 +3108,14 @@ void AliReducedVarManager::SetDefaultVarNames() {
fgVariableNames[kCentVZEROC] = "VZERO-C centrality"; fgVariableUnits[kCentVZEROC] = "%";
fgVariableNames[kCentZNA] = "ZNA centrality"; fgVariableUnits[kCentZNA] = "%";
fgVariableNames[kCentV0MNew] = "V0MNew centrality"; fgVariableUnits[kCentV0MNew] = "%";
fgVariableNames[kCentV0MNewPlus1] = "V0MNewPlus1 centrality"; fgVariableUnits[kCentV0MNewPlus1] = "%";
fgVariableNames[kCentV0MNewMinus1] = "V0MNewMinus1 centrality"; fgVariableUnits[kCentV0MNewMinus1] = "%";
fgVariableNames[kCentV0MNewPlus05] = "V0MNewPlus05 centrality"; fgVariableUnits[kCentV0MNewPlus05] = "%";
fgVariableNames[kCentV0MNewMinus05] = "V0MNewMinus05 centrality"; fgVariableUnits[kCentV0MNewMinus05] = "%";
fgVariableNames[kCentV0MNewPlus10] = "V0MNewPlus10 centrality"; fgVariableUnits[kCentV0MNewPlus10] = "%";
fgVariableNames[kCentV0MNewMinus10] = "V0MNewMinus10 centrality"; fgVariableUnits[kCentV0MNewMinus10] = "%";
fgVariableNames[kCentV0MPlus05] = "V0MPlus05 centrality"; fgVariableUnits[kCentV0MPlus05] = "%";
fgVariableNames[kCentV0MMinus05] = "V0MMinus05 centrality"; fgVariableUnits[kCentV0MMinus05] = "%";
fgVariableNames[kCentV0MPlus10] = "V0MPlus10 centrality"; fgVariableUnits[kCentV0MPlus10] = "%";
fgVariableNames[kCentV0MMinus10] = "V0MMinus10 centrality"; fgVariableUnits[kCentV0MMinus10] = "%";
fgVariableNames[kCentQuality] = "Centrality quality"; fgVariableUnits[kCentQuality] = "";
fgVariableNames[kNV0total] = "Total number of V0s"; fgVariableUnits[kNV0total] = "";
fgVariableNames[kNV0selected] = "Number of selected V0s"; fgVariableUnits[kNV0selected] = "";
Expand Down
10 changes: 8 additions & 2 deletions PWGDQ/reducedTree/AliReducedVarManager.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -293,8 +293,14 @@ class AliReducedVarManager : public TObject {
kCentVZEROC, // centrality from VZERO-C
kCentZNA, // centrality from ZNA
kCentV0MNew, // centrality from V0MNew
kCentV0MNewPlus1, // centrality from V0MNewPlus1
kCentV0MNewMinus1, // centrality from V0MNewMinus1
kCentV0MNewPlus10, // centrality from V0MNewPlus10
kCentV0MNewMinus10, // centrality from V0MNewMinus10
kCentV0MNewPlus05, // centrality from V0MNewPlus05
kCentV0MNewMinus05, // centrality from V0MNewMinus05
kCentV0MPlus10, // centrality from V0MPlus10
kCentV0MMinus10, // centrality from V0MMinus10
kCentV0MPlus05, // centrality from V0MPlus05
kCentV0MMinus05, // centrality from V0MMinus05
kCentQuality, // centrality quality
kNV0total, // total number of V0s in the esd
kNV0selected, // number of V0s selected
Expand Down

0 comments on commit c6096e2

Please sign in to comment.