Cosmetics. Fixed bug preventing creation of async block list
authorslindal <slindal@f7af4fe6-9843-0410-8265-dc069ae4e863>
Mon, 1 Nov 2010 11:03:48 +0000 (11:03 +0000)
committerslindal <slindal@f7af4fe6-9843-0410-8265-dc069ae4e863>
Mon, 1 Nov 2010 11:03:48 +0000 (11:03 +0000)
HLT/BASE/AliHLTHOMERManager.cxx
HLT/BASE/AliHLTHOMERProxyHandler.cxx
HLT/EVE/AliHLTEveEmcal.cxx
HLT/EVE/AliHLTEveHLT.cxx
HLT/EVE/AliHLTEveHLT.h

index d28b760..ad3df5e 100644 (file)
@@ -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;
index e241174..87f5fff 100644 (file)
@@ -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 ) {
index 3837868..3fa11b6 100644 (file)
@@ -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);
index aa4025e..b448fa5 100644 (file)
@@ -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"<<endl;
     //processHLTRDLST( block );
   } 
 
+  else if ( ! block->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"<<endl;
   if(fTrackList) {
-    RemoveElement(fTrackList);
+    fTrackList->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<AliHLTGlobalTriggerDecision*>(block->GetTObject());
+  decision->Print();
+
+}
+
 
+///______________________________________________________________________
 void AliHLTEveHLT::ProcessEsdBlock( AliHLTHOMERBlockDesc * block, TEveTrackList * cont ) {
   //See header file for documentation
 
index d31fb7f..5b45fb9 100644 (file)
@@ -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();