Major bugfix in AliL3Compress::WriteRestoredData(). Also added naming conventions...

diff --git a/HLT/comp/AliL3Compress.cxx b/HLT/comp/AliL3Compress.cxx
index 1e6fa8e113f40fa6cca49e34cfb8b52fd778f218..7e4d1cc5c80a1bc218d9755e0ab380f7169a4c9e 100644 (file)
--- a/HLT/comp/AliL3Compress.cxx
+++ b/HLT/comp/AliL3Compress.cxx
@@ -15,6 +15,7 @@
 #include "AliL3ModelTrack.h"
 #include "AliL3Transform.h"
 #include "AliL3MemHandler.h"
+#include "AliL3FileHandler.h"
 #include "bitio.h"
 
 //_____________________________________________________________
@@ -28,21 +29,22 @@ ClassImp(AliL3Compress)
 AliL3Compress::AliL3Compress()
 {
   fTracks=0;
-  SetBitNumbers(7,7,10,4);
+  SetBitNumbers(0,0,0,0);
   fSlice =0;
   fPatch=0;
   fDigits=0;
   fDPt=0;
 }
 
-AliL3Compress::AliL3Compress(Int_t slice,Int_t patch,Int_t pad,Int_t time,Int_t charge,Int_t shape)
+AliL3Compress::AliL3Compress(Int_t slice,Int_t patch,Char_t *path)
 {
   fSlice=slice;
   fPatch=patch;
-  SetBitNumbers(pad,time,charge,shape);
+  SetBitNumbers(0,0,0,0);
   fTracks=0;
   fDigits=0;
   fDPt=0;
+  sprintf(fPath,"%s",path);
 }
 
 AliL3Compress::~AliL3Compress()
@@ -63,9 +65,11 @@ void AliL3Compress::SetBitNumbers(Int_t pad,Int_t time,Int_t charge,Int_t shape)
   fNumShapeBits=shape;
 }
 
-void AliL3Compress::WriteFile(AliL3TrackArray *tracks,Char_t *filename)
+void AliL3Compress::WriteFile(AliL3TrackArray *tracks)
 {
-  FILE *file = fopen(filename,"w");
+  Char_t fname[100];
+  sprintf(fname,"%s/tracks_m_%d_%d.raw",fPath,fSlice,fPatch);
+  FILE *file = fopen(fname,"w");
   Short_t ntracks = tracks->GetNTracks();
   //cout<<"Writing "<<ntracks<<" tracks to file"<<endl;
     
@@ -93,12 +97,25 @@ void AliL3Compress::WriteFile(AliL3TrackArray *tracks,Char_t *filename)
   fclose(file);
 }
 
