changes from soh

[u/mrichter/AliRoot.git] / HLT / CALO / AliHLTCaloSharedMemoryInterfacev2.cxx

diff --git a/HLT/CALO/AliHLTCaloSharedMemoryInterfacev2.cxx b/HLT/CALO/AliHLTCaloSharedMemoryInterfacev2.cxx
index f7ccdce269f6cc3bf653fd281d0a4dc5e33225dc..26c1bff991caa13548c57587f7aecede8681d576 100644 (file)
--- a/HLT/CALO/AliHLTCaloSharedMemoryInterfacev2.cxx
+++ b/HLT/CALO/AliHLTCaloSharedMemoryInterfacev2.cxx
@@ -26,8 +26,10 @@
 #include "AliHLTCaloMapper.h"
 #include "AliHLTCaloConstants.h"
 
+ClassImp(AliHLTCaloSharedMemoryInterfacev2);
 
-AliHLTCaloSharedMemoryInterfacev2::AliHLTCaloSharedMemoryInterfacev2(): fCurrentChannel(0),
+AliHLTCaloSharedMemoryInterfacev2::AliHLTCaloSharedMemoryInterfacev2(TString det): AliHLTCaloConstantsHandler(det),
+                                                                       fCurrentChannel(0),
                                                                        fChannelDataPtr(0),
                                                                        fIsSetMemory(false),
                                                                        fHasRawData(false),
@@ -37,37 +39,19 @@ AliHLTCaloSharedMemoryInterfacev2::AliHLTCaloSharedMemoryInterfacev2(): fCurrent
                                                                        fRawData()
                                                                        //      fSpecification(0)
 {
-  //  GetSpecFromDDLIndex
-  //  AliHLTCaloMapper  *fMapperPtr[32];
-
-  /*
-  for(int i=0; i < 32; i++)
+   // See header file for class documentation
+  for(Int_t i = 0; i < 32; i++)
     {
-      fMapperPtr[i] = new AliHLTCaloMapper( AliHLTCaloMapper::GetSpecFromDDLIndex(i) ) ;
+      fMapperPtr[i] = 0;
     }
-  */
 }
 
-
-
 AliHLTCaloSharedMemoryInterfacev2::~AliHLTCaloSharedMemoryInterfacev2()
 {
 
 }
 
