Update of ITS tracking check task and related macros

[u/mrichter/AliRoot.git] / HLT / PHOS / AliHLTPHOSRcuHistogramProducerComponent.cxx

diff --git a/HLT/PHOS/AliHLTPHOSRcuHistogramProducerComponent.cxx b/HLT/PHOS/AliHLTPHOSRcuHistogramProducerComponent.cxx
index da71e1ef6e5e4ac444357f04f582c4768d21d2ff..7980d4715f25440674ffc03f384eb23233900269 100644 (file)
--- a/HLT/PHOS/AliHLTPHOSRcuHistogramProducerComponent.cxx
+++ b/HLT/PHOS/AliHLTPHOSRcuHistogramProducerComponent.cxx
@@ -1,3 +1,5 @@
+// $Id$
+
 /**************************************************************************
  * Copyright(c) 2006, ALICE Experiment at CERN, All rights reserved.      *
  *                                                                        *
@@ -14,12 +16,16 @@
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
-#include "AliHLTPHOSRcuCellEnergyDataStruct.h"
+//#include "AliHLTPHOSRcuCellEnergyDataStruct.h"
 #include "AliHLTPHOSRcuHistogramProducer.h"
 #include "AliHLTPHOSRcuHistogramProducerComponent.h"
 #include "AliHLTPHOSRcuCellAccumulatedEnergyDataStruct.h"
-#include "AliHLTPHOSSharedMemoryInterface.h"
-#include "AliHLTPHOSValidCellDataStruct.h" 
+#include "AliHLTPHOSSharedMemoryInterfacev2.h"
+//#include "AliHLTPHOSValidCellDataStruct.h" 
+#include "AliHLTPHOSChannelDataHeaderStruct.h"
+#include "AliHLTPHOSChannelDataStruct.h"
+//#include "AliHLTPHOSUtilities.h"
+
 
 AliHLTPHOSRcuHistogramProducerComponent gAliHLTPHOSRcuHistogramProducerComponent;
 /*************************************************************************
@@ -35,7 +41,7 @@ AliHLTPHOSRcuHistogramProducerComponent:: AliHLTPHOSRcuHistogramProducerComponen
                                                                                      fOutPtr(0),
                                                                                      fShmPtr(0)
 {
-  fShmPtr = new AliHLTPHOSSharedMemoryInterface();
+  fShmPtr = new AliHLTPHOSSharedMemoryInterfacev2();
  //Default constructor
 } 
 
@@ -97,10 +103,11 @@ AliHLTPHOSRcuHistogramProducerComponent::GetOutputDataSize(unsigned long& constB
 
 
 
-int  AliHLTPHOSRcuHistogramProducerComponent::DoEvent( const AliHLTComponentEventData& evtData, const AliHLTComponentBlockData* blocks, 
-                                             AliHLTComponentTriggerData& trigData, AliHLTUInt8_t* outputPtr, 
-                                             AliHLTUInt32_t& size, vector<AliHLTComponentBlockData>& outputBlocks )
+int  AliHLTPHOSRcuHistogramProducerComponent::DoEvent( const AliHLTComponentEventData& /*evtData*/, const AliHLTComponentBlockData* /*blocks*/, 
+                                                      AliHLTComponentTriggerData& /*trigData*/, AliHLTUInt8_t* /*outputPtr*/, 
+                                                      AliHLTUInt32_t& /*size*/, vector<AliHLTComponentBlockData>& /*outputBlocks*/ )
 {
+  /*
   
   cout <<  "  AliHLTPHOSRcuHistogramProducerComponent::Doevent, entering event loop" << endl;
 
@@ -113,12 +120,16 @@ int  AliHLTPHOSRcuHistogramProducerComponent::DoEvent( const AliHLTComponentEven
   trDta.fDataSize++;
   trDta.fDataSize--; //shutting up the compiler, we dont use trigData now but will do in near future
 
-  AliHLTPHOSValidCellDataStruct *currentChannel =0;
+  // AliHLTPHOSValidCellDataStruct *currentChannel =0;
+ 
+  AliHLTPHOSChannelDataStruct  *currentChannel =0;
+   
   unsigned long ndx       = 0;
   UInt_t offset           = 0; 
   UInt_t mysize           = 0;
   UInt_t tSize            = 0;
   const AliHLTComponentBlockData* iter = NULL;   
+
   AliHLTPHOSRcuCellEnergyDataStruct *cellDataPtr;
   AliHLTUInt8_t* outBPtr;
 
@@ -134,7 +145,7 @@ int  AliHLTPHOSRcuHistogramProducerComponent::DoEvent( const AliHLTComponentEven
          continue;
        }
       
-      cellDataPtr = (AliHLTPHOSRcuCellEnergyDataStruct*)( iter->fPtr);
+      cellDataPtr = (AliHLTPHOSChannelDataStruct*)( iter->fPtr);
       fShmPtr->SetMemory(cellDataPtr);
       currentChannel = fShmPtr->NextChannel();
       
@@ -165,11 +176,11 @@ int  AliHLTPHOSRcuHistogramProducerComponent::DoEvent( const AliHLTComponentEven
   fOutPtr->fRcuX     = fRcuX;
   fOutPtr->fRcuZ     = fRcuZ;
 
-  for(int x=0; x < N_XCOLUMNS_RCU; x ++)
+  for(int x=0; x < NXCOLUMNSRCU; x ++)
     {
-      for(int z=0; z < N_ZROWS_RCU; z ++)
+      for(int z=0; z < NZROWSRCU; z ++)
        {
-         for(int gain =0;  gain < N_GAINS; gain ++)
+         for(int gain =0;  gain < NGAINS; gain ++)
            {
              fOutPtr->fAccumulatedEnergies[x][z][gain] = innPtr.fAccumulatedEnergies[x][z][gain];
              fOutPtr->fHits[x][z][gain] = innPtr.fHits[x][z][gain];
@@ -206,24 +217,35 @@ int  AliHLTPHOSRcuHistogramProducerComponent::DoEvent( const AliHLTComponentEven
       fRcuHistoProducerPtr->WriteAllHistograms(arg);
     }
   return 0;
+
+  */
+  return 0;
 }//end DoEvent
 
 
 int
-AliHLTPHOSRcuHistogramProducerComponent::DoInit( int argc, const char** argv )
+AliHLTPHOSRcuHistogramProducerComponent::DoInit( int /*argc*/, const char** /*argv*/ )
 {
   //See html documentation of base class
-  fPrintInfo = kFALSE;
+  //  fPrintInfo = kFALSE;
   int iResult=0;
   TString argument="";
-  iResult = ScanArguments(argc, argv);
+ 
+  // iResult = ScanArguments(argc, argv);
+
+  /*
   if(fIsSetEquippmentID == kFALSE)
     {
       Logging( kHLTLogFatal, "HLT::AliHLTPHOSRcuHistogramProducerComponent::DoInt( int argc, const char** argv )", "Missing argument",
               "The argument equippmentID is not set: set it with a component argumet like this: -equippmentID  <number>");
       iResult = -2; 
     }
-  fRcuHistoProducerPtr = new AliHLTPHOSRcuHistogramProducer( fModuleID, fRcuX, fRcuZ);
+  */
+
+  
+  //fRcuHistoProducerPtr = new AliHLTPHOSRcuHistogramProducer( fModuleID, fRcuX, fRcuZ);
+ 
+
   return iResult; 
   
 }