Forgot to check in this the last time. Some changes in AliL3MemHandler as

a consequence of writing child class AliL3DataHandler. fInBinary and fOutBinary
has been made protected, and CompBinary2Memory and Memory2CompBinary has been
made virtual.

diff --git a/HLT/src/AliL3MemHandler.cxx b/HLT/src/AliL3MemHandler.cxx
index 327add4613bfed152b99b065b1799eb2a3efca21..4cb6240552190a1cebae8232f5aac25959b2e2a6 100644 (file)
--- a/HLT/src/AliL3MemHandler.cxx
+++ b/HLT/src/AliL3MemHandler.cxx
@@ -216,7 +216,7 @@ void AliL3MemHandler::CloseBinaryInput()
 Bool_t AliL3MemHandler::SetBinaryOutput(char *name)
 {
   //Set the binary output file.
 Bool_t AliL3MemHandler::SetBinaryOutput(char *name)
 {
   //Set the binary output file.

-  fOutBinary = fopen(name,"w");
+    fOutBinary = fopen(name,"w");

   if(!fOutBinary){
     LOG(AliL3Log::kWarning,"AliL3MemHandler::SetBinaryOutput","File Open")
       <<"Pointer to File = 0x0 "<<ENDLOG;
   if(!fOutBinary){
     LOG(AliL3Log::kWarning,"AliL3MemHandler::SetBinaryOutput","File Open")
       <<"Pointer to File = 0x0 "<<ENDLOG;

diff --git a/HLT/src/AliL3MemHandler.h b/HLT/src/AliL3MemHandler.h
index 2484a15f8b3e972edd9363d94d7667128712b5df..c8c6901efb841f6c7461bb75da2c23ab79d90d2d 100644 (file)
--- a/HLT/src/AliL3MemHandler.h
+++ b/HLT/src/AliL3MemHandler.h
@@ -15,8 +15,6 @@ class AliL3RandomPointData;
 class AliL3MemHandler{
  private:
   
 class AliL3MemHandler{
  private:
   

-  FILE *fInBinary;//!
-  FILE *fOutBinary;//!

   Byte_t *fPt;//!
   UInt_t fSize;
 
   Byte_t *fPt;//!
   UInt_t fSize;
 


@@ -43,6 +41,7 @@ class AliL3MemHandler{
                       UInt_t row,UShort_t pad,UShort_t time,UShort_t charge);
   void AddDataRandom(AliL3DigitData *data,UInt_t & ndata,
                       UInt_t row,UShort_t pad,UShort_t time,UShort_t charge);
                       UInt_t row,UShort_t pad,UShort_t time,UShort_t charge);
   void AddDataRandom(AliL3DigitData *data,UInt_t & ndata,
                       UInt_t row,UShort_t pad,UShort_t time,UShort_t charge);

+  

 
  protected:
   Int_t fRowMin;
 
  protected:
   Int_t fRowMin;


@@ -52,7 +51,10 @@ class AliL3MemHandler{
 
   Int_t fEtaMinTimeBin[176];
   Int_t fEtaMaxTimeBin[176];
 
   Int_t fEtaMinTimeBin[176];
   Int_t fEtaMaxTimeBin[176];

-
+  
+  FILE *fInBinary;//!
+  FILE *fOutBinary;//!
+  

  public:
   AliL3MemHandler();
   virtual ~AliL3MemHandler();
  public:
   AliL3MemHandler();
   virtual ~AliL3MemHandler();


@@ -89,8 +91,9 @@ class AliL3MemHandler{
   Bool_t CompMemory2CompBinary(UInt_t nrow,UInt_t *comp, UInt_t size=0);
   Bool_t CompBinary2CompMemory(UInt_t & nrow,UInt_t *comp);
 
   Bool_t CompMemory2CompBinary(UInt_t nrow,UInt_t *comp, UInt_t size=0);
   Bool_t CompBinary2CompMemory(UInt_t & nrow,UInt_t *comp);
 

-  AliL3DigitRowData *CompBinary2Memory(UInt_t & nrow);
-  Bool_t Memory2CompBinary(UInt_t nrow,AliL3DigitRowData *data);
+  virtual AliL3DigitRowData *CompBinary2Memory(UInt_t & nrow);
+  virtual Bool_t Memory2CompBinary(UInt_t nrow,AliL3DigitRowData *data);
+  

   UInt_t GetNRow(UInt_t *comp,UInt_t size);
 
   //Point IO
   UInt_t GetNRow(UInt_t *comp,UInt_t size);
 
   //Point IO

diff --git a/HLT/src/AliL3Transform.cxx b/HLT/src/AliL3Transform.cxx
index a118daf1fd471c7a50a62ce35b589321d5a413e0..e1f6be93aac63552c532e370ab04794575744257 100644 (file)
--- a/HLT/src/AliL3Transform.cxx
+++ b/HLT/src/AliL3Transform.cxx
@@ -1,8 +1,8 @@
-/* $Id$
+// $Id$

 // Author: Anders Vestbo <mailto:vestbo@fi.uib.no>, Uli Frankenfeld <mailto:franken@fi.uib.no>
 //*-- Copyright &copy ASV
 // changes done by Constantin Loizides <mailto:loizides@ikf.physik.uni-frankfurt.de>
 // Author: Anders Vestbo <mailto:vestbo@fi.uib.no>, Uli Frankenfeld <mailto:franken@fi.uib.no>
 //*-- Copyright &copy ASV
 // changes done by Constantin Loizides <mailto:loizides@ikf.physik.uni-frankfurt.de>

-*/
+

 
 #include "AliL3Logging.h"
 #include "AliL3Transform.h"
 
 #include "AliL3Logging.h"
 #include "AliL3Transform.h"