Using TMath and Riostream

diff --git a/ITS/AliITSDDLRawData.cxx b/ITS/AliITSDDLRawData.cxx
index a3c429cd6f589b9035f0a3f329e198f7bf07f58c..56f96431abd10f800def435882d8d53cc3817dd0 100644 (file)
--- a/ITS/AliITSDDLRawData.cxx
+++ b/ITS/AliITSDDLRawData.cxx
@@ -14,9 +14,10 @@
  **************************************************************************/
 
 #include <stdlib.h>
-#include <iostream.h>
+#include "Riostream.h"
 #include <TClonesArray.h>
 #include <TTree.h>
+#include "TMath.h"
 #include <AliITS.h>
 #include <AliITSgeom.h>
 #include <AliITSdigit.h>
@@ -232,7 +233,7 @@ void AliITSDDLRawData::PackWord(ULong_t &BaseWord, ULong_t Word, Int_t StartBit,
   ULong_t Sum;
   //The BaseWord is being filled with 1 from StartBit to StopBit
   Length=StopBit-StartBit+1;
-  Sum=(ULong_t)pow(2,Length)-1;
+  Sum=(ULong_t)TMath::Power(2,Length)-1;
   if(Word > Sum){
     cout<<"WARNING::Word to be filled is not within desired length"<<endl;
     cout<<"Word:"<<Word<<" Start bit:"<<StartBit<<" Stop Bit:"<<StopBit<<endl;
@@ -243,7 +244,7 @@ void AliITSDDLRawData::PackWord(ULong_t &BaseWord, ULong_t Word, Int_t StartBit,
   BaseWord=BaseWord|OffSet;
   //The Word to be filled is shifted to the position StartBit
   //and the remaining  Left and Right bits are filled with 1
-  Sum=(ULong_t)pow(2,StartBit)-1;
+  Sum=(ULong_t)TMath::Power(2,StartBit)-1;
   DummyWord=0xFFFFFFFF<<Length;
   DummyWord +=Word;
   DummyWord<<=StartBit;
@@ -258,7 +259,7 @@ void AliITSDDLRawData::UnpackWord(ULong_t PackedWord, Int_t StartBit, Int_t Stop
   ULong_t OffSet;
   Int_t Length;
   Length=StopBit-StartBit+1;
-  OffSet=(ULong_t)pow(2,Length)-1;
+  OffSet=(ULong_t)TMath::Power(2,Length)-1;
   OffSet<<=StartBit;
   Word=PackedWord&OffSet;
   Word>>=StartBit;

diff --git a/TPC/AliTPCBuffer160.cxx b/TPC/AliTPCBuffer160.cxx
index 26ff2c2e0493859276f97ba4487fe0ae5a57ecbf..2629b6219d9e8aaedf9999384d2ead796d2db2c1 100644 (file)
--- a/TPC/AliTPCBuffer160.cxx
+++ b/TPC/AliTPCBuffer160.cxx
@@ -17,6 +17,7 @@
 #include "Riostream.h"
 #include <stdlib.h>
 #include "AliTPCBuffer160.h"
+#include "TMath.h"
 
 ClassImp(AliTPCBuffer160)
 
@@ -294,7 +295,7 @@ void AliTPCBuffer160::PackWord(ULong_t &BaseWord, ULong_t Word, Int_t StartBit,
   ULong_t Sum;
   //The BaseWord is being filled with 1 from StartBit to StopBit
   Length=StopBit-StartBit+1;
-  Sum=(ULong_t)pow(2,Length)-1;
+  Sum=(ULong_t)TMath::Power(2,Length)-1;
   if(Word > Sum){
     cout<<"WARNING::Word to be filled is not within desired length"<<endl;
     exit(-1);
@@ -304,7 +305,7 @@ void AliTPCBuffer160::PackWord(ULong_t &BaseWord, ULong_t Word, Int_t StartBit,
   BaseWord=BaseWord|OffSet;
   //The Word to be filled is shifted to the position StartBit
   //and the remaining  Left and Right bits are filled with 1
-  Sum=(ULong_t)pow(2,StartBit)-1;
+  Sum=(ULong_t)TMath::Power(2,StartBit)-1;
   DummyWord=0xFFFFFFFF<<Length;
   DummyWord +=Word;
   DummyWord<<=StartBit;
@@ -319,7 +320,7 @@ void AliTPCBuffer160::UnpackWord(ULong_t PackedWord, Int_t StartBit, Int_t StopB
   ULong_t OffSet;
   Int_t Length;
   Length=StopBit-StartBit+1;
-  OffSet=(ULong_t)pow(2,Length)-1;
+  OffSet=(ULong_t)TMath::Power(2,Length)-1;
   OffSet<<=StartBit;
   Word=PackedWord&OffSet;
   Word>>=StartBit;

diff --git a/TPC/AliTPCCompression.cxx b/TPC/AliTPCCompression.cxx
index 7bd5e0fd56ed72b71afda8ce7b7a229d277731c8..422a6036ab23f8c6e7f01739cd61ba8a0ce2749f 100644 (file)
--- a/TPC/AliTPCCompression.cxx
+++ b/TPC/AliTPCCompression.cxx
@@ -15,7 +15,7 @@
 
 #include <TObjArray.h>
 #include "Riostream.h"
-#include <math.h>
+#include "TMath.h"
 #include "AliTPCCompression.h"
 #include "AliTPCBuffer160.h"
 #include "AliTPCHuffman.h"
@@ -188,30 +188,30 @@ Int_t AliTPCCompression::FillTables(const char* fSource,AliTPCHTable* table[],co
   stat<<"Number of Central Samples....."<<Stat[3]<<endl;
   stat<<"Number of Border Samples......"<<Stat[4]<<endl;
   stat<<"-----------------------------------------"<<endl;
-  ULong_t FileDimension=(ULong_t)ceil(double((CountTrailer*4+CountWords+fFillWords+EndFill)*10/8));
+  ULong_t FileDimension=(ULong_t)TMath::Ceil(double((CountTrailer*4+CountWords+fFillWords+EndFill)*10/8));
   stat<<"Total file Size in bytes.."<<FileDimension<<endl;
-  Double_t Percentage=ceil((fFillWords+EndFill)*125)/FileDimension;
-  stat<<"Fill Words................"<<(ULong_t)ceil((fFillWords+EndFill)*10/8)<<" bytes   "<<Percentage<<"%"<<endl;  
+  Double_t Percentage=TMath::Ceil((fFillWords+EndFill)*125)/FileDimension;
+  stat<<"Fill Words................"<<(ULong_t)TMath::Ceil((fFillWords+EndFill)*10/8)<<" bytes   "<<Percentage<<"%"<<endl;  
   Percentage=(Double_t)CountTrailer*500/FileDimension;
   stat<<"Trailer..................."<<CountTrailer*5<<" bytes   "<<Percentage<<"%"<<endl;
 
   Percentage=(Double_t)((Stat[0]+Stat[1]+Stat[2]+Stat[3]+Stat[4])) *125/FileDimension;
-  stat<<"Data......................"<<(ULong_t)ceil((Stat[0]+Stat[1]+Stat[2]+Stat[3]+Stat[4])*10/8)<<" bytes   "<<Percentage<<"%"<<endl;
+  stat<<"Data......................"<<(ULong_t)TMath::Ceil((Stat[0]+Stat[1]+Stat[2]+Stat[3]+Stat[4])*10/8)<<" bytes   "<<Percentage<<"%"<<endl;
 
   Percentage=(Double_t)(Stat[0]*125)/FileDimension;
-  stat<<"Bunch....................."<<(ULong_t)ceil(Stat[0]*10/8)<<" bytes  "<<Percentage<<"%"<<endl;  //  
+  stat<<"Bunch....................."<<(ULong_t)TMath::Ceil(Stat[0]*10/8)<<" bytes  "<<Percentage<<"%"<<endl;  //  
   Percentage=(Double_t)(Stat[1]*125)/FileDimension;
-  stat<<"Time......................"<<(ULong_t)ceil(Stat[1]*10/8)<<" bytes  "<<Percentage<<"%"<<endl;  //  
+  stat<<"Time......................"<<(ULong_t)TMath::Ceil(Stat[1]*10/8)<<" bytes  "<<Percentage<<"%"<<endl;  //  
 
 
   Percentage=(Double_t)((Stat[2]+Stat[3]+Stat[4])) *125/FileDimension;
-  stat<<"Amplitude values.........."<<(ULong_t)ceil((Stat[2]+Stat[3]+Stat[4])*10/8)<<" bytes  "<<Percentage<<"%"<<endl;
+  stat<<"Amplitude values.........."<<(ULong_t)TMath::Ceil((Stat[2]+Stat[3]+Stat[4])*10/8)<<" bytes  "<<Percentage<<"%"<<endl;
   Percentage=(Double_t)(Stat[2]*125)/FileDimension;
-  stat<<"     One Samples..............."<<(ULong_t)ceil(Stat[2]*10/8)<<" bytes  "<<Percentage<<"%"<<endl;  //  
+  stat<<"     One Samples..............."<<(ULong_t)TMath::Ceil(Stat[2]*10/8)<<" bytes  "<<Percentage<<"%"<<endl;  //  
   Percentage=(Double_t)(Stat[3]*125)/FileDimension;
-  stat<<"     Central Samples..........."<<(ULong_t)ceil(Stat[3]*10/8)<<" bytes  "<<Percentage<<"%"<<endl;  //  
+  stat<<"     Central Samples..........."<<(ULong_t)TMath::Ceil(Stat[3]*10/8)<<" bytes  "<<Percentage<<"%"<<endl;  //  
   Percentage=(Double_t)(Stat[4]*125)/FileDimension;
-  stat<<"     Border Samples............"<<(ULong_t)ceil(Stat[4]*10/8)<<" bytes  "<<Percentage<<"%"<<endl;  //  
+  stat<<"     Border Samples............"<<(ULong_t)TMath::Ceil(Stat[4]*10/8)<<" bytes  "<<Percentage<<"%"<<endl;  //  
   stat.close();
   return 0;
 }
@@ -251,7 +251,7 @@ Int_t AliTPCCompression::CreateTables(const char* fSource,const Int_t NumTables)
   */
   AliTPCHTable ** table = new AliTPCHTable*[NumTables];
   //The table is inizialized with the rigth number of rows 
-  for(Int_t i=0;i<NumTables;i++){table[i]=new  AliTPCHTable((Int_t)(pow(2,n)));}
+  for(Int_t i=0;i<NumTables;i++){table[i]=new  AliTPCHTable((Int_t)(TMath::Power(2,n)));}
   //The frequencies are calculated and the tables are filled
   if (fVerbose)
     cout<<"Filling tables...\n";
@@ -649,9 +649,9 @@ Int_t AliTPCCompression::CompressDataOptTables(Int_t NumTable,const char* fSourc
     delete table[i];
   }//end for
   delete [] table;
-  Double_t dimension=(ULong_t)ceil((Stat[0]+Stat[1]+Stat[2]+Stat[3]+Stat[4])/8)+TrailerNumber*5;
+  Double_t dimension=(ULong_t)TMath::Ceil((Stat[0]+Stat[1]+Stat[2]+Stat[3]+Stat[4])/8)+TrailerNumber*5;
   stat<<"Trailer Dimension in bytes......"<<TrailerNumber*5<<endl;
-  stat<<"Data Dimension in bytes........."<<(ULong_t)ceil((Stat[0]+Stat[1]+Stat[2]+Stat[3]+Stat[4])/8)<<endl;
+  stat<<"Data Dimension in bytes........."<<(ULong_t)TMath::Ceil((Stat[0]+Stat[1]+Stat[2]+Stat[3]+Stat[4])/8)<<endl;
   stat<<"Compressed file dimension......."<<(ULong_t)dimension<<endl;
   /*
   stat<<(ULong_t)TrailerNumber<<endl;
@@ -668,14 +668,14 @@ Int_t AliTPCCompression::CompressDataOptTables(Int_t NumTable,const char* fSourc
   Double_t ratio=(dimension/FillWords)*100;
   stat<<"Compression ratio (Compressed/Uncompressed)..."<<ratio<<"%"<<endl;
   stat<<endl;
-  stat<<"Bunch length size in bytes......"<<(ULong_t)ceil(Stat[0]/8)<<" Comppression.."<<(Stat[0]/NumElem[0])*10<<"%"<<endl;
+  stat<<"Bunch length size in bytes......"<<(ULong_t)TMath::Ceil(Stat[0]/8)<<" Comppression.."<<(Stat[0]/NumElem[0])*10<<"%"<<endl;
   
-  stat<<"Time gap size in bytes.........."<<(ULong_t)ceil(Stat[1]/8)<<" Comppression.."<<(Stat[1]/NumElem[1])*10<<"%"<<endl;
-  stat<<"Amplitude values in bytes......."<<(ULong_t)ceil((Stat[2]+Stat[3]+Stat[4])/8)<<" Comppression.."<<
+  stat<<"Time gap size in bytes.........."<<(ULong_t)TMath::Ceil(Stat[1]/8)<<" Comppression.."<<(Stat[1]/NumElem[1])*10<<"%"<<endl;
+  stat<<"Amplitude values in bytes......."<<(ULong_t)TMath::Ceil((Stat[2]+Stat[3]+Stat[4])/8)<<" Comppression.."<<
     ((Stat[2]+Stat[3]+Stat[4])/(NumElem[2]+NumElem[3]+NumElem[4]))*10<<"%"<<endl;
-  stat<<"     One Samples in bytes............"<<(ULong_t)ceil(Stat[2]/8)<<" Comppression.."<<(Stat[2]/NumElem[2])*10<<"%"<<endl;
-  stat<<"     Central Samples size in bytes..."<<(ULong_t)ceil(Stat[3]/8)<<" Comppression.."<<(Stat[3]/NumElem[3])*10<<"%"<<endl;
-  stat<<"     Border Samples size in bytes...."<<(ULong_t)ceil(Stat[4]/8)<<" Comppression.."<<(Stat[4]/NumElem[4])*10<<"%"<<endl;
+  stat<<"     One Samples in bytes............"<<(ULong_t)TMath::Ceil(Stat[2]/8)<<" Comppression.."<<(Stat[2]/NumElem[2])*10<<"%"<<endl;
+  stat<<"     Central Samples size in bytes..."<<(ULong_t)TMath::Ceil(Stat[3]/8)<<" Comppression.."<<(Stat[3]/NumElem[3])*10<<"%"<<endl;
+  stat<<"     Border Samples size in bytes...."<<(ULong_t)TMath::Ceil(Stat[4]/8)<<" Comppression.."<<(Stat[4]/NumElem[4])*10<<"%"<<endl;
   stat<<endl;
   stat<<"Average number of bits per word"<<endl;
   stat<<"Bunch length ......"<<Stat[0]/NumElem[0]<<endl;
@@ -716,7 +716,7 @@ void AliTPCCompression::CreateTrees(AliTPCHNode *RootNode[],const Int_t NumTable
       node=RootNode[k];
       for(Int_t j=1;j<=CodeLen;j++){
        ULong_t bit,val=0;
-       val=(ULong_t)pow(2,CodeLen-j);
+       val=(ULong_t)TMath::Power(2,CodeLen-j);
        bit=(ULong_t)Code&val; 
        AliTPCHNode *temp=node;
        if(bit){
@@ -773,7 +773,7 @@ void AliTPCCompression::CreateTreesFromFile(AliTPCHNode *RootNode[],const Int_t
       node=RootNode[k];
       for(Int_t j=1;j<=CodeLen;j++){
        ULong_t bit,val=0;
-       val=(ULong_t)pow(2,CodeLen-j);
+       val=(ULong_t)TMath::Power(2,CodeLen-j);
        bit=(ULong_t)Code&val; 
        AliTPCHNode *temp=node;
        if(bit){
@@ -834,7 +834,7 @@ ULong_t AliTPCCompression::ReadWord(Int_t NumberOfBit){
       fReadBits=0;
     }//end if
     ULong_t mask=0;
-    mask=(ULong_t)pow(2,fReadBits);
+    mask=(ULong_t)TMath::Power(2,fReadBits);
     bit=fBuffer&mask;
     bit=bit>>fReadBits;
     fReadBits++;

diff --git a/TPC/AliTPCHuffman.cxx b/TPC/AliTPCHuffman.cxx
index d20eb0aea54404f5595c3c41625f634e868f5e89..73405673ca496f6ee329dd89629d8e623461d64e 100644 (file)
--- a/TPC/AliTPCHuffman.cxx
+++ b/TPC/AliTPCHuffman.cxx
@@ -18,8 +18,7 @@
 ////////////////////////////////////////////////
 
 #include <TObjArray.h>
-#include <iostream.h>
-#include <fstream.h>
+#include "Riostream.h"
 #include "TMath.h"
 #include "AliTPCHuffman.h"
 #include "AliTPCBuffer160.h"