Included AliHLTPHOSConstnts.h where needed

diff --git a/HLT/PHOS/AliHLTPHOSClusterizer.cxx b/HLT/PHOS/AliHLTPHOSClusterizer.cxx
index f852f7d2e61b777d50791a14072fff9bcc658b30..ea4599907aa70be7a8ca534ed7074df4fc8f387a 100644 (file)
--- a/HLT/PHOS/AliHLTPHOSClusterizer.cxx
+++ b/HLT/PHOS/AliHLTPHOSClusterizer.cxx
@@ -31,6 +31,9 @@
 #include "AliHLTPHOSValidCellDataStruct.h"
 #include "AliHLTPHOSRecPointDataStruct.h"
 #include "AliHLTPHOSClusterDataStruct.h"
+#include "AliHLTPHOSConstants.h"
+
+using namespace PhosHLTConst;
 
 
 ClassImp(AliHLTPHOSClusterizer);

diff --git a/HLT/PHOS/AliHLTPHOSClusterizer.h b/HLT/PHOS/AliHLTPHOSClusterizer.h
index 384ae255520f0bd881c90e27720dcd0a59dbe497..7cd6472cb73e86362f020737cbe14951c9320e2b 100644 (file)
--- a/HLT/PHOS/AliHLTPHOSClusterizer.h
+++ b/HLT/PHOS/AliHLTPHOSClusterizer.h
@@ -2,15 +2,19 @@
  * See cxx source for full Copyright notice                               */
   
 /** @file   AliHLTPHOSClusterizer.h
-    @author Øystein Djuvsland
+    @author Ã\83Â\98ystein Djuvsland
     @date   
     @brief  A temporary clusterizer for PHOS
 */
 
+
 #ifndef ALIHLTPHOSCLUSTERIZER_H
 #define ALIHLTPHOSCLUSTERIZER_H
 
 #include "AliHLTPHOSCommonDefs.h"
+#include "AliHLTPHOSConstants.h"
+
+using namespace PhosHLTConst;
 
 struct AliHLTPHOSClusterDataStruct;
 struct AliHLTPHOSRecPointDataStruct;

diff --git a/HLT/PHOS/AliHLTPHOSPhysicsAnalyzer.h b/HLT/PHOS/AliHLTPHOSPhysicsAnalyzer.h
index a1ffd6c945217b06887943ac37119c4325502a67..de8135577a80c5264dcd95372cd24ddfdd375390 100644 (file)
--- a/HLT/PHOS/AliHLTPHOSPhysicsAnalyzer.h
+++ b/HLT/PHOS/AliHLTPHOSPhysicsAnalyzer.h
@@ -8,6 +8,9 @@
 //Intended to be a base class for analysis
 
 #include "Rtypes.h"
+#include "AliHLTPHOSConstants.h"
+using namespace PhosHLTConst;
+
 
 class TObjArray;
 class TH1F;

diff --git a/HLT/PHOS/AliHLTPHOSProcessor.cxx b/HLT/PHOS/AliHLTPHOSProcessor.cxx
index 8e147d250d9b79625a5dc1f0eb18540fdf1f1c21..4403b293a2ed08fe2ee08616cc7609449b862c95 100644 (file)
--- a/HLT/PHOS/AliHLTPHOSProcessor.cxx
+++ b/HLT/PHOS/AliHLTPHOSProcessor.cxx
@@ -1,6 +1,6 @@
 #include "AliHLTPHOSProcessor.h"
-#include "AliHLTPHOSCommonDefs.h"
-#include "TString.h"
+//#include "AliHLTPHOSCommonDefs.h"
+//#include "TString.h"
 
 const AliHLTComponentDataType AliHLTPHOSProcessor::fgkInputDataTypes[]={kAliHLTVoidDataType,{0,"",""}}; //'zero' terminated array
 

diff --git a/HLT/PHOS/AliHLTPHOSProcessor.h b/HLT/PHOS/AliHLTPHOSProcessor.h
index ebd3af7aed6be2ed0e14e92f2da1cf2e6b4b3d21..09f75d905db0de3ea6b750b8b08b819e4dd63dc3 100644 (file)
--- a/HLT/PHOS/AliHLTPHOSProcessor.h
+++ b/HLT/PHOS/AliHLTPHOSProcessor.h
@@ -4,6 +4,8 @@
 #include "AliHLTProcessor.h"
 #include "AliHLTPHOSConstants.h"
 #include "AliHLTPHOSCommonDefs.h"