-
-/*
-struct AliHLTCaloChannelDataStruct
-{
-  Float_t fEnergy;
-  Float_t fTime;
-  UShort_t fChannelID;
-  Short_t fCrazyness;
-  //  Short_t fRawDataSize; //the size of the raw data
-};
-*/
-
-AliHLTCaloChannelDataStruct*   
+AliHLTCaloChannelDataStruct*
 AliHLTCaloSharedMemoryInterfacev2::NextChannel()
 {
   // Comment
@@ -77,53 +61,54 @@ AliHLTCaloSharedMemoryInterfacev2::NextChannel()
       tmpChannelPtr = reinterpret_cast<AliHLTCaloChannelDataStruct*>(fChannelDataPtr);
       fCurrentCnt++;
       fChannelDataPtr += sizeof(AliHLTCaloChannelDataStruct);
-      if(fHasRawData == true)
+      
+     if(fHasRawData == true)
+      if( false )      
        {
          fRawData.fEnergy = tmpChannelPtr->fEnergy;
          fRawData.fTime = tmpChannelPtr->fTime;
-         fRawData.fChannelID = tmpChannelPtr->fChannelID; 
-         fRawData.fCrazyness  = tmpChannelPtr->fCrazyness; 
+         fRawData.fChannelID = tmpChannelPtr->fChannelID;
+         fRawData.fCrazyness = tmpChannelPtr->fCrazyness;
          Reset(fRawData);
-         //AliHLTCaloMapper::ChannelId2Coordinate(const UShort_t channelId,    AliHLTCaloCoordinate &channelCoord) 
-
-         
+         //AliHLTCaloMapper::ChannelId2Coordinate(const UShort_t channelId, AliHLTCaloCoordinate &channelCoord)
+ 
+ 
          AliHLTCaloMapper::ChannelId2Coordinate( fRawData.fChannelID, fRawData.fCoordinate);
          
-         
-         
-
-         
-         if( fRawData.fChannelID ==  fRawDataPtr[0]  )
+         if( fRawData.fChannelID == fRawDataPtr[0] )
            {
              Reset(fRawData);
-             //      cout << __FILE__ << __LINE__ << "fRawData.fChannelID ==  fRawDataPtr[0] =  " << fRawDataPtr[0]  << endl;
-             //    cout << "  copying raw dat not yet implemnted " << endl;
-             UShort_t tmpTotSize =  fRawDataPtr[1];
-             UShort_t tmpStartBin   =  fRawDataPtr[2];
-             UShort_t tmpBunchtSize =  fRawDataPtr[3];
-             //    fRawDataPtr
-             UShort_t tmpSamplesLeft = tmpTotSize -4; 
-
-             fRawData.nSamplesUsed =  tmpTotSize +  tmpStartBin;
-
-             while(tmpSamplesLeft > 0)
+             // cout << __FILE__ << __LINE__ << "fRawData.fChannelID == fRawDataPtr[0] = " << fRawDataPtr[0] << endl;
+             // cout << " copying raw dat not yet implemnted " << endl;
+             UShort_t tmpTotSize = fRawDataPtr[1];
+             UShort_t tmpStartBin = fRawDataPtr[2];
+             UShort_t tmpBunchtSize = fRawDataPtr[3];
+             // fRawDataPtr
+             //     UShort_t tmpSamplesLeft = tmpTotSize -4;
+             int tmpSamplesLeft = tmpTotSize -4;
+
+             fRawData.nSamplesUsed = tmpTotSize + tmpStartBin;
+
+             if(tmpSamplesLeft > 0 )
                {
-                 for(int i=0; i < tmpBunchtSize; i++ )
+                 while(tmpSamplesLeft > 0)
                    {
-                     fRawData.fDataPtr[i + tmpStartBin] = fRawDataPtr[ i+ 4];
-                     tmpSamplesLeft --;
+                     for(int i=0; i < tmpBunchtSize; i++ )
+                       {
+//                       fRawData.fDataPtr[i + tmpStartBin] = fRawDataPtr[ i+ 4];
+                         tmpSamplesLeft --;
+                       }
                    }
+                 fRawDataPtr+= tmpTotSize;
                }
-             fRawDataPtr+= tmpTotSize;
-             
            }
          else
            {
-             //              cout << __FILE__ << __LINE__ << "ERROR! fRawData.fChannelID = "<<  fRawData.fChannelID  << "  but  fRawDataPtr[0] =  " << fRawDataPtr[0]  << endl;
+             // cout << __FILE__ << __LINE__ << "ERROR! fRawData.fChannelID = "<< fRawData.fChannelID << " but fRawDataPtr[0] = " << fRawDataPtr[0] << endl;
            }
-         
-
-         //      HLTDebug("Raw data interface not yet implemented, ignoring raw data");
+ 
+ 
+         // HLTDebug("Raw data interface not yet implemented, ignoring raw data");
        }
       return tmpChannelPtr;
     }
@@ -135,7 +120,6 @@ AliHLTCaloSharedMemoryInterfacev2::NextChannel()
   return 0;
 }
 
-
 void  
 AliHLTCaloSharedMemoryInterfacev2::NextRawChannel( )
 {
@@ -157,7 +141,6 @@ AliHLTCaloSharedMemoryInterfacev2::NextRawChannel( )
     }
 }
 
-
 void
 //AliHLTCaloSharedMemoryInterfacev2::SetMemory(AliHLTCaloChannelDataHeaderStruct* channelDataHeaderPtr,  const unsigned long specification)
 AliHLTCaloSharedMemoryInterfacev2::SetMemory(AliHLTCaloChannelDataHeaderStruct* channelDataHeaderPtr)
@@ -190,13 +173,3 @@ AliHLTCaloSharedMemoryInterfacev2::Reset()
   fHasRawData = false;
 }
 
- 
-void 
-AliHLTCaloSharedMemoryInterfacev2::Reset(AliHLTCaloChannelRawDataStruct &str)
-{
-  for(int i=0; i< ALTROMAXSAMPLES; i++ )
-    {
-      str.fDataPtr[i] = 0;
-    }
- 
-}