Bugfix from previos ci

[u/mrichter/AliRoot.git] / HLT / src / AliL3MemHandler.cxx

diff --git a/HLT/src/AliL3MemHandler.cxx b/HLT/src/AliL3MemHandler.cxx
index a355d8405b96b3a6a0358b6c0e2810584019512d..c103ce1110223ac4cca3059cfa6814947814fcf5 100644 (file)
--- a/HLT/src/AliL3MemHandler.cxx
+++ b/HLT/src/AliL3MemHandler.cxx
@@ -1,5 +1,5 @@
 /* $Id$
-// Author: Uli Frankenfeld <mailto:franken@fi.uib.no>
+// Author: Uli Frankenfeld <mailto:franken@fi.uib.no>, Anders Vestbo <mailto:vestbo$fi.uib.no>
 // -- Copyright &copy Uli 
 // changes done by Constantin Loizides <mailto:loizides@ikf.physik.uni-frankfurt.de>
 */
@@ -26,13 +26,11 @@
 //
 // The HLT Binary File handler 
 //
-//
-//  This class does all the memory I/O handling on raw binary files.
-//  For the moment the compressed binary files are run-length encoded, using
-//  10 bit digits.
+//  This class does all the memory I/O handling of HLT binary files.
 //  
 //  Examples:
-//  
+//  ---------
+//
 //  1) Reading a binary file:
 //  
 //  AliL3MemHandler file;
@@ -69,6 +67,12 @@
 //  newfile.SetBinaryOutput(newfilename);
 //  newfile.Memory2CompBinary((UInt_t)NumberOfRowsInPatch,(AliL3DigitRowData*)data);
 //  newfile.CloseBinaryOutput();
+//
+//
+// Compressed file format:
+// -----------------------
+//
+// The data is RLE encoded and currently using _10_ bit range for the ADC-values.
 </pre> */  
   
 ClassImp(AliL3MemHandler)
@@ -82,17 +86,13 @@ AliL3MemHandler::AliL3MemHandler()
   fInBinary = 0;
   fOutBinary = 0;
   fNRandom = 0;
-  Int_t r[2]={0,0};
-  Init(0,0,r);
+  Init(0,0);
   IsRandom = kFALSE;
   fDigits = 0;
   fDPt =0;
   fNGenerate = 0;
   fNUsed = 0;
   fNDigits = 0;
-  fTransformer = 0;
-  Int_t row[2] = {0,175};
-  Init(0,0,row);
   ResetROI();
 }
 
@@ -147,11 +147,11 @@ void AliL3MemHandler::SetROI(Float_t *eta,Int_t *slice)
       
       Float_t thetamax = 2*atan(exp(-1.*eta[1]));
       
-      xyz[0] = fTransformer->Row2X(i);
+      xyz[0] = AliL3Transform::Row2X(i);
       xyz[1]=0;
       xyz[2] = xyz[0]/tan(thetamax);
-      fTransformer->Slice2Sector(fSlice,i,sector,row);
-      fTransformer->Local2Raw(xyz,sector,row);
+      AliL3Transform::Slice2Sector(fSlice,i,sector,row);
+      AliL3Transform::Local2Raw(xyz,sector,row);
       
       fEtaMinTimeBin[i] = (Int_t)xyz[2];
       
@@ -160,11 +160,11 @@ void AliL3MemHandler::SetROI(Float_t *eta,Int_t *slice)
       else
        {
          Float_t thetamin = 2*atan(exp(-1.*eta[0]));
-         xyz[0] = fTransformer->Row2X(i);
-         xyz[1] = fTransformer->GetMaxY(i);
+         xyz[0] = AliL3Transform::Row2X(i);
+         xyz[1] = AliL3Transform::GetMaxY(i);
          Float_t radii = sqrt(pow(xyz[0],2) + pow(xyz[1],2));
          xyz[2] = radii/tan(thetamin);
-         fTransformer->Local2Raw(xyz,sector,row);
+         AliL3Transform::Local2Raw(xyz,sector,row);
          fEtaMaxTimeBin[i] = (Int_t)xyz[2];
        }
     }
@@ -213,7 +213,7 @@ void AliL3MemHandler::CloseBinaryInput()
 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;
@@ -377,7 +377,7 @@ UInt_t AliL3MemHandler::GetRandomSize()
 {
   Int_t nrandom = 0;
   for(Int_t r=fRowMin;r<=fRowMax;r++){
-    Int_t npad=fTransformer->GetNPads(r);
+    Int_t npad=AliL3Transform::GetNPads(r);
     nrandom  += Int_t (fNGenerate * ((Double_t) npad/141.));
   }
   return 9 * nrandom * sizeof(AliL3DigitData);
@@ -390,10 +390,10 @@ void AliL3MemHandler::Generate(Int_t row)
   if(!IsRandom) return;
   ResetRandom();
   fNDigits = 0;
-  Int_t npad=fTransformer->GetNPads(row);
+  Int_t npad=AliL3Transform::GetNPads(row);
   Int_t ntime = fEtaMaxTimeBin[row] - fEtaMinTimeBin[row];
   Int_t nrandom  = Int_t (fNGenerate * ((Double_t) npad/141.) * 
-                         (Double_t) ntime/(Double_t) fTransformer->GetNTimeBins() );
+                         (Double_t) ntime/(Double_t) AliL3Transform::GetNTimeBins() );
   
   for(Int_t n=0;n<nrandom;n++){
     Int_t pad = (int)((float)rand()/RAND_MAX*npad);
@@ -421,8 +421,8 @@ void AliL3MemHandler::DigitizePoint(Int_t row, Int_t pad,
       Int_t dpad  = j + pad;
       Int_t dtime = k + time;
       
-      if(dpad<0||dpad>=fTransformer->GetNPads(row))  continue;
-      if(dtime<0||dtime>=fTransformer->GetNTimeBins()) continue;
+      if(dpad<0||dpad>=AliL3Transform::GetNPads(row))  continue;
+      if(dtime<0||dtime>=AliL3Transform::GetNTimeBins()) continue;
       
       fDigits[fNDigits].fCharge = dcharge;
       fDigits[fNDigits].fRow = row;
@@ -982,17 +982,13 @@ Bool_t AliL3MemHandler::Transform(UInt_t npoint,AliL3SpacePointData *data,Int_t
     <<"Pointer to AliL3SpacePointData = 0x0 "<<ENDLOG;
     return kFALSE;
   }
-  if(!fTransformer){
-    LOG(AliL3Log::kError,"AliL3MemHandler::Transform","Object")
-    <<"Pointer to AliL3Transform = 0x0 "<<ENDLOG;
-    return kFALSE;
-  }
+  
   for(UInt_t i=0;i<npoint;i++){
     Float_t xyz[3];
     xyz[0] = data[i].fX;
     xyz[1] = data[i].fY;
     xyz[2] = data[i].fZ;
-    fTransformer->Local2Global(xyz,slice);
+    AliL3Transform::Local2Global(xyz,slice);
     data[i].fX = xyz[0];
     data[i].fY = xyz[1];
     data[i].fZ = xyz[2];
@@ -1253,12 +1249,7 @@ Bool_t AliL3MemHandler::Memory2TrackArray(UInt_t ntrack,AliL3TrackSegmentData *d
     <<"Pointer to AliL3TrackArray = 0x0 "<<ENDLOG;
     return kFALSE;
   }
-  if(!fTransformer){
-    LOG(AliL3Log::kError,"AliL3MemHandler::Memory2TrackArray","Object")
-    <<"Pointer to AliL3Transform = 0x0 "<<ENDLOG;
-    return kFALSE;
-  }
-  array->FillTracks(ntrack,data,slice,fTransformer);
+  array->FillTracks(ntrack,data,slice);
   return kTRUE;
 }