+#include "TString.h"
+#include "AliHLTPHOSDefinitions.h"
 
 using namespace PhosHLTConst;
 

diff --git a/HLT/PHOS/AliHLTPHOSRawAnalyzerComponent.cxx b/HLT/PHOS/AliHLTPHOSRawAnalyzerComponent.cxx
index 58ec449e85cd0104286b86d810ad25d2c722d168..5fcbcbf19244c6bac6eb5f7451a40761ba5b2bc7 100644 (file)
--- a/HLT/PHOS/AliHLTPHOSRawAnalyzerComponent.cxx
+++ b/HLT/PHOS/AliHLTPHOSRawAnalyzerComponent.cxx
@@ -31,66 +31,43 @@
 
 #include "AliHLTPHOSRawAnalyzer.h"
 #include "AliHLTPHOSRawAnalyzerComponent.h"
-#include "AliRawReaderMemory.h"
-#include "AliCaloRawStream.h"
 #include "AliHLTPHOSRcuCellEnergyDataStruct.h"
 #include "AliHLTPHOSRcuChannelDataStruct.h"
 #include "AliHLTDDLDecoder.h"
 #include "AliHLTAltroData.h"
-
 #include "AliHLTPHOSMapper.h"
 
-using namespace std;
 
+using namespace std;
 
-//_________________________________________________________________________________________________
 AliHLTPHOSRawAnalyzerComponent::AliHLTPHOSRawAnalyzerComponent():AliHLTPHOSProcessor(), fAnalyzerPtr(0), 
-fSendChannelData(kFALSE),fPHOSRawStream(0), fRawMemoryReader(0), fOutPtr(0)
+fSendChannelData(kFALSE),fOutPtr(0)
 {
   fMapperPtr = new AliHLTPHOSMapper();
 } 
 
-//_________________________________________________________________________________________________
+
 AliHLTPHOSRawAnalyzerComponent::~AliHLTPHOSRawAnalyzerComponent()
 {
-  if(fRawMemoryReader != 0)
-    {
-      delete fRawMemoryReader;
-    }
-    if(fPHOSRawStream != 0)
-    {
-      delete fPHOSRawStream;
-    }
+
 }
 
-//_________________________________________________________________________________________________
+
 AliHLTPHOSRawAnalyzerComponent::AliHLTPHOSRawAnalyzerComponent(const AliHLTPHOSRawAnalyzerComponent & ) : AliHLTPHOSProcessor(), fAnalyzerPtr(0), 
-fSendChannelData(kFALSE),fPHOSRawStream(0), fRawMemoryReader(0), fOutPtr(0)
+fSendChannelData(kFALSE),fOutPtr(0)
 {
 
 }
 
-//_________________________________________________________________________________________________
+
 int 
 AliHLTPHOSRawAnalyzerComponent::Deinit()
 {
   Logging(kHLTLogInfo, "HLT", "PHOS", ",AliHLTPHOSRawAnalyzerComponen Deinit");
-
-  if(fRawMemoryReader !=0)
-    {
-      delete fRawMemoryReader;
-    }
-    
-  if(fPHOSRawStream != 0)
-    {
-      delete fPHOSRawStream;
-    }
-  return 0;
-
   return 0;
 }
 
-//_________________________________________________________________________________________________
+
 const char* 
 AliHLTPHOSRawAnalyzerComponent::GetComponentID()
 {
@@ -98,7 +75,6 @@ AliHLTPHOSRawAnalyzerComponent::GetComponentID()
 }
 
 
-//_________________________________________________________________________________________________
 void
 AliHLTPHOSRawAnalyzerComponent::GetInputDataTypes( vector<AliHLTComponentDataType>& list)
 {
@@ -109,7 +85,7 @@ AliHLTPHOSRawAnalyzerComponent::GetInputDataTypes( vector<AliHLTComponentDataTyp
   }
 }
 
-//_________________________________________________________________________________________________
+
 AliHLTComponentDataType 
 AliHLTPHOSRawAnalyzerComponent::GetOutputDataType()
 {
@@ -117,7 +93,6 @@ AliHLTPHOSRawAnalyzerComponent::GetOutputDataType()
 }
 
 
-//_________________________________________________________________________________________________
 void
 AliHLTPHOSRawAnalyzerComponent::GetOutputDataSize(unsigned long& constBase, double& inputMultiplier )
 
@@ -126,20 +101,15 @@ AliHLTPHOSRawAnalyzerComponent::GetOutputDataSize(unsigned long& constBase, doub
   inputMultiplier = 1;
 }
 
-//_________________________________________________________________________________________________
+
 int 
 AliHLTPHOSRawAnalyzerComponent::DoEvent( const AliHLTComponentEventData& evtData, const AliHLTComponentBlockData* blocks, AliHLTComponentTriggerData& trigData, AliHLTUInt8_t* outputPtr, AliHLTUInt32_t& size, vector<AliHLTComponentBlockData>& outputBlocks )
 {
-  Int_t sampleCnt         = 0;
-  Int_t processedChannels = 0;
   UInt_t offset           = 0; 
   UInt_t mysize           = 0;
   UInt_t tSize            = 0;
   Int_t tmpChannelCnt     = 0;
-  Int_t tmpStartIndex     = 0;
   AliHLTUInt8_t* outBPtr;
-  unsigned long first;
-  unsigned long last;
   outBPtr = outputPtr;
   const AliHLTComponentBlockData* iter = NULL; 
   unsigned long ndx;
@@ -160,8 +130,6 @@ AliHLTPHOSRawAnalyzerComponent::DoEvent( const AliHLTComponentEventData& evtData
       fDecoderPtr->Decode();
       fOutPtr =  (AliHLTPHOSRcuCellEnergyDataStruct*)outBPtr;
 
-      //      int tmpCnt = 0;
-
       while( fDecoderPtr->NextChannel(fAltroDataPtr) == true )
        {
 
@@ -174,7 +142,6 @@ AliHLTPHOSRawAnalyzerComponent::DoEvent( const AliHLTComponentEventData& evtData
          fOutPtr->fValidData[tmpChannelCnt].fEnergy  = (float)fAnalyzerPtr->GetEnergy();
          fOutPtr->fValidData[tmpChannelCnt].fTime    = (float)fAnalyzerPtr->GetTiming();
          tmpChannelCnt ++;
-         //      tmpCnt ++; 
        }
 
       mysize += sizeof(AliHLTPHOSRcuCellEnergyDataStruct);
@@ -218,31 +185,19 @@ AliHLTPHOSRawAnalyzerComponent::DoEvent( const AliHLTComponentEventData& evtData
 }//end DoEvent
 
 
-
-//_________________________________________________________________________________________________
 int
 AliHLTPHOSRawAnalyzerComponent::DoInit( int argc, const char** argv )
 {
-
-cout <<"AliHLTPHOSRawAnalyzerComponent::DoInit( int argc, const char** argv ) "<< endl;
-
+  cout <<"AliHLTPHOSRawAnalyzerComponent::DoInit( int argc, const char** argv ) "<< endl;
   fAltroDataPtr = new AliHLTAltroData();
   fDecoderPtr = new AliHLTDDLDecoder();
   fSendChannelData = kFALSE;
   fPrintInfo = kFALSE;
   Reset();
-  fRawMemoryReader = new AliRawReaderMemory();
-  fPHOSRawStream = new  AliCaloRawStream(fRawMemoryReader,"PHOS");
-
-  //  fPHOSRawStream->SetOldRCUFormat(kFALSE);
-
-  fPHOSRawStream->SetOldRCUFormat(kTRUE);
-
   int iResult=0;
   TString argument="";
   iResult = ScanArguments(argc, argv);
 
-
   if(fIsSetEquippmentID == kFALSE)
     {
       cout << "The argument equippmentID is not set: set it with a component argumet like this: -equippmentID  <number>" << endl;
@@ -252,69 +207,16 @@ cout <<"AliHLTPHOSRawAnalyzerComponent::DoInit( int argc, const char** argv ) "<
     }
   else
     {
-      fRawMemoryReader->SetEquipmentID(fkEquippmentID);
+      iResult = 0; 
+      //      fRawMemoryReader->SetEquipmentID(fkEquippmentID);
     }
 
+  //  return iResult;
+  //  return 0;
   return iResult;
-
-
-return 0;
-
 }
 
-/*
-//_________________________________________________________________________________________________
-void
-AliHLTPHOSRawAnalyzerComponent::DumpData(int gain) const
-{
-  for(int mod = 0; mod < N_MODULES; mod ++)
-    {
-      printf("\n ***********  MODULE %d ************\n", mod);
-      for(int row = 0; row <  N_ROWS_MOD; row ++)
-       {
-         for(int col = 0; col <  N_COLUMNS_MOD; col ++)
-           {
-             if( fMaxValues[mod][row][col][0] != 0)
-               { 
-                 cout << fMaxValues[mod][row][col][gain] << "\t";
-               }
-           }
-       } 
-    }
-}
-*/
 
-
-//_________________________________________________________________________________________________
-
-/*
-void
-AliHLTPHOSRawAnalyzerComponent::DumpChannelData(Double_t *data) const
-{
-  cout << endl;
-  for(int i=0; i<  ALTRO_MAX_SAMPLES; i++)
-    {
-      if (data[i] != 0)
-       {
-         cout <<i <<"\t";
-       }
-    }
-  cout << endl;
-  
-  for(int i=0; i<  ALTRO_MAX_SAMPLES; i++)
-    {
-      if (data[i] != 0)
-       {
-         cout <<data[i] <<"\t";
-       }
-    }
-  
-  cout << endl;
-}
-*/
-
-
-//_________________________________________________________________________________________________
 void
 AliHLTPHOSRawAnalyzerComponent::Reset()
 {
@@ -337,9 +239,6 @@ AliHLTPHOSRawAnalyzerComponent::Reset()
 } // end Reset
 
 
-
-
-//_________________________________________________________________________________________________
 void
 AliHLTPHOSRawAnalyzerComponent::ResetDataPtr(int startindex, int sampleCnt)
 {

diff --git a/HLT/PHOS/AliHLTPHOSRawAnalyzerComponent.h b/HLT/PHOS/AliHLTPHOSRawAnalyzerComponent.h
index f14997cb161b644fe785bf51aa78171da8e83dbc..6f3f873a42a9dd8f49f207243268d41f8a1be3ce 100644 (file)
--- a/HLT/PHOS/AliHLTPHOSRawAnalyzerComponent.h
+++ b/HLT/PHOS/AliHLTPHOSRawAnalyzerComponent.h
@@ -8,13 +8,14 @@
 //Base class for PHOS HLT raw data analysis components
 // see cxx file for more details
 
-#include "AliHLTPHOSDefinitions.h"
-#include "AliHLTPHOSCommonDefs.h"
+//#include "AliHLTPHOSDefinitions.h"
+//#include "AliHLTPHOSCommonDefs.h"
+
 #include "AliHLTPHOSProcessor.h"
 
 
-class AliRawReaderMemory;
-class AliCaloRawStream;
+//class AliRawReaderMemory;
+//class AliCaloRawStream;
 class AliHLTPHOSRawAnalyzer;
 class AliHLTPHOSRcuCellEnergyDataStruct;
 class AliHLTPHOSRcuChannelDataStruct;
@@ -56,8 +57,10 @@ class AliHLTPHOSRawAnalyzerComponent: public AliHLTPHOSProcessor
   Bool_t fSendChannelData;       /**<wether or not to send raw data from the component into shared memory*/
   Double_t fTmpChannelData[ALTRO_MAX_SAMPLES];                        /**<temporary variable to store raw samples from a single altro channel*/
   Double_t fMaxValues[N_MODULES][N_ROWS_MOD][N_COLUMNS_MOD][N_GAINS]; /**<array to store cell energies*/
-  AliCaloRawStream *fPHOSRawStream;                   /**<Streamer for PHOS raw data, used by fPHOSRawMemory reader*/ 
-  AliRawReaderMemory *fRawMemoryReader;               /**<Decoder to read PHOS raw data on the altro format*/  
+
+  //  AliCaloRawStream *fPHOSRawStream;                   /**<Streamer for PHOS raw data, used by fPHOSRawMemory reader*/ 
+  //  AliRawReaderMemory *fRawMemoryReader;               /**<Decoder to read PHOS raw data on the altro format*/  
+
   AliHLTPHOSRcuCellEnergyDataStruct* fOutPtr;         /**<Pointer to outputbuffer to write results from the component into shared memory*/
  
   AliHLTPHOSMapper *fMapperPtr;