Removed the AliHLTPHOSValidCellDataStruct.h from Makefile.am

diff --git a/HLT/PHOS/AliHLTPHOSCommonDefs.h b/HLT/PHOS/AliHLTPHOSCommonDefs.h
index 13f1abd60a5ea6274c669aca9bf359b91080f82c..8a3815ef1f24b6e431283f82039991584deccc0d 100644 (file)
--- a/HLT/PHOS/AliHLTPHOSCommonDefs.h
+++ b/HLT/PHOS/AliHLTPHOSCommonDefs.h
@@ -2,16 +2,18 @@
 #define ALIPHOSCOMMONDEFS_H
 
 //Hardware constants
-#define PHOS_RCUS             4   /**<Number of RCUs per Module*/
-#define PHOS_BRANCHES         2   /**<Number of branches per RCU*/
-#define PHOS_FEECS           14   /**<Number of Frontend cards per branch*/
-#define PHOS_ALTROS           4   /**<Number of ALTROs per frontend card*/
-#define PHOS_ALTROCHANNELS   16   /**<Number of readout channles per ALTRO*/
+#define N_RCUS             4   /**<Number of RCUs per Module*/
+#define N_BRANCHES         2   /**<Number of branches per RCU*/
+#define N_FEECS           14   /**<Number of Frontend cards per branch*/
+#define N_ALTROS           4   /**<Number of ALTROs per frontend card*/
+#define N_ALTROCHANNELS   16   /**<Number of readout channles per ALTRO*/
 
 //Geometry constants
-#define PHOS_MODULES          5   /**<Number of modules of the PHOS detector*/
-#define PHOS_ROWS            64   /**<Number of rows per module*/       
-#define PHOS_COLUMNS         56   /**<Number of columns per module*/ 
-#define PHOS_GAINS            2   /**<Number of gains per ALTRO channel*/
+#define N_MODULES          5   /**<Number of modules of the PHOS detector*/
+#define N_ROWS_MOD         64  /**<Number of rows per module*/       
+#define N_COLUMNS_MOD      56  /**<Number of columns per module*/ 
+#define N_ROWS_RCU         32  /**<Number of rows per module*/       
+#define N_COLUMNS_RCU      28  /**<Number of columns per module*/ 
+#define N_GAINS            2   /**<Number of gains per ALTRO channel*/
 
 #endif

diff --git a/HLT/PHOS/AliHLTPHOSDefinitions.cxx b/HLT/PHOS/AliHLTPHOSDefinitions.cxx
index 3023dabfd4fc6941c7f31d245f28c7aab56ece9c..bf94f1cf12d9a1bc46160e7aae53d9b273c0f141 100644 (file)
--- a/HLT/PHOS/AliHLTPHOSDefinitions.cxx
+++ b/HLT/PHOS/AliHLTPHOSDefinitions.cxx
@@ -25,14 +25,8 @@
 #include "AliHLTPHOSDefinitions.h"
 
 
-//ClassImp(AliHLTPHOSDefinitions)
-
 const AliHLTComponentDataType AliHLTPHOSDefinitions::gkDDLPackedRawDataType = { sizeof(AliHLTComponentDataType), {'D','D','L','_','R','W','P','K'},{'P','H','O','S'}};;
 const AliHLTComponentDataType AliHLTPHOSDefinitions::gkCellEnergyDataType = { sizeof(AliHLTComponentDataType),   {'C','E','L','L','E','N','E','R'},{'P','H','O','S'}};;
-//const AliHLTComponentDataType AliHLTPHOSDefinitions::gkPackedRawDataType = { sizeof(AliHLTComponentDataType),    {'R','A','W','P','A','K','E','D'},{'P','H','O','S'}};;
-//const AliHLTComponentDataType AliHLTPHOSDefinitions::gkUnpackedRawDataType = { sizeof(AliHLTComponentDataType),  {'R','A','W','U','N','P','A','K'},{'P','H','O','S'}};;
-//const AliHLTComponentDataType AliHLTPHOSDefinitions::gkClustersDataType = { sizeof(AliHLTComponentDataType),     {'C','L','U','S','T','E','R','S'},{'P','H','O','S'}};;
-//const AliHLTComponentDataType AliHLTPHOSDefinitions::gkVertexDataType = { sizeof(AliHLTComponentDataType),       {'V','E','R','T','E','X',' ',' '},{'P','H','O','S'}};;
-//const AliHLTComponentDataType AliHLTPHOSDefinitions::gkTrackSegmentsDataType = { sizeof(AliHLTComponentDataType),{'T','R','A','K','S','E','G','S'},{'P','H','O','S'}};;
+
 
     

diff --git a/HLT/PHOS/AliHLTPHOSEmcCalibData.cxx b/HLT/PHOS/AliHLTPHOSEmcCalibData.cxx
index 52a88e9d0734551d7621f902836d7a3115533bfe..1fa3e6b1ea1974bcc4c634be022eda776e8a2627 100644 (file)
--- a/HLT/PHOS/AliHLTPHOSEmcCalibData.cxx
+++ b/HLT/PHOS/AliHLTPHOSEmcCalibData.cxx
@@ -58,11 +58,11 @@ AliHLTPHOSEmcCalibData::AliHLTPHOSEmcCalibData(const AliHLTPHOSEmcCalibData& cal
   SetTitle(calibda.GetName());
 
 
-  //  for(Int_t gain = 0; gain < PHOS_GAINS; gain ++){
-  for(Int_t module=0; module<PHOS_MODULES; module++) {
-    for(Int_t column=0; column< PHOS_COLUMNS; column++) {
-      for(Int_t row=0; row<PHOS_ROWS; row++) {
-       for(Int_t gain = 0; gain < PHOS_GAINS; gain ++){
+  //  for(Int_t gain = 0; gain < N_GAINS; gain ++){
+  for(Int_t module=0; module<N_MODULES; module++) {
+    for(Int_t column=0; column< N_COLUMNS_MOD; column++) {
+      for(Int_t row=0; row<N_ROWS_MOD; row++) {
+       for(Int_t gain = 0; gain < N_GAINS; gain ++){
          fADCchannelEnergy[module][column][row][gain] =  calibda.fADCchannelEnergy[module][column][row][gain];
          fADCpedestalEmcMeasured[module][column][row][gain] = calibda.fADCpedestalEmcMeasured[module][column][row][gain];
        }
@@ -80,11 +80,11 @@ AliHLTPHOSEmcCalibData &AliHLTPHOSEmcCalibData::operator =(const AliHLTPHOSEmcCa
 
     SetName(calibda.GetName());
     SetTitle(calibda.GetName());
-    //    for(Int_t gain = 0; gain < PHOS_GAINS; gain ++){
-    for(Int_t module=0; module<PHOS_MODULES; module++) {
-      for(Int_t column=0; column< PHOS_COLUMNS; column++) {
-       for(Int_t row=0; row<PHOS_ROWS; row++) {
-         for(Int_t gain = 0; gain < PHOS_GAINS; gain ++){
+    //    for(Int_t gain = 0; gain < N_GAINS; gain ++){
+    for(Int_t module=0; module<N_MODULES; module++) {
+      for(Int_t column=0; column< N_COLUMNS_MOD; column++) {
+       for(Int_t row=0; row<N_ROWS_MOD; row++) {
+         for(Int_t gain = 0; gain < N_GAINS; gain ++){
            fADCchannelEnergy[module][column][row][gain] = calibda.fADCchannelEnergy[module][column][row][gain];
            fADCpedestalEmcMeasured[module][column][row][gain] = calibda.fADCpedestalEmcMeasured[module][column][row][gain];
          }
@@ -107,10 +107,10 @@ void AliHLTPHOSEmcCalibData::Reset()
   // Set all pedestals and all ADC channels to its ideal values = 1.
 
   //  for(Int_t gain = 0; gain < PHOS_GAINS; gain ++){
-    for (Int_t module=0; module<PHOS_MODULES; module++){
-      for (Int_t column=0; column< PHOS_COLUMNS; column++){
-       for (Int_t row=0; row<PHOS_ROWS; row++){
-         for(Int_t gain = 0; gain < PHOS_GAINS; gain ++){
+    for (Int_t module=0; module<N_MODULES; module++){
+      for (Int_t column=0; column< N_COLUMNS_MOD; column++){
+       for (Int_t row=0; row<N_ROWS_MOD; row++){
+         for(Int_t gain = 0; gain < N_GAINS; gain ++){
          fADCpedestalEmcMeasured[module][column][row][gain] = 0.;
          fADCchannelEnergy[module][column][row][gain]  = 1.;
        }
@@ -126,12 +126,12 @@ void  AliHLTPHOSEmcCalibData::Print(Option_t *option) const
 
   if (strstr(option,"ped")) {
     printf("\n ----    EMC Pedestal values     ----\n\n");
-    //    for(Int_t gain = 0; gain < PHOS_GAINS; gain ++){
-      for (Int_t module=0; module<PHOS_MODULES; module++){
+    //    for(Int_t gain = 0; gain < N_GAINS; gain ++){
+      for (Int_t module=0; module<N_MODULES; module++){
        printf("============== Module %d\n",module+1);
-       for (Int_t column=0; column< PHOS_COLUMNS; column++){
-         for (Int_t row=0; row<PHOS_ROWS; row++){
-           for(Int_t gain = 0; gain < PHOS_GAINS; gain ++){
+       for (Int_t column=0; column< N_COLUMNS_MOD; column++){
+         for (Int_t row=0; row<N_ROWS_MOD; row++){
+           for(Int_t gain = 0; gain < N_GAINS; gain ++){
            printf("%4.1f",fADCpedestalEmcMeasured[module][column][row][gain]);
          }
          printf("\n");
@@ -142,12 +142,12 @@ void  AliHLTPHOSEmcCalibData::Print(Option_t *option) const
 
   if (strstr(option,"gain")) {
     printf("\n ----    EMC ADC channel values  ----\n\n");
-    //   for(Int_t gain = 0; gain < PHOS_GAINS; gain ++){ 
-    for (Int_t module=0; module<PHOS_MODULES; module++){
+    //   for(Int_t gain = 0; gain < N_GAINS; gain ++){ 
+    for (Int_t module=0; module<N_MODULES; module++){
       printf("============== Module %d\n",module+1);
-      for (Int_t column=0; column< PHOS_COLUMNS; column++){
-       for (Int_t row=0; row<PHOS_ROWS; row++){
-         for(Int_t gain = 0; gain < PHOS_GAINS; gain ++){ 
+      for (Int_t column=0; column< N_COLUMNS_MOD; column++){
+       for (Int_t row=0; row<N_ROWS_MOD; row++){
+         for(Int_t gain = 0; gain < N_GAINS; gain ++){ 
            printf("%4.1f",fADCchannelEnergy[module][column][row][gain]);
          }
          printf("\n");
@@ -161,11 +161,11 @@ void  AliHLTPHOSEmcCalibData::Print(Option_t *option) const
 void  
 AliHLTPHOSEmcCalibData::MakeADCpedestalCorrectionTable()
 {
-  for (Int_t module=0; module<PHOS_MODULES; module++){
+  for (Int_t module=0; module<N_MODULES; module++){
     printf("============== Module %d\n",module+1);
-    for (Int_t column=0; column< PHOS_COLUMNS; column++){
-      for (Int_t row=0; row<PHOS_ROWS; row++){
-       for(Int_t gain = 0; gain < PHOS_GAINS; gain ++){ 
+    for (Int_t column=0; column< N_COLUMNS_MOD; column++){
+      for (Int_t row=0; row<N_ROWS_MOD; row++){
+       for(Int_t gain = 0; gain < N_GAINS; gain ++){ 
          fADCpedestalCorrectionTable[module][column][row][gain] = fADCpedestalEmcMeasured[module][column][row][gain] - fADCpedestalAltroReg[module][column][row][gain];
          //      printf("%4.1f",fADCchannelEnergy[module][column][row][gain]);
          //

diff --git a/HLT/PHOS/AliHLTPHOSEmcCalibData.h b/HLT/PHOS/AliHLTPHOSEmcCalibData.h
index 12eb12b3e4570cea38c23ee1a5048b4b0aa3a8b9..1d2d50e29a2135c9432f8470c55f70686159d954 100644 (file)
--- a/HLT/PHOS/AliHLTPHOSEmcCalibData.h
+++ b/HLT/PHOS/AliHLTPHOSEmcCalibData.h
@@ -28,10 +28,10 @@ class AliHLTPHOSEmcCalibData: public TNamed {
   void SetADCpedestalEmcMeasured(Int_t module, Int_t column, Int_t row, Int_t gain, Float_t value);
   void MakeADCpedestalCorrectionTable(); 
  protected:
-  Float_t  fADCchannelEnergy[PHOS_MODULES][PHOS_COLUMNS][PHOS_ROWS][PHOS_GAINS] ;  /**<width of one EMC ADC channel in GeV*/
-  Float_t  fADCpedestalEmcMeasured[PHOS_MODULES][PHOS_COLUMNS][PHOS_ROWS][PHOS_GAINS] ; /**<value of the EMC ADC pedestal measured from calibration run*/
-  Int_t  fADCpedestalAltroReg[PHOS_MODULES][PHOS_COLUMNS][PHOS_ROWS][PHOS_GAINS] ; /**<value of the EMC ADC pedestal subtraction values stored in the ALTRO registers*/
-  Float_t  fADCpedestalCorrectionTable[PHOS_MODULES][PHOS_COLUMNS][PHOS_ROWS][PHOS_GAINS] ; /**<value of the EMC ADC pedestal values to be subtracted form the decoed cahnnel data (= fADCpedestalEmcMeasured - fADCpedestalAltroReg)*/
+  Float_t  fADCchannelEnergy[N_MODULES][N_COLUMNS_MOD][N_ROWS_MOD][N_GAINS] ;  /**<width of one EMC ADC channel in GeV*/
+  Float_t  fADCpedestalEmcMeasured[N_MODULES][N_COLUMNS_MOD][N_ROWS_MOD][N_GAINS] ; /**<value of the EMC ADC pedestal measured from calibration run*/
+  Int_t  fADCpedestalAltroReg[N_MODULES][N_COLUMNS_MOD][N_ROWS_MOD][N_GAINS] ; /**<value of the EMC ADC pedestal subtraction values stored in the ALTRO registers*/
+  Float_t  fADCpedestalCorrectionTable[N_MODULES][N_COLUMNS_MOD][N_ROWS_MOD][N_GAINS] ; /**<value of the EMC ADC pedestal values to be subtracted form the decoed cahnnel data (= fADCpedestalEmcMeasured - fADCpedestalAltroReg)*/
 
   ClassDef(AliHLTPHOSEmcCalibData,1)    // PHOS EMC calibration data
 };

diff --git a/HLT/PHOS/AliHLTPHOSLinkDef.h b/HLT/PHOS/AliHLTPHOSLinkDef.h
index a590aae9753a6079f1ad1c0f860a6cb7bc3c3490..1cdd2f142fadd2ec400da1a17f34722ff21eeb87 100644 (file)
--- a/HLT/PHOS/AliHLTPHOSLinkDef.h
+++ b/HLT/PHOS/AliHLTPHOSLinkDef.h
@@ -11,7 +11,8 @@
 #pragma link C++ class AliHLTPHOSRawAnalyzerLMS+;
 #pragma link C++ class AliHLTPHOSPulseGenerator+;
 #pragma link C++ class AliHLTPHOSEmcCalibData+; 
-#pragma link C++ AliHLTPHOSDefinitions+; 
+#pragma link C++ class AliHLTPHOSDefinitions+;
+#pragma link C++ class AliHLTPHOSValiCellDataStruct+;
 //#pragma link C++ class AliHLTPHOSRawAnalyzerComponent+;
 //#pragma link C++ class AliHLTPHOSRawAnalyzerPeakFinderComponent+;
 //#pragma link C++ class AliHLTPHOSRawAnalyzerCrudeComponent+;

diff --git a/HLT/PHOS/AliHLTPHOSModuleCellEnergyData.h b/HLT/PHOS/AliHLTPHOSModuleCellEnergyData.h
deleted file mode 100644 (file)
index 76a4e6b..0000000
--- a/HLT/PHOS/AliHLTPHOSModuleCellEnergyData.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef ALIHLTPHOSNODULECELLENERGYDATA_H
-#define ALIHLTPHOSNODULECELLENERGYDATA_H
-
-struct AliHLTPHOSModuleCellEnergyData
-{
-  AliHLTUInt8_t fModuleID;
-  unsigned long cellEnergies[64][56][2];
-};
-
-
-#endif

diff --git a/HLT/PHOS/AliHLTPHOSModuleCellEnergyDataStruct.h b/HLT/PHOS/AliHLTPHOSModuleCellEnergyDataStruct.h
new file mode 100644 (file)
index 0000000..a45ff39
--- /dev/null
+++ b/HLT/PHOS/AliHLTPHOSModuleCellEnergyDataStruct.h
@@ -0,0 +1,15 @@
+#ifndef ALIHLTPHOSNODULECELLENERGYDATASTRUCT_H
+#define ALIHLTPHOSNODULECELLENERGYDATASTRUCT_H
+
+#include "AliHLTPHOSCommonDefs.h"
+
+struct AliHLTPHOSModuleCellEnergyDataStruct
+{
+  AliHLTUInt8_t fModuleID;
+  AliHLTUInt16_t fCnt;
+  AliHLTUInt16_t fValidData[N_ROWS_MOD*N_COLUMNS_MOD*N_GAINS];
+  unsigned long cellEnergies[N_ROWS_MOD][N_COLUMNS_MOD][N_GAINS];
+};
+
+
+#endif

diff --git a/HLT/PHOS/AliHLTPHOSModuleMergerComponent.cxx b/HLT/PHOS/AliHLTPHOSModuleMergerComponent.cxx
index 8d170115af9167916786036c9b5ca430efab2246..929d7f9e77e3dd9e944a0575fb2542b086df23f4 100644 (file)
--- a/HLT/PHOS/AliHLTPHOSModuleMergerComponent.cxx
+++ b/HLT/PHOS/AliHLTPHOSModuleMergerComponent.cxx
@@ -19,7 +19,7 @@
 #include "AliRawReaderMemory.h"
 #include "AliCaloRawStream.h"
 #include <cstdlib>
-#include "AliHLTPHOSRcuCellEnergyData.h"
+#include "AliHLTPHOSRcuCellEnergyDataStruct.h"
 
 
 const AliHLTComponentDataType  AliHLTPHOSModuleMergerComponent::inputDataTypes[]={kAliHLTVoidDataType,{0,"",""}}; //'zero' terminated array
@@ -94,7 +94,7 @@ int  AliHLTPHOSModuleMergerComponent::DoEvent( const AliHLTComponentEventData& e
 {
   unsigned long ndx;
   const AliHLTComponentBlockData* iter = NULL;   
-  AliHLTPHOSRcuCellEnergyData *cellDataPtr;
+  AliHLTPHOSRcuCellEnergyDataStruct *cellDataPtr;
 
   Reset();
 
@@ -105,7 +105,7 @@ int  AliHLTPHOSModuleMergerComponent::DoEvent( const AliHLTComponentEventData& e
       int tmpRcuZ = 0;
 
       iter = blocks+ndx;
-      AliHLTPHOSRcuCellEnergyData *cellDataPtr = (AliHLTPHOSRcuCellEnergyData*)( iter->fPtr);
+      AliHLTPHOSRcuCellEnergyDataStruct *cellDataPtr = (AliHLTPHOSRcuCellEnergyDataStruct*)( iter->fPtr);
 
       tmpModuleID = cellDataPtr->fModuleID;
       tmpRcuX     = cellDataPtr->fRcuX ;

diff --git a/HLT/PHOS/AliHLTPHOSRawAnalyzerComponent.cxx b/HLT/PHOS/AliHLTPHOSRawAnalyzerComponent.cxx
index 468be4aa436d07cfe16abbdcffc55f7102074048..cbb9547744c78efec78662d7332b07b5b6e2a537 100644 (file)
--- a/HLT/PHOS/AliHLTPHOSRawAnalyzerComponent.cxx
+++ b/HLT/PHOS/AliHLTPHOSRawAnalyzerComponent.cxx
@@ -20,7 +20,7 @@
 #include "AliRawReaderMemory.h"
 #include "AliCaloRawStream.h"
 #include <cstdlib>
-#include "AliHLTPHOSRcuCellEnergyData.h"
+#include "AliHLTPHOSRcuCellEnergyDataStruct.h"
 
 
 const AliHLTComponentDataType AliHLTPHOSRawAnalyzerComponent::inputDataTypes[]={kAliHLTVoidDataType,{0,"",""}}; //'zero' terminated array
@@ -110,15 +110,18 @@ int AliHLTPHOSRawAnalyzerComponent::DoEvent( const AliHLTComponentEventData& evt
                                              AliHLTComponentTriggerData& trigData, AliHLTUInt8_t* outputPtr, 
                                              AliHLTUInt32_t& size, vector<AliHLTComponentBlockData>& outputBlocks )
 {
-  Int_t tmpMod  = 0;
-  Int_t tmpRow  = 0;
-  Int_t tmpCol  = 0;
-  Int_t tmpGain = 0;
+  Int_t tmpMod            = 0;
+  Int_t tmpRow            = 0;
+  Int_t tmpCol            = 0;
+  Int_t tmpGain           = 0;
+  Int_t sampleCnt         = 0;
   Int_t processedChannels = 0;
-  UInt_t offset = 0; 
-  UInt_t mysize = 0;
-  UInt_t tSize  = 0;
-  AliHLTPHOSRcuCellEnergyData* outPtr; 
+  UInt_t offset           = 0; 
+  UInt_t mysize           = 0;
+  UInt_t tSize            = 0;
+
+  //  AliHLTPHOSRcuCellEnergyDataStruct
+  AliHLTPHOSRcuCellEnergyDataStruct* outPtr; 
   AliHLTUInt8_t* outBPtr;
   outBPtr = outputPtr;
   const AliHLTComponentBlockData* iter = NULL; 
@@ -139,15 +142,14 @@ int AliHLTPHOSRawAnalyzerComponent::DoEvent( const AliHLTComponentEventData& evt
          continue;
        }
 
-     fRawMemoryReader->SetMemory( reinterpret_cast<UChar_t*>( iter->fPtr ), iter->fSize );
-     analyzerPtr->SetData(fTmpChannelData);
-
-     outPtr =  (AliHLTPHOSRcuCellEnergyData*)outBPtr;
-     mysize += sizeof(AliHLTPHOSRcuCellEnergyData);
-
-     outPtr->fRcuX = fRcuX;
-     outPtr->fRcuZ = fRcuZ;
-     outPtr->fModuleID = fModuleID;
+      fRawMemoryReader->SetMemory( reinterpret_cast<UChar_t*>( iter->fPtr ), iter->fSize );
+      analyzerPtr->SetData(fTmpChannelData);
+      outPtr =  (AliHLTPHOSRcuCellEnergyDataStruct*)outBPtr;
+      mysize += sizeof(AliHLTPHOSRcuCellEnergyDataStruct);
+      outPtr->fRcuX = fRcuX;
+      outPtr->fRcuZ = fRcuZ;
+      outPtr->fModuleID = fModuleID;
+      outPtr->fCnt = 0;
 
       while(fPHOSRawStream->Next())
        {
@@ -156,21 +158,28 @@ int AliHLTPHOSRawAnalyzerComponent::DoEvent( const AliHLTComponentEventData& evt
              if(processedChannels > 0)
                {
                  analyzerPtr->SetData(fTmpChannelData);
-                 analyzerPtr->Evaluate(0, 1008);
+                 //              cout << "sampleCnt = " << sampleCnt << endl;
+                 analyzerPtr->Evaluate(0, sampleCnt);
                  fMaxValues[tmpMod][tmpRow][tmpCol][tmpGain] = analyzerPtr->GetEnergy();
+
+                 //      outPtr->fValidData[fCnt] = ;
+                 outPtr->fCnt ++;
+                 //fCnt;
                  outPtr->fCellEnergies[tmpRow - fRcuRowOffeset][tmpCol - fRcuColOffeset][tmpGain] =  fMaxValues[tmpMod][tmpRow][tmpCol][tmpGain];
+                 sampleCnt = 0;
                  ResetDataPtr(); 
+
                }
 
              tmpMod  =  fPHOSRawStream->GetModule();
              tmpRow  =  fPHOSRawStream->GetRow();
              tmpCol  =  fPHOSRawStream->GetColumn();
              tmpGain =  fPHOSRawStream->IsLowGain(); 
+             
              processedChannels ++;
            }
-
-
          fTmpChannelData[fPHOSRawStream->GetTime()] =  fPHOSRawStream->GetSignal();
+         sampleCnt ++;
        }
       
  

diff --git a/HLT/PHOS/AliHLTPHOSRawAnalyzerComponent.h b/HLT/PHOS/AliHLTPHOSRawAnalyzerComponent.h
index 52c7c97c790e65829edf3ec3ff2290764df9fbd3..dbacfea7457c01f75fa2b8b2fd76a7de985f30dc 100644 (file)
--- a/HLT/PHOS/AliHLTPHOSRawAnalyzerComponent.h
+++ b/HLT/PHOS/AliHLTPHOSRawAnalyzerComponent.h
@@ -13,6 +13,7 @@
 class AliHLTPHOSRawAnalyzerComponent: public AliHLTProcessor
 {
  public:
+
   AliHLTPHOSRawAnalyzerComponent();
   ~AliHLTPHOSRawAnalyzerComponent();
   AliHLTPHOSRawAnalyzerComponent(const AliHLTPHOSRawAnalyzerComponent & );

diff --git a/HLT/PHOS/AliHLTPHOSRcuCellEnergyData.h b/HLT/PHOS/AliHLTPHOSRcuCellEnergyData.h
deleted file mode 100644 (file)
index a9547d8..0000000
--- a/HLT/PHOS/AliHLTPHOSRcuCellEnergyData.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef ALIHLTPHOSRCUCELLENERGYDATA_H
-#define ALIHLTPHOSRCUCELLENERGYDATA_H
-
-//#include "AliHLTDataTypes.h"
-//#include "Rtypes.h"
-
-struct AliHLTPHOSRcuCellEnergyData
-{
-  AliHLTUInt16_t fRcuX;
-  AliHLTUInt16_t fRcuZ;
-  AliHLTUInt16_t fModuleID;
-  
-  Double_t fCellEnergies[32][28][2];
-  
-};
-
-
-#endif

diff --git a/HLT/PHOS/AliHLTPHOSRcuCellEnergyDataStruct.h b/HLT/PHOS/AliHLTPHOSRcuCellEnergyDataStruct.h
new file mode 100644 (file)
index 0000000..6adb562
--- /dev/null
+++ b/HLT/PHOS/AliHLTPHOSRcuCellEnergyDataStruct.h
@@ -0,0 +1,19 @@
+#ifndef ALIHLTPHOSRCUCELLENERGYDATASTRUCT_H
+#define ALIHLTPHOSRCUCELLENERGYDATASTRUCT_H
+
+#include "AliHLTPHOSCommonDefs.h"
+#include "AliHLTPHOSValidCellDataStruct.h"
+
+struct AliHLTPHOSRcuCellEnergyDataStruct
+{
+  AliHLTUInt16_t fRcuX;
+  AliHLTUInt16_t fRcuZ;
+  AliHLTUInt16_t fModuleID;
+  AliHLTUInt16_t fCnt;
+  AliHLTPHOSValiCellDataStruct fValidData;
+  Double_t fCellEnergies[ N_ROWS_RCU][ N_COLUMNS_RCU][N_GAINS];
+  
+};
+
+
+#endif

diff --git a/HLT/PHOS/AliHLTPHOSValidCellDataStruct.h b/HLT/PHOS/AliHLTPHOSValidCellDataStruct.h
new file mode 100644 (file)
index 0000000..d4a90ac
--- /dev/null
+++ b/HLT/PHOS/AliHLTPHOSValidCellDataStruct.h
@@ -0,0 +1,19 @@
+#ifndef ALIHLTPHOSVALIDCELLDATASTRUCT_H
+#define ALIHLTPHOSVALIDCELLDATASTRUCT_H 
+
+#include "AliHLTPHOSCommonDefs.h"
+//#include "AliHLTDataTypes.h"
+//#include "Rtypes.h"
+
+struct AliHLTPHOSValiCellDataStruct
+{
+  AliHLTUInt16_t fRcuX;
+  AliHLTUInt16_t fRcuZ;
+  AliHLTUInt16_t fModuleID;
+  AliHLTUInt16_t fRow;
+  AliHLTUInt16_t fCol;
+  AliHLTUInt16_t fGain;
+};
+
+
+#endif

diff --git a/HLT/PHOS/Makefile.am b/HLT/PHOS/Makefile.am
index 83cecd70fee4232b61397ce2e2343546d8ed669e..a03a3c0babcd001d2e1a98512ed8eaab3ad0539d 100644 (file)
--- a/HLT/PHOS/Makefile.am
+++ b/HLT/PHOS/Makefile.am
@@ -40,9 +40,9 @@ CLASS_HDRS                    = AliHLTPHOSPulseGenerator.h \
                                  AliHLTPHOSRawAnalyzerPeakFinderComponent.h \
                                  AliHLTPHOSDefinitions.h \
                                  AliHLTPHOSModuleMergerComponent.h \
-                                 AliHLTPHOSRcuCellEnergyData.h \
-                                 AliHLTPHOSModuleCellEnergyData.h
-
+                                 AliHLTPHOSRcuCellEnergyDataStruct.h \
+                                 AliHLTPHOSModuleCellEnergyDataStruct.h\
+#                                AliHLTPHOSValidCellDataStruct.h
 pkginclude_HEADERS             = $(CLASS_HDRS) \
                                  AliHLTPHOSCommonDefs.h