From c8fc4838053f2b14eb840d28f4d2618c7029c384 Mon Sep 17 00:00:00 2001 From: slindal Date: Mon, 1 Nov 2010 11:03:48 +0000 Subject: [PATCH] Cosmetics. Fixed bug preventing creation of async block list --- HLT/BASE/AliHLTHOMERManager.cxx | 6 ++++++ HLT/BASE/AliHLTHOMERProxyHandler.cxx | 2 +- HLT/EVE/AliHLTEveEmcal.cxx | 8 -------- HLT/EVE/AliHLTEveHLT.cxx | 25 ++++++++++++++++++++++--- HLT/EVE/AliHLTEveHLT.h | 3 +++ 5 files changed, 32 insertions(+), 12 deletions(-) diff --git a/HLT/BASE/AliHLTHOMERManager.cxx b/HLT/BASE/AliHLTHOMERManager.cxx index d28b760f3fc..ad3df5ef891 100644 --- a/HLT/BASE/AliHLTHOMERManager.cxx +++ b/HLT/BASE/AliHLTHOMERManager.cxx @@ -765,6 +765,7 @@ Int_t AliHLTHOMERManager::HandleBlocks() { if ( IsSyncBlocks() ) { //AddBlockListToBuffer(); + fBlockList->Clear(); AddToBlockList(); } else { AddToAsyncBlockList(); @@ -787,6 +788,11 @@ Bool_t AliHLTHOMERManager::IsSyncBlocks() { bResult = kTRUE; break; } + + if ( !GetBlkType().CompareTo("GLOBTRIG")) { + bResult = kTRUE; + break; + } if ( !GetBlkType().CompareTo("ROOTTOBJ") ) { AliHLTHOMERBlockDesc blockDesc; diff --git a/HLT/BASE/AliHLTHOMERProxyHandler.cxx b/HLT/BASE/AliHLTHOMERProxyHandler.cxx index e241174cbd9..87f5fff4e32 100644 --- a/HLT/BASE/AliHLTHOMERProxyHandler.cxx +++ b/HLT/BASE/AliHLTHOMERProxyHandler.cxx @@ -281,7 +281,7 @@ Int_t AliHLTHOMERProxyHandler::ProcessXmlRpcResponse() { TDOMParser xmlParser; xmlParser.SetValidate(kFALSE); - HLTDebug(Form("XMLResponse: %s",fXmlRpcResponse.Data())); + HLTInfo(Form("XMLResponse: %s",fXmlRpcResponse.Data())); iResult = xmlParser.ParseBuffer(fXmlRpcResponse.Data(), fXmlRpcResponse.Length()); if ( iResult < 0 ) { diff --git a/HLT/EVE/AliHLTEveEmcal.cxx b/HLT/EVE/AliHLTEveEmcal.cxx index 38378683e09..3fa11b6ba55 100644 --- a/HLT/EVE/AliHLTEveEmcal.cxx +++ b/HLT/EVE/AliHLTEveEmcal.cxx @@ -24,7 +24,6 @@ #include "TCanvas.h" #include "AliHLTEveBase.h" #include "TEveBoxSet.h" -#include "AliPHOSGeometry.h" #include "TVector3.h" #include "AliEveHLTEventManager.h" #include "TEveManager.h" @@ -59,14 +58,7 @@ AliHLTEveEmcal::~AliHLTEveEmcal() void AliHLTEveEmcal::CreateElementList() { - - //TEveGeoShapeExtract * shape = new TEveGeoShapeExtract(); TGeoNode * gEMCALNode = gGeoManager->GetTopVolume()->FindNode("XEN1_1"); - //TEveGeoNode * eveNode = new TEveGeoNode(gEMCALNode); - //TEveGeoShapeExtract* juice = eveNode->DumpShapeTree(this, shape, kFALSE); - //juice->Dump(); - //eveNode->WriteExtract("out.root", kFALSE); - //gStyle->SetPalette(1, 0); TEveRGBAPalette* pal = new TEveRGBAPalette(0, 512); diff --git a/HLT/EVE/AliHLTEveHLT.cxx b/HLT/EVE/AliHLTEveHLT.cxx index aa4025eed7b..b448fa50948 100644 --- a/HLT/EVE/AliHLTEveHLT.cxx +++ b/HLT/EVE/AliHLTEveHLT.cxx @@ -22,6 +22,7 @@ #include "AliHLTHOMERBlockDesc.h" #include "AliHLTEveBase.h" #include "AliEveHLTEventManager.h" +#include "AliHLTGlobalTriggerDecision.h" #include "TEveManager.h" #include "TEvePointSet.h" #include "TEveTrack.h" @@ -60,7 +61,7 @@ AliHLTEveHLT::AliHLTEveHLT() : // Constructor. //CreateHistograms(); } - +///___________________________________________________________________ AliHLTEveHLT::~AliHLTEveHLT() { //Destructor, not implemented @@ -68,7 +69,7 @@ AliHLTEveHLT::~AliHLTEveHLT() delete fTrackList; fTrackList = NULL; } - +///____________________________________________________________________ void AliHLTEveHLT::ProcessEsdEvent( AliESDEvent * esd ) { //See header file for documentation if(!fTrackList) CreateTrackList(); @@ -90,9 +91,14 @@ void AliHLTEveHLT::ProcessBlock(AliHLTHOMERBlockDesc * block) { } else if ( ! block->GetDataType().CompareTo("HLTRDLST") ) { + cout << "ignoring hlt rdlst"<GetDataType().CompareTo("GLOBTRIG") ) { + ProcessGlobalTrigger( block ); + } + else if ( !block->GetDataType().CompareTo("ROOTHIST") ) { if( !fCanvas ) { fCanvas = CreateCanvas("Primary Vertex", "Primary Vertex"); @@ -117,8 +123,12 @@ void AliHLTEveHLT::ResetElements(){ cout << "destroy"<Destroy(); fTrackList = NULL; + // RemoveElement(fTrackList); + // TThread * destructor = new TThread(DestroyGarbage, (void*) this); + // destructor->Run(); + // fTrackList = NULL; } if(fPointSetVertex) fPointSetVertex->Reset(); @@ -190,7 +200,16 @@ void AliHLTEveHLT::CreateVertexPointSet() { AddElement(fPointSetVertex); } +///________________________________________________________________________ +void AliHLTEveHLT::ProcessGlobalTrigger( AliHLTHOMERBlockDesc * block ) { + //See header file for documentation + AliHLTGlobalTriggerDecision * decision = dynamic_cast(block->GetTObject()); + decision->Print(); + +} + +///______________________________________________________________________ void AliHLTEveHLT::ProcessEsdBlock( AliHLTHOMERBlockDesc * block, TEveTrackList * cont ) { //See header file for documentation diff --git a/HLT/EVE/AliHLTEveHLT.h b/HLT/EVE/AliHLTEveHLT.h index d31fb7fb317..5b45fb9b9b8 100644 --- a/HLT/EVE/AliHLTEveHLT.h +++ b/HLT/EVE/AliHLTEveHLT.h @@ -82,6 +82,9 @@ private: //Process histogram block void ProcessHistograms(AliHLTHOMERBlockDesc * block, TCanvas * canvas); + //Process trigger block + void ProcessGlobalTrigger(AliHLTHOMERBlockDesc * block); + //Create tpc qa histograms void CreateHistograms(); -- 2.39.3