Combine TEPEMGEN and EPEMGEN in one library to avoid circular dependences. Compilatio...

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

diff --git a/HLT/PHOS/AliHLTPHOSSharedMemoryInterface.cxx b/HLT/PHOS/AliHLTPHOSSharedMemoryInterface.cxx
index 0cb3f5fdf38a986d522ff5d6d85640bf309d545b..179d07ae6f344877f3ad2c7bc0a280dcdcf6efda 100644 (file)
--- a/HLT/PHOS/AliHLTPHOSSharedMemoryInterface.cxx
+++ b/HLT/PHOS/AliHLTPHOSSharedMemoryInterface.cxx
@@ -24,18 +24,19 @@
 #include <iostream>
 
 
-AliHLTPHOSSharedMemoryInterface::AliHLTPHOSSharedMemoryInterface(): fCurrentChannel(0), 
-                                                                   fCellEnergiesPtr(0), 
-                                                                   fIsSetMemory(false), 
+AliHLTPHOSSharedMemoryInterface::AliHLTPHOSSharedMemoryInterface(): fCurrentChannel(0),
+                                                                   fCellEnergiesPtr(0),
+                                                                   fIsSetMemory(false),
                                                                    fMaxCnt(0),
-                                                                   fCurrentCnt(0), 
-                                                                   fCharDataOffset(0), 
-                                                                   fCharPtr(0), 
+                                                                   fCurrentCnt(0),
+                                                                   fCurrentX(0),
+                                                                   fCurrentZ(0),
+                                                                   fCurrentGain(0),
+                                                                   fCharDataOffset(0),
+                                                                   fCharPtr(0),
                                                                    fIntPtr(0)
-                                                                 
- 
 {
- fCharDataOffset = sizeof(AliHLTPHOSRcuCellEnergyDataStruct);
+  fCharDataOffset = sizeof(AliHLTPHOSRcuCellEnergyDataStruct);
 }
 
 
@@ -60,8 +61,8 @@ AliHLTPHOSSharedMemoryInterface::NextChannel()
      return fCurrentChannel;
     }
   */
-  // Added by OD
 
+  // Changed by OD
   if(fCurrentCnt < fMaxCnt)
     {
       for(Int_t x = 0; x < N_XCOLUMNS_MOD; x++)
@@ -71,15 +72,12 @@ AliHLTPHOSSharedMemoryInterface::NextChannel()
              for(Int_t gain = 0; gain < N_GAINS; gain++)
                {
                  fCurrentChannel =  &(fCellEnergiesPtr->fValidData[x][z][gain]);
-                 if(fCurrentChannel->fEnergy > 0)
+                 if(fCurrentChannel->fID == fCurrentCnt)
                    {
-                     if(fCurrentChannel->fID == fCurrentCnt)
-                       {
-                         fCurrentChannel->fData = fIntPtr; 
-                         fIntPtr +=  fCurrentChannel->fNSamples;
-                         fCurrentCnt ++;
-                         return fCurrentChannel;
-                       }
+                     fCurrentChannel->fData = fIntPtr; 
+                     fIntPtr +=  fCurrentChannel->fNSamples;
+                     fCurrentCnt ++;
+                     return fCurrentChannel;
                    }
                }
            }
@@ -90,6 +88,8 @@ AliHLTPHOSSharedMemoryInterface::NextChannel()
       Reset();
       return 0;
     }
+
+  return 0;
 }