-Added HLT test clusters to onlineDisplay macro,

-Added clusters to synchroneous block list

diff --git a/EVE/EveHLT/AliEveHOMERManager.h b/EVE/EveHLT/AliEveHOMERManager.h
index 5245e996b4826d6a1c9d55a99d08ef69dc88199d..ec1156772974e8f38e5c51cb3ba9f0d6044fb7e7 100644 (file)
--- a/EVE/EveHLT/AliEveHOMERManager.h
+++ b/EVE/EveHLT/AliEveHOMERManager.h
@@ -59,8 +59,6 @@ public:
   
   Int_t ConnectEVEtoHOMER(TString detector="ALL");
 
-  //  Int_t CheckTriggerDecision(TString triggers="ALL");
-
   void SetRetryCount(Int_t count, Int_t sleeptime) { fRetryCount = count; fRetrySleeptime = sleeptime; }
 
   ///////////////////////////////////////////////////////////////////////////////////

diff --git a/EVE/EveHLT/AliEveHOMERManagerEditor.cxx b/EVE/EveHLT/AliEveHOMERManagerEditor.cxx
index aba15800972b69c97fe7d1e1b84aa4f617a4a182..d1992c7213462a24ffdb684f91c93edcd22daf12 100644 (file)
--- a/EVE/EveHLT/AliEveHOMERManagerEditor.cxx
+++ b/EVE/EveHLT/AliEveHOMERManagerEditor.cxx
@@ -115,20 +115,6 @@ void AliEveHOMERManagerEditor::NextEvent() {
     if ( fM->NextEvent() )
     return;
 
-
-//   if ( iResult = fM->CheckTriggerDecision(fTriggerString) ) {
-    
-//     if(iResult == 1) {
-    
-//       fM->NextEvent();
-//       return;
-    
-//     } else if (iResult == 2) {
-    
-//       HLTError(Form("No trigger decision found in event"));
-//       return;
-//     }
-//   } 
     
   gROOT->ProcessLineFast("processEvent();");
 

diff --git a/EVE/hlt-macros/onlineDisplay.C b/EVE/hlt-macros/onlineDisplay.C
index 1c8bbe50bafeec064d64435a414dbced9b77e8e5..8d475657b56ecae279b89e44b19aaab3e6b6252d 100644 (file)
--- a/EVE/hlt-macros/onlineDisplay.C
+++ b/EVE/hlt-macros/onlineDisplay.C
@@ -214,6 +214,7 @@ TEvePointSet*                             gSDDClusters       = 0;
 TEvePointSet*                             gTRDClusters       = 0;
 TEvePointSetArray*                        gTRDColClusters    = 0;
 TEvePointSet*                             gTPCClusters       = 0;
+TEvePointSet*                             gTPCTestClusters       = 0;
 TEvePointSetArray*                        gTPCColClusters    = 0;
 TEveBoxSet*                               gPHOSBoxSet[5]     = {0, 0, 0, 0, 0}; 
 TEveBoxSet*                               gEMCALBoxSet[13]   = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
@@ -280,7 +281,7 @@ Int_t processHLTRDLST( AliHLTHOMERBlockDesc* block );
 
 Int_t processROOTTOBJ( AliHLTHOMERBlockDesc* block, TEveText* text );
 
-Int_t processTPCClusters( AliHLTHOMERBlockDesc * block, TEvePointSet *cont, TEvePointSetArray *contCol );
+Int_t processTPCClusters( AliHLTHOMERBlockDesc * block, TEvePointSet *cont, TEvePointSetArray *contCol = NULL );
 
 Int_t processTRDClusters( AliHLTHOMERBlockDesc * block, TEvePointSet *cont, TEvePointSetArray *contCol);
 
@@ -714,6 +715,7 @@ Int_t processEvent() {
   if ( gSSDClusters )  gSSDClusters->Reset();
   if ( gSDDClusters )  gSSDClusters->Reset();
   if ( gTPCClusters )  gTPCClusters->Reset();
+  if ( gTPCTestClusters )  gTPCTestClusters->Reset();
   if ( gTRDClusters )  gTRDClusters->Reset();
   if ( gMUONClusters ) gMUONClusters->Reset();
   if ( gMUONTracks ){
@@ -1095,8 +1097,7 @@ Int_t processEvent() {
   //   Reading out the histograms
   //===========================================================================
   TIter anext(gHomerManager->GetAsyncBlockList());
-  cout << gHomerManager->GetAsyncBlockList()->GetSize() << endl;
-  cout << "Asynced it"<<endl;
+  
   while ( (block = (AliHLTHOMERBlockDesc*)anext()) ) {
 
 #if 1 //DEBUG
@@ -1215,7 +1216,24 @@ Int_t processEvent() {
       
     } // "EMCAL" blocks end
 
-
+      //Extra TPC clusters set for testing
+    else if ( ! block->GetDetector().CompareTo("TPC") ) {
+      if ( ! block->GetDataType().CompareTo("HWCL_ALT") ) {
+       if(!gTPCTestClusters){    
+         
+         gTPCTestClusters = new TEvePointSet("TPC Clusters Test");
+         //ggTPCTestClusters->ApplyVizTag("TPC Clusters");
+         gTPCTestClusters->SetMainColor(kBlue);
+         gTPCTestClusters->SetMarkerStyle((Style_t)kFullDotSmall);
+         gEve->AddElement(gTPCTestClusters);
+       }
+       
+       iResult = processTPCClusters(block, gTPCTestClusters);
+       gTPCTestClusters->ElementChanged();
+      }
+      
+      
+    }
 
 
   }
@@ -1243,6 +1261,7 @@ Int_t processEvent() {
   }
 
   if ( gTPCClusters ) gTPCClusters->ResetBBox();
+  if ( gTPCTestClusters ) gTPCTestClusters->ResetBBox();
   if ( gTRDClusters ) gTRDClusters->ResetBBox();
   if ( gSPDClusters ) gSPDClusters->ResetBBox();
   if ( gSDDClusters ) gSDDClusters->ResetBBox();
@@ -1522,7 +1541,8 @@ Int_t processTPCClusters(AliHLTHOMERBlockDesc* block, TEvePointSet* cont, TEvePo
     for (Int_t iter = 0; iter < cd->fSpacePointCnt; ++iter, data += sizeof(AliHLTTPCSpacePointData)) {
       AliHLTTPCSpacePointData *sp = reinterpret_cast<AliHLTTPCSpacePointData*> (data);
       cont->SetNextPoint(cos*sp->fX - sin*sp->fY, sin*sp->fX + cos*sp->fY, sp->fZ);
-      contCol->Fill(cos*sp->fX - sin*sp->fY, sin*sp->fX + cos*sp->fY, sp->fZ, sp->fCharge);
+      if (contCol)
+       contCol->Fill(cos*sp->fX - sin*sp->fY, sin*sp->fX + cos*sp->fY, sp->fZ, sp->fCharge);
 
       gTPCCharge->Fill(sp->fCharge);
       gTPCQMax->Fill(sp->fQMax);

diff --git a/HLT/BASE/AliHLTHOMERManager.cxx b/HLT/BASE/AliHLTHOMERManager.cxx
index daf4937af22b32ecfa3c79d27cb323ef83f218c0..4ee80774618de35625ff50d954823ba04b09e151 100644 (file)
--- a/HLT/BASE/AliHLTHOMERManager.cxx
+++ b/HLT/BASE/AliHLTHOMERManager.cxx
@@ -642,6 +642,9 @@ void AliHLTHOMERManager::AddBlockListToBuffer() {
 void AliHLTHOMERManager::AddToAsyncBlockList() {\r
   // see header file for class documentation\r
 \r
+  HLTInfo("Adding blocks to the asynchroneous block list");\r
+\r
+\r
   GetFirstBlk();\r
 \r
   // -- Fill block list\r
@@ -675,6 +678,7 @@ TList* AliHLTHOMERManager::GetBlockListEventBuffer( Int_t idx ) {
     return NULL;\r
 \r
   return reinterpret_cast<TList*>((*fEventBuffer)[idx]);\r
+\r
 }\r
 \r
 /*\r
@@ -702,7 +706,7 @@ Int_t AliHLTHOMERManager::HandleBlocks() {
 \r
   HLTInfo(Form("Event 0x%016LX (%Lu) with %lu blocks", eventID, eventID, fNBlks));\r
 \r
-#if EVE_DEBUG\r
+#if 1// EVE_DEBUG\r
   // Loop for Debug only\r
   for ( ULong_t ii = 0; ii < fNBlks; ii++ ) {\r
     Char_t tmp1[9], tmp2[5];\r
@@ -741,10 +745,13 @@ Bool_t AliHLTHOMERManager::IsSyncBlocks() {
   \r
           \r
     //    if ( !GetBlkType().CompareTo("ALIESDV0") ||\r
-    // !GetBlkType().CompareTo("CLUSTERS") ) {\r
-    if ( !GetBlkType().CompareTo("ALIESDV0") ) {\r
+   \r
+    if ( !GetBlkType().CompareTo("ALIESDV0")  ||\r
+        !GetBlkType().CompareTo("CLUSTERS")  ) {\r
+      \r
       bResult = kTRUE;\r
       break;\r
+    \r
     }\r
     \r
     if ( !GetBlkType().CompareTo("ROOTTOBJ") ) {\r