Removed private member AliL3FileHandler::fTransformer, and moved AliL3MemHandler...

to protected. This means that both the filehandler and memhandler always has to get
the transformer from AliL3MemHandler::Init(AliL3Transform *).

diff --git a/HLT/src/AliL3FileHandler.cxx b/HLT/src/AliL3FileHandler.cxx
index 0a6a68c38b0f968221538c383dbfaf62f35338b4..8710d35a6fb18642253aa9857f19b9968237d3cd 100644 (file)
--- a/HLT/src/AliL3FileHandler.cxx
+++ b/HLT/src/AliL3FileHandler.cxx
@@ -33,7 +33,6 @@ AliL3FileHandler::AliL3FileHandler(){
   //Default constructor
   fInAli = 0;
   fParam = 0;
-  fTransformer = 0;
   fMC =0;
   fLastIndex=0;
   fDigits=0;
@@ -42,7 +41,6 @@ AliL3FileHandler::AliL3FileHandler(){
 
 AliL3FileHandler::~AliL3FileHandler(){
   //Destructor
-  if(fTransformer) delete fTransformer;
   if(fMC) CloseMCOutput();
   if(fDigitsTree) delete fDigitsTree;
   if(fInAli) CloseAliInput();
@@ -91,7 +89,6 @@ Bool_t AliL3FileHandler::SetAliInput(){
     <<"No AliTPCParam 75x40_100x60 in File "<<fInAli->GetName()<<ENDLOG;
      return kFALSE;
   }
-  fTransformer = new AliL3Transform();
   return kTRUE;
 }
 
@@ -180,7 +177,13 @@ AliL3DigitRowData * AliL3FileHandler::AliDigits2Memory(UInt_t & nrow,Int_t event
     <<"No Input avalible: TFile not opend"<<ENDLOG;
     return 0;
   }
-
+  if(!fTransformer)
+    {
+      LOG(AliL3Log::kWarning,"AliL3FileHandler::AliDigits2Memory","Transformer")
+       <<"No transformer object"<<ENDLOG;
+      return 0;
+    }
+  
   if(!fDigitsTree)
     GetDigitsTree(event);
     
@@ -489,6 +492,12 @@ AliL3SpacePointData * AliL3FileHandler::AliPoints2Memory(UInt_t & npoint){
     <<"No Input avalible: TFile not opend"<<ENDLOG;
     return 0;
   }
+  if(!fTransformer)
+    {
+      LOG(AliL3Log::kWarning,"AliL3FileHandler::AliPoints2Memory","Transformer")
+       <<"No transformer object"<<ENDLOG;
+      return 0;
+    }
   TDirectory *savedir = gDirectory;
   fInAli->cd();
   

diff --git a/HLT/src/AliL3FileHandler.h b/HLT/src/AliL3FileHandler.h
index 3fd4eed0fd8091be9d109c100040aac283cde8c5..00e364a509a8840008676e7ade7db98331a116ae 100644 (file)
--- a/HLT/src/AliL3FileHandler.h
+++ b/HLT/src/AliL3FileHandler.h
@@ -18,7 +18,6 @@ class AliL3FileHandler:public AliL3MemHandler{
  private:
   TFile *fInAli;
   AliTPCParam *fParam;
-  AliL3Transform *fTransformer;//!
   Bool_t SetAliInput();
   Int_t fLastIndex;
   AliSimDigits *fDigits;

diff --git a/HLT/src/AliL3MemHandler.cxx b/HLT/src/AliL3MemHandler.cxx
index 7781ff8b2c6a7823b11d499f3d376a1a12e2f6c8..1002319256f63ee502eaaf43e47ba90a6261b05e 100644 (file)
--- a/HLT/src/AliL3MemHandler.cxx
+++ b/HLT/src/AliL3MemHandler.cxx
@@ -90,7 +90,7 @@ AliL3MemHandler::AliL3MemHandler()
   fNGenerate = 0;
   fNUsed = 0;
   fNDigits = 0;
-  
+  fTransformer = 0;
   Int_t row[2] = {0,175};
   Init(0,0,row);
   ResetROI();

diff --git a/HLT/src/AliL3MemHandler.h b/HLT/src/AliL3MemHandler.h
index 32f8a94e58c3fccf19a2e62fc7e43ec0e87f7767..c2f776ae5c30c9f2f27fce515d1b1f4f1cd15d59 100644 (file)
--- a/HLT/src/AliL3MemHandler.h
+++ b/HLT/src/AliL3MemHandler.h
@@ -14,7 +14,7 @@ class AliL3RandomPointData;
 
 class AliL3MemHandler{
  private:
-  AliL3Transform *fTransformer;//!
+  
   FILE *fInBinary;//!
   FILE *fOutBinary;//!
   Byte_t *fPt;//!
@@ -52,7 +52,7 @@ class AliL3MemHandler{
 
   Int_t fEtaMinTimeBin[176];
   Int_t fEtaMaxTimeBin[176];
-  
+  AliL3Transform *fTransformer;//!
 
  public:
   AliL3MemHandler();

diff --git a/HLT/src/AliL3Transform.cxx b/HLT/src/AliL3Transform.cxx
index 127edee7aad2d64f48a2dc725d514fa87ea1613b..a704376bdfb31195150c192ce2774cb81a51bd27 100644 (file)
--- a/HLT/src/AliL3Transform.cxx
+++ b/HLT/src/AliL3Transform.cxx
@@ -31,7 +31,10 @@ AliL3Transform::~AliL3Transform(){
 
 /// old init function used by Anders for AliRoot version 3.06
 void AliL3Transform::Init(){
-
+  
+  LOG(AliL3Log::kWarning,"AliL3Transform::Init()","Init")
+    <<"You are using the _old_ version of parameter inits. V3.06 only!"<<ENDLOG;
+  
   //sector:
   fNTimeBins = 446;
   fNRowLow = 64;
@@ -418,7 +421,8 @@ void AliL3Transform::Init(const char* path){
 
   FILE *fptr=fopen(pathname,"r");
   if(!fptr){
-    LOG(AliL3Log::kWarning,"AliL3Transform::Init","File Open")<<"Pointer to Config File \""<<pathname<<"\" 0x0!"<<ENDLOG;
+    LOG(AliL3Log::kWarning,"AliL3Transform::Init","File Open")
+      <<"Pointer to Config File \""<<pathname<<"\" 0x0!"<<ENDLOG;
     return;
   }