From 11e88ff8d245607c8491e1e8df763eb934f9b742 Mon Sep 17 00:00:00 2001 From: jthaeder Date: Sat, 6 Nov 2010 18:33:27 +0000 Subject: [PATCH] Add output of VZERO reco directly to multCorr --- .../physics/AliHLTMultiplicityCorrelations.cxx | 6 +++++- .../physics/AliHLTMultiplicityCorrelations.h | 4 ++-- .../AliHLTMultiplicityCorrelationsComponent.cxx | 17 +++++++++++++++-- 3 files changed, 22 insertions(+), 5 deletions(-) diff --git a/HLT/global/physics/AliHLTMultiplicityCorrelations.cxx b/HLT/global/physics/AliHLTMultiplicityCorrelations.cxx index 4c534ba89fd..4be147ae4fc 100644 --- a/HLT/global/physics/AliHLTMultiplicityCorrelations.cxx +++ b/HLT/global/physics/AliHLTMultiplicityCorrelations.cxx @@ -113,7 +113,8 @@ Int_t AliHLTMultiplicityCorrelations::Initialize() { */ //################################################################################## -Int_t AliHLTMultiplicityCorrelations::ProcessEvent( AliESDEvent *esd, Int_t nSpdClusters) { +Int_t AliHLTMultiplicityCorrelations::ProcessEvent( AliESDEvent *esd, AliESDVZERO* esdVZERO, + Int_t nSpdClusters) { // see header file for class documentation Int_t iResult = 0; @@ -122,6 +123,9 @@ Int_t AliHLTMultiplicityCorrelations::ProcessEvent( AliESDEvent *esd, Int_t nSpd HLTWarning("No ESD event."); return -1; } + + if ( esdVZERO ) + fESDVZERO = esdVZERO; // -- TPC .. To be done before the others if (fESDEvent->GetNumberOfTracks() > 0) diff --git a/HLT/global/physics/AliHLTMultiplicityCorrelations.h b/HLT/global/physics/AliHLTMultiplicityCorrelations.h index 07f2e9b1dad..d737fa29d4b 100644 --- a/HLT/global/physics/AliHLTMultiplicityCorrelations.h +++ b/HLT/global/physics/AliHLTMultiplicityCorrelations.h @@ -131,10 +131,10 @@ public: */ /** Process current event */ - Int_t ProcessEvent( AliESDEvent *esd, Int_t nSpdClusters ); + Int_t ProcessEvent( AliESDEvent *esd, AliESDVZERO* esdVZERO, Int_t nSpdClusters ); Int_t ProcessEvent( AliESDEvent *esd ) { - return ProcessEvent(esd, 0); + return ProcessEvent(esd, NULL, 0); } diff --git a/HLT/global/physics/AliHLTMultiplicityCorrelationsComponent.cxx b/HLT/global/physics/AliHLTMultiplicityCorrelationsComponent.cxx index 37d2155ae98..77c6b3c4613 100644 --- a/HLT/global/physics/AliHLTMultiplicityCorrelationsComponent.cxx +++ b/HLT/global/physics/AliHLTMultiplicityCorrelationsComponent.cxx @@ -27,7 +27,7 @@ using namespace std; #include "TMap.h" #include "TObjString.h" - +#include "AliESDVZERO.h" #include "AliESDtrackCuts.h" #include "AliHLTMultiplicityCorrelations.h" @@ -85,6 +85,7 @@ void AliHLTMultiplicityCorrelationsComponent::GetInputDataTypes( vectorGetStdContent(); } + // -- Get VZEROESD object + AliESDVZERO *esdVZERO = NULL; + for ( const TObject *iter = GetFirstInputObject(kAliHLTDataTypeESDContent|kAliHLTDataOriginVZERO); + iter != NULL; iter = GetNextInputObject() ) { + esdVZERO = dynamic_cast(const_cast( iter ) ); + if( !esdVZERO ){ + HLTWarning("Wrong VZERO ESDEvent object received"); + iResult = -1; + continue; + } + } + // -- Get SPD clusters // --------------------- const AliHLTComponentBlockData* iter = NULL; @@ -531,7 +544,7 @@ Int_t AliHLTMultiplicityCorrelationsComponent::DoEvent(const AliHLTComponentEven // -- Process Event // ------------------ if (esdEvent) - iResult = fCorrObj->ProcessEvent(esdEvent,totalSpacePoint); + iResult = fCorrObj->ProcessEvent(esdEvent,esdVZERO,totalSpacePoint); if (iResult) { HLTError("Error while processing event inside multiplicity correlation object"); -- 2.31.1