-void AliL3Compress::ReadFile(Char_t *filename)
+void AliL3Compress::ReadFile(Char_t which)
 {
-  FILE *file = fopen(filename,"r");
+  //Read the trackfile.
+
+  Char_t fname[100];
+  if(which == 'm')
+    sprintf(fname,"%s/tracks_m_%d_%d.raw",fPath,fSlice,fPatch);
+  else if(which == 'u')
+    sprintf(fname,"%s/tracks_u_%d_%d.raw",fPath,fSlice,fPatch);
+  else
+    {
+      cerr<<"AliL3Compress::ReadFile() : Wrong option"<<endl;
+      return;
+    }
+
+  FILE *file = fopen(fname,"r");
   if(!file)
     {
-      cerr<<"Cannot open file "<<filename<<endl;
+      cerr<<"Cannot open file "<<fname<<endl;
       return;
     }
 
@@ -106,7 +123,7 @@ void AliL3Compress::ReadFile(Char_t *filename)
     delete fTracks;
   fTracks = new AliL3TrackArray("AliL3ModelTrack");
   
-  cout<<"Reading file "<<filename<<endl;
+  cout<<"Reading file "<<fname<<endl;
   while(!feof(file))
     {
       AliL3ModelTrack *track = (AliL3ModelTrack*)fTracks->NextTrack();
@@ -127,11 +144,25 @@ void AliL3Compress::ReadFile(Char_t *filename)
   fclose(file);
 }
 
-void AliL3Compress::CompressFile(Char_t *infile,Char_t *outfile)
+void AliL3Compress::CompressFile()
 {
+  if(fNumTimeBits==0)
+    {
+      cerr<<"AliL3Compress::CompressFile() : Bitnumbers not set"<<endl;
+      return;
+    }
   
-  BIT_FILE *output = OpenOutputBitFile(outfile);
-  FILE *input = fopen(infile,"r");
+  Char_t fname[100];
+  sprintf(fname,"%s/tracks_c_%d_%d.raw",fPath,fSlice,fPatch);
+  BIT_FILE *output = OpenOutputBitFile(fname);
+  
+  sprintf(fname,"%s/tracks_m_%d_%d.raw",fPath,fSlice,fPatch);
+  FILE *input = fopen(fname,"r");
+  if(!input)
+    {
+      cerr<<"AliL3Compress::CompressFile() : Error opening file: "<<fname<<endl;
+      return;
+    }
 
   AliL3TrackModel track;
   AliL3ClusterModel cluster;
@@ -235,10 +266,25 @@ void AliL3Compress::CompressFile(Char_t *infile,Char_t *outfile)
       <<"Shape "<<shapeo<<endl;
 }
 
-void AliL3Compress::ExpandFile(Char_t *infile,Char_t *outfile)
+void AliL3Compress::ExpandFile()
 {
-  BIT_FILE *input = OpenInputBitFile(infile);
-  FILE *output = fopen(outfile,"w");
+  if(fNumTimeBits==0)
+    {
+      cerr<<"AliL3Compress::ExpandFile() : Bitnumbers not set"<<endl;
+      return;
+    }
+  
+  Char_t fname[100];
+  sprintf(fname,"%s/tracks_c_%d_%d.raw",fPath,fSlice,fPatch);
+  BIT_FILE *input = OpenInputBitFile(fname);
+  
+  sprintf(fname,"%s/tracks_u_%d_%d.raw",fPath,fSlice,fPatch);
+  FILE *output = fopen(fname,"w");
+  if(!output)
+    {
+      cerr<<"AliL3Compress::ExpandFile() : Error opening file: "<<fname<<endl;
+      return;
+    }
 
   AliL3TrackModel trackmodel;
   AliL3ClusterModel *clusters=0;
@@ -317,11 +363,11 @@ void AliL3Compress::CreateDigitArray(Int_t maxnumber)
   fDPt = new AliL3RandomDigitData*[maxnumber];
 }
 
-void AliL3Compress::RestoreData(Char_t *uncompfile)
+void AliL3Compress::RestoreData()
 {
   
   //Read the uncompressed file:
-  ReadFile(uncompfile);
+  ReadFile('u');
   
   CreateDigitArray(100000);
   
@@ -362,37 +408,50 @@ void AliL3Compress::PrintDigits()
     }
 }
 
-void AliL3Compress::WriteRestoredData(Char_t *remainfile,Char_t *restoredfile)
+void AliL3Compress::WriteRestoredData()
 {
+  Char_t fname[100];
+  
   //Get the remaining raw data array:
   AliL3MemHandler *mem = new AliL3MemHandler();
-  mem->SetBinaryInput(remainfile);
+  sprintf(fname,"%s/remains_%d_%d.raw",fPath,fSlice,fPatch);
+  mem->SetBinaryInput(fname);
   UInt_t numdigits;
   AliL3DigitRowData *origRow = mem->CompBinary2Memory(numdigits);
   mem->CloseBinaryInput();
   
   //Allocate memory for the merged data:
   UInt_t size = mem->GetAllocatedSize() + fNDigits*sizeof(AliL3DigitData);
+  cout<<"Allocating "<<size<<" bytes for merged data array "<<endl;
   Byte_t *data = new Byte_t[size];
   memset(data,0,size);
   AliL3DigitRowData *tempRow = (AliL3DigitRowData*)data;
 
   Int_t ndigits,action,charge;
   UShort_t pad,time;
+      
+  UInt_t digit_counter;
+  Int_t row_counter=0;
   for(Int_t i=NRows[fPatch][0]; i<=NRows[fPatch][1]; i++)
     {
       tempRow->fRow = i;
       ndigits=0;
       AliL3DigitData *origDig = origRow->fDigitData;
       AliL3DigitData *tempDig = tempRow->fDigitData;
+      if((Int_t)origRow->fRow != i)
+       cerr<<"AliL3Compress::WriteRestoredData() : Mismatching row numbering "<<(Int_t)origRow->fRow<<" "<<i<<endl;
+
+      //cout<<"Writing row "<<i<<" with "<<(Int_t)origRow->fNDigit<<" old digits"<<endl;
+      digit_counter=0;
       
       while(1)
        {
-         for(UInt_t j=0; j<origRow->fNDigit; j++)
+         while(digit_counter < origRow->fNDigit)
            {
-             pad = origDig[j].fPad;
-             time = origDig[j].fTime;
-             charge = origDig[j].fCharge;
+             pad = origDig[digit_counter].fPad;
+             time = origDig[digit_counter].fTime;
+             charge = origDig[digit_counter].fCharge;
+             digit_counter++;
              while((action=ComparePoints(i,pad,time)) == 1)
                {
                  tempDig[ndigits].fPad = fDPt[fNUsed]->fPad;
@@ -400,6 +459,7 @@ void AliL3Compress::WriteRestoredData(Char_t *remainfile,Char_t *restoredfile)
                  tempDig[ndigits].fCharge = fDPt[fNUsed]->fCharge;
                  ndigits++;
                  fNUsed++;
+
                }
              if(action == 0)
                {
@@ -409,7 +469,9 @@ void AliL3Compress::WriteRestoredData(Char_t *remainfile,Char_t *restoredfile)
                  ndigits++;
                }
            }
-         if(fNUsed >= fNDigits) break;
+         
+         if(fNUsed >= fNDigits) 
+           break;
          if(fDPt[fNUsed]->fRow != i) //we are on a new row
            break;
          tempDig[ndigits].fPad = fDPt[fNUsed]->fPad;
@@ -418,6 +480,12 @@ void AliL3Compress::WriteRestoredData(Char_t *remainfile,Char_t *restoredfile)
          ndigits++;
          fNUsed++;
        }
+      //cout<<"Writing "<<ndigits<<" digits on row "<<i<<endl;
+      if(ndigits < 4)
+       {
+         row_counter++;
+         cout<<"Few digits on row "<<i<<endl;
+       }
       tempRow->fNDigit = ndigits;
       Int_t size = sizeof(AliL3DigitData)*tempRow->fNDigit + sizeof(AliL3DigitRowData);
       Byte_t *byte_pt = (Byte_t*)tempRow;
@@ -426,13 +494,18 @@ void AliL3Compress::WriteRestoredData(Char_t *remainfile,Char_t *restoredfile)
       mem->UpdateRowPointer(origRow);
     }
   
-  mem->Free();
-  mem->SetBinaryOutput(restoredfile);
+  if(row_counter != NumRows[fPatch])
+    cerr<<"AliL3Compress::WriteRestoredData() : Written rows: "<<row_counter<<" total rows "<<NumRows[fPatch]<<endl;
+  
+  mem->Free();  
+  sprintf(fname,"%s/restored_%d_%d.raw",fPath,fSlice,fPatch);
+  mem->SetBinaryOutput(fname);
   mem->Memory2CompBinary((UInt_t)NumRows[fPatch],(AliL3DigitRowData*)data);
   mem->CloseBinaryOutput();
   
   delete [] data;
   delete mem;
+  
 }
 
 void AliL3Compress::CreateDigits(Int_t row,Float_t pad,Float_t time,Int_t charge,Float_t sigmaY2,Float_t sigmaZ2)
@@ -574,3 +647,27 @@ void AliL3Compress::QSort(AliL3RandomDigitData **a, Int_t first, Int_t last)
     }
   }
 }
+
+void AliL3Compress::WriteRootFile(Char_t *digitsfile,Char_t *rootfile)
+{
+  Char_t fname[100];
+  AliL3MemHandler *mem = new AliL3MemHandler();
+  sprintf(fname,"%s/restored_%d_%d.raw",fPath,fSlice,fPatch);
+  mem->SetBinaryInput(fname);
+  UInt_t ndigits;
+  AliL3DigitRowData *rowPt = (AliL3DigitRowData*)mem->CompBinary2Memory(ndigits);
+  mem->CloseBinaryInput();
+
+  AliL3FileHandler *file = new AliL3FileHandler();
+  if(!file->SetAliInput(digitsfile))
+    {
+      cerr<<"AliL3Compress::WriteRootFile() : Error opening file: "<<digitsfile<<endl;
+      return;
+    }
+  file->Init(fSlice,fPatch,NRows[fPatch]);
+  file->AliDigits2RootFile(rowPt,rootfile);
+  file->CloseAliInput();
+
+  delete mem;
+  delete file;
+}

diff --git a/HLT/comp/AliL3Compress.h b/HLT/comp/AliL3Compress.h
index e5a6e1d48fa12a33c4c9c6a6ded83e763b02a37b..e57f562fee8f188ace90ec763974dfea64acf4b8 100644 (file)
--- a/HLT/comp/AliL3Compress.h
+++ b/HLT/comp/AliL3Compress.h
@@ -23,7 +23,8 @@ class AliL3Compress {
   Int_t fNumShapeBits;
   Int_t fSlice;
   Int_t fPatch;
-  
+  Char_t fPath[100];
+
   void CreateDigitArray(Int_t maxnumber);
   void CreateDigits(Int_t row,Float_t pad,Float_t time,Int_t charge,Float_t ywidth,Float_t zwidth);
   void QSort(AliL3RandomDigitData **a, Int_t first, Int_t last);
@@ -32,16 +33,17 @@ class AliL3Compress {
 
  public:
   AliL3Compress();
-  AliL3Compress(Int_t slice,Int_t patch,Int_t pad=7,Int_t time=7,Int_t charge=10,Int_t shape=4);
+  AliL3Compress(Int_t slice,Int_t patch,Char_t *path="./");
   virtual ~AliL3Compress();
   
   void SetBitNumbers(Int_t pad,Int_t time,Int_t charge,Int_t shape);
-  void WriteFile(AliL3TrackArray *tracks,Char_t *filename);
-  void ReadFile(Char_t *filename);
-  void CompressFile(Char_t *infile,Char_t *outfile);
-  void ExpandFile(Char_t *infile,Char_t *outfile);
-  void RestoreData(Char_t *uncompfile);
-  void WriteRestoredData(Char_t *remainfile,Char_t *restoredfile);
+  void WriteFile(AliL3TrackArray *tracks);
+  void ReadFile(Char_t which);
+  void CompressFile();
+  void ExpandFile();
+  void RestoreData();
+  void WriteRestoredData();
+  void WriteRootFile(Char_t *digitsfile,Char_t *rootfile);
   void PrintDigits();
 
   AliL3TrackArray *GetTracks() {return fTracks;}
@@ -52,6 +54,7 @@ class AliL3Compress {
 
 inline Int_t  AliL3Compress::ComparePoints(Int_t row,UShort_t pad,UShort_t time)
 {
+  if(fNUsed >= fNDigits) return 0;
   
   if(fDPt[fNUsed]->fRow != row) return 0;
   

diff --git a/HLT/comp/AliL3Modeller.cxx b/HLT/comp/AliL3Modeller.cxx
index a5d2f16b0d52ff67be2a8190de4dbcaf6ca5b719..1a8d0d8c09e87c192dd502660c808b460f2db084 100644 (file)
--- a/HLT/comp/AliL3Modeller.cxx
+++ b/HLT/comp/AliL3Modeller.cxx
@@ -44,6 +44,7 @@ void AliL3Modeller::Init(Int_t slice,Int_t patch,Char_t *path)
   fPadOverlap=4;
   fTimeOverlap=4;
   fTrackThreshold=10;
+  sprintf(fPath,"%s",path);
   
   fTransform = new AliL3Transform();
   fTracks = new AliL3TrackArray("AliL3ModelTrack");
@@ -73,7 +74,7 @@ void AliL3Modeller::Init(Int_t slice,Int_t patch,Char_t *path)
 
   fMemHandler = new AliL3MemHandler();
   Char_t fname[100];
-  sprintf(fname,"%sdigits_%d_%d.raw",path,fSlice,fPatch);
+  sprintf(fname,"%sdigits_%d_%d.raw",fPath,fSlice,fPatch);
   if(!fMemHandler->SetBinaryInput(fname))
     {
       cerr<<"AliL3Modeller::Init : Error opening file "<<fname<<endl;
@@ -301,11 +302,10 @@ void AliL3Modeller::FillZeros(AliL3DigitRowData *rowPt,Digit *row)
     }
 }
 
-void AliL3Modeller::WriteRemaining(Char_t *output)
+void AliL3Modeller::WriteRemaining()
 {
   //Write remaining (nonzero) digits to file.
   
-  cout<<"Writing remaining data to file "<<output<<endl;
   AliL3DigitRowData *rowPt;
   rowPt = (AliL3DigitRowData*)fRowData;
   Int_t digitcount=0;
@@ -361,8 +361,10 @@ void AliL3Modeller::WriteRemaining(Char_t *output)
       tempPt = (AliL3DigitRowData*)tmp;
     }
 
+  Char_t fname[100];
   AliL3MemHandler *mem = new AliL3MemHandler();
-  mem->SetBinaryOutput(output);
+  sprintf(fname,"%s/remains_%d_%d.raw",fPath,fSlice,fPatch);
+  mem->SetBinaryOutput(fname);
   mem->Memory2CompBinary((UInt_t)NumRows[fPatch],(AliL3DigitRowData*)data);
   mem->CloseBinaryOutput();
   delete mem;

diff --git a/HLT/comp/AliL3Modeller.h b/HLT/comp/AliL3Modeller.h
index 9c16a37a2eac522cb887c695a0523b8caffc341d..59f11364132b5ceca054b75f9bdde2bd54b4c3ef 100644 (file)
--- a/HLT/comp/AliL3Modeller.h
+++ b/HLT/comp/AliL3Modeller.h
@@ -41,6 +41,7 @@ class AliL3Modeller {
   
   Int_t fSlice;
   Int_t fPatch;
+  Char_t fPath[100];
   
   void FillCluster(AliL3ModelTrack *track,Cluster *cluster,Int_t row);
   void CalcClusterWidth(Cluster *cl,Float_t &sigmaY2,Float_t &sigmaZ2);
@@ -51,11 +52,11 @@ class AliL3Modeller {
   AliL3Modeller();
   virtual ~AliL3Modeller();
   
-  void Init(Int_t slice,Int_t patch,Char_t *path);
+  void Init(Int_t slice,Int_t patch,Char_t *path="./");
   void FindClusters();
   void CheckForOverlaps();
   void CalculateCrossingPoints();
-  void WriteRemaining(Char_t *output);
+  void WriteRemaining();
   
   void SetInputData(AliL3DigitRowData *digits) {fRowData = digits;}