Removing warnings during compilation
authorhristov <hristov@f7af4fe6-9843-0410-8265-dc069ae4e863>
Sun, 30 Apr 2006 16:37:32 +0000 (16:37 +0000)
committerhristov <hristov@f7af4fe6-9843-0410-8265-dc069ae4e863>
Sun, 30 Apr 2006 16:37:32 +0000 (16:37 +0000)
14 files changed:
HLT/comp/AliL3Modeller.h
HLT/hough/AliL3HistogramAdaptive.h
HLT/hough/AliL3HoughClusterTransformer.h
HLT/hough/AliL3HoughIntMerger.cxx
HLT/hough/AliL3HoughIntMerger.h
HLT/hough/AliL3HoughTransformer.h
HLT/hough/AliL3HoughTransformerGlobal.h
HLT/hough/AliL3HoughTransformerLUT.h
HLT/hough/AliL3HoughTransformerNew.h
HLT/hough/AliL3HoughTransformerRow.h
HLT/hough/AliL3HoughTransformerVhdl.h
HLT/misc/AliL3DDLDataFileHandler.cxx
HLT/misc/AliL3DDLDataFileHandler.h
HLT/src/AliHLTReconstructor.h

index c9fafad..eceb291 100644 (file)
@@ -51,7 +51,7 @@ class AliL3Modeller {
   void SetOuterSearchRange(Int_t p,Int_t t) {fOuterPadSearch=p; fOuterTimeSearch=t;}
   void SetMaxClusterRange(Int_t p,Int_t t) {fMaxPads=p; fMaxTimebins=t;}
   void Debug() {fDebug=kTRUE;}
-  virtual Bool_t SetFitRange(AliL3ModelTrack *track,Int_t */*p*/,Int_t */*t*/) {return kFALSE;}
+  virtual Bool_t SetFitRange(AliL3ModelTrack */*track*/,Int_t */*p*/,Int_t */*t*/) {return kFALSE;}
   virtual void SetNmaxOverlaps(Int_t /*i*/) {return;}
   virtual void SetChiSqMax(Float_t /*f*/,Int_t /*p*/) {return;}
   
index 92d1db3..bbce8a8 100644 (file)
@@ -15,6 +15,15 @@ class AliL3HistogramAdaptive : public AliL3Histogram {
   ~AliL3HistogramAdaptive();
 
   void Fill(Double_t x,Double_t y,Int_t weight=1);
+  void Fill(Double_t x,Int_t ybin,Int_t weight=1) {
+    AliL3Histogram::Fill(x,ybin,weight);
+  }
+  void Fill(Int_t xbin,Double_t y,Int_t weight=1) {
+    AliL3Histogram::Fill(xbin,y,weight);
+  }
+  void Fill(Int_t xbin,Int_t ybin,Int_t weight=1) {
+    AliL3Histogram::Fill(xbin,ybin,weight);
+  }
   Int_t FindBin(Double_t x,Double_t y) const;
   Int_t FindXbin(Double_t x) const;
   Int_t FindYbin(Double_t x) const;
index 1593ce9..1d12cbb 100644 (file)
@@ -18,12 +18,18 @@ class AliL3HoughClusterTransformer : public AliL3HoughBaseTransformer {
   AliL3HoughClusterTransformer(Int_t slice,Int_t patch,Int_t netasegments);
   virtual ~AliL3HoughClusterTransformer();
   
+  void CreateHistograms(Float_t ptmin,Float_t ptmax,Float_t pres,Int_t nybin,Float_t psi) {
+    AliL3HoughBaseTransformer::CreateHistograms(ptmin,ptmax,pres,nybin,psi);
+  }
   void CreateHistograms(Int_t nxbin,Float_t ptmin,Int_t nybin,Float_t phimin,Float_t phimax);
   void CreateHistograms(Int_t nxbin,Float_t xmin,Float_t xmax,
                        Int_t nybin,Float_t ymin,Float_t ymax);
   void FindClusters();
   void Reset();
   void TransformCircle();
+  void TransformCircle(Int_t *row_range,Int_t every) {
+    AliL3HoughBaseTransformer::TransformCircle(row_range,every);
+  }
   void TransformCircleC(Int_t *rowrange,Int_t every);
   void TransformLine(Int_t */*rowrange*/=0,Float_t */*phirange*/=0){};
   
index 888149f..4458240 100644 (file)
@@ -146,7 +146,7 @@ void AliL3HoughIntMerger::Print(AliL3Track **tracks)
   
 }
 
-void AliL3HoughIntMerger::SortTracks(AliL3Track **trs, Int_t ntrack)
+void AliL3HoughIntMerger::SortTracks(AliL3Track **trs, Int_t ntrack) const
 {
   //Sort the tracks according to their weight
 
index 7e89caa..8469564 100644 (file)
@@ -23,7 +23,7 @@ class AliL3HoughIntMerger : public AliL3Merger {
   Int_t Merge();
   void MMerge();  //Loop over tracks from different subsectors
   void SetParameters(Double_t maxkappa=0.001, Double_t maxpsi=0.05, Double_t maxtgl=0.1);
-  void SortTracks(AliL3Track **tracks, Int_t ntrack);
+  void SortTracks(AliL3Track **tracks, Int_t ntrack) const;
   void Print(AliL3Track **tracks);
 
  private:
index aab044c..5cd5c8c 100644 (file)
@@ -27,6 +27,9 @@ class AliL3HoughTransformer : public AliL3HoughBaseTransformer {
                        Int_t nybin,Float_t ymin,Float_t ymax);
   void Reset();
   void TransformCircle();
+  void TransformCircle(Int_t *rowrange,Int_t every) {
+    AliL3HoughBaseTransformer:: TransformCircle(rowrange,every);
+  }
   void TransformCircleC(Int_t *rowrange,Int_t every=1);
   void TransformLine(Int_t *rowrange=0,Float_t *phirange=0);
   void TransformLineC(Int_t *rowrange,Float_t *phirange);
index 90f80cc..a8a96fd 100644 (file)
@@ -27,9 +27,25 @@ class AliL3HoughTransformerGlobal : public AliL3HoughTransformer {
   virtual ~AliL3HoughTransformerGlobal();
   
   void CreateHistograms(Float_t ptmin,Int_t nxbin,Int_t nybin);
+  void CreateHistograms(Float_t ptmin,Float_t ptmax,Float_t pres,Int_t nybin,Float_t psi) {
+    AliL3HoughTransformer::CreateHistograms(ptmin,ptmax,pres,nybin,psi);
+  }
+  void CreateHistograms(Int_t nxbin,Float_t ptmin,Int_t nybin,Float_t phimin,Float_t phimax) {
+    AliL3HoughTransformer::CreateHistograms(nxbin,ptmin,nybin,phimin,phimax);
+  }
+  void CreateHistograms(Int_t nxbin,Float_t xmin,Float_t xmax,
+                       Int_t nybin,Float_t ymin,Float_t ymax) {
+    AliL3HoughTransformer::CreateHistograms(nxbin,xmin,xmax,nybin,ymin,ymax);
+  }
   void VerifyTracks(AliL3TrackArray *tracks,Int_t &index);
   void TransformCircle();
+  void TransformCircle(Int_t *row_range,Int_t every) {
+    AliL3HoughTransformer::TransformCircle(row_range,every);
+  }
   void TransformCircleC();
+  void TransformCircleC(Int_t *rowrange,Int_t every){
+    AliL3HoughTransformer::TransformCircleC(rowrange,every);
+  }
   void DefineRegion(Float_t ptmin,Float_t linephi,Int_t seedpadrow);
   void LoadActiveSlices(Bool_t binary=kTRUE);
   void UnloadActiveSlices();
index 88b8f0c..d7f930d 100644 (file)
@@ -25,6 +25,9 @@ class AliL3HoughTransformerLUT : public AliL3HoughBaseTransformer {
   void Reset();
 
   void TransformCircle();
+  void TransformCircle(Int_t *row_range,Int_t every) {
+    AliL3HoughBaseTransformer::TransformCircle(row_range,every);
+  }
 
   Int_t GetEtaIndex(Double_t eta) const;
   AliL3Histogram *GetHistogram(Int_t etaIndex);
index 4276b29..3df0b6e 100644 (file)
@@ -19,6 +19,15 @@ class AliL3HoughTransformerNew : public AliL3HoughTransformer {
   virtual ~AliL3HoughTransformerNew();
   
   void Reset();
+  void CreateHistograms(Float_t ptmin,Float_t ptmax,Float_t pres,Int_t nybin,Float_t psi) {
+    AliL3HoughTransformer::CreateHistograms(ptmin,ptmax,pres,nybin,psi);
+  }
+  void CreateHistograms(Int_t nxbin,Float_t ptmin,Int_t nybin,Float_t phimin,Float_t phimax) {
+    AliL3HoughTransformer::CreateHistograms(nxbin,ptmin,nybin,phimin,phimax);
+  }
+  void CreateHistograms(Int_t nxbin,Float_t xmin,Float_t xmax,Int_t nybin,Float_t ymin,Float_t ymax) {
+    AliL3HoughTransformer::CreateHistograms(nxbin,xmin,xmax,nybin,ymin,ymax);
+  }
   void CreateHistograms(Int_t nxbins,Float_t xlow,Float_t xup,
                        Int_t nybins,Float_t ylow,Float_t yup,
                        Int_t nzbins,Float_t zlow,Float_t zup);
@@ -26,6 +35,9 @@ class AliL3HoughTransformerNew : public AliL3HoughTransformer {
   void TransformLineC(Int_t *rowrange,Float_t *phirange);
   
   TH3 *GetHistogram() {return fParamSpace3D;}
+  AliL3Histogram *GetHistogram(Int_t etaindex){
+    return AliL3HoughTransformer::GetHistogram(etaindex);
+  }
   
  private:
   
index d8a94fa..575f5ba 100644 (file)
@@ -38,13 +38,18 @@ class AliL3HoughTransformerRow : public AliL3HoughBaseTransformer {
   AliL3HoughTransformerRow(Int_t slice,Int_t patch,Int_t netasegments,Bool_t DoMC=kFALSE,Float_t zvertex=0.0);
   virtual ~AliL3HoughTransformerRow();
 
-  //void CreateHistograms(Float_t ptmin,Float_t ptmax,Float_t ptres,Int_t nybin,Float_t psi);
+  void CreateHistograms(Float_t ptmin,Float_t ptmax,Float_t pres,Int_t nybin,Float_t psi) {
+    AliL3HoughBaseTransformer::CreateHistograms(ptmin,ptmax,pres,nybin,psi);
+  }
   void CreateHistograms(Int_t /*nxbin*/,Float_t /*ptmin*/,Int_t /*nybin*/,Float_t /*phimin*/,Float_t /*phimax*/)
   {STDCERR<<"This method for creation of parameter space histograms is not supported for this Transformer!"<<STDENDL;}
   void CreateHistograms(Int_t nxbin,Float_t xmin,Float_t xmax,
                        Int_t nybin,Float_t ymin,Float_t ymax);
   void Reset();
   void TransformCircle();
+  void TransformCircle(Int_t *row_range,Int_t every) {
+    AliL3HoughBaseTransformer::TransformCircle(row_range,every);
+  }
 
   Int_t GetEtaIndex(Double_t eta) const;
   AliL3Histogram *GetHistogram(Int_t etaindex);
index acc1d91..a09e15c 100644 (file)
@@ -16,11 +16,17 @@ class AliL3HoughTransformerVhdl : public AliL3HoughTransformerLUT
   AliL3HoughTransformerVhdl(Int_t slice,Int_t patch,Int_t netasegments,Int_t nits=0);
   virtual ~AliL3HoughTransformerVhdl();
 
+  void CreateHistograms(Float_t ptmin,Float_t ptmax,Float_t pres,Int_t nybin,Float_t psi) {
+    AliL3HoughTransformerLUT::CreateHistograms(ptmin,ptmax,pres,nybin,psi);
+  }
   void CreateHistograms(Int_t nxbin,Float_t ptmin,Int_t nybin,Float_t phimin,Float_t phimax);
   void CreateHistograms(Int_t nxbin,Float_t xmin,Float_t xmax,
                        Int_t nybin,Float_t ymin,Float_t ymax);
 
   void TransformCircle();
+  void TransformCircle(Int_t *row_range,Int_t every) {
+    AliL3HoughTransformerLUT::TransformCircle(row_range,every);
+  }
   void TransformCircleC(Int_t */*rowrange*/,Int_t /*every*/) {return;}
   
   void Init(Int_t slice=0,Int_t patch=0,Int_t netasegments=100,Int_t nits=-1);
index a14160a..a736ced 100644 (file)
@@ -141,9 +141,10 @@ void AliL3DDLDataFileHandler::CloseReaderInput()
 }
 
 #ifdef use_newio
-Bool_t AliL3DDLDataFileHandler::IsDigit(Int_t /*i*/) const
+Bool_t AliL3DDLDataFileHandler::IsDigit(Int_t /*i*/)
 {
   // dummy
+  AliL3MemHandler::IsDigit();
   return kTRUE;
 }
 #endif
index 911b435..3f63763 100644 (file)
@@ -24,7 +24,7 @@ class AliL3DDLDataFileHandler:public AliL3MemHandler{
 #ifdef use_newio
    Bool_t SetReaderInput(AliRawEvent *rawevent);
    Bool_t SetReaderInput(Char_t *name,Int_t event=0);
-   Bool_t IsDigit(Int_t i=0) const;
+   Bool_t IsDigit(Int_t i=0);
    AliL3DigitRowData *AliAltroDigits2Memory(UInt_t & nrow,Int_t event=0,Bool_t /*eventmerge*/=kFALSE){return DDLData2Memory(nrow,event);};
 #else
    Bool_t SetReaderInput(Char_t *name,Bool_t add=kTRUE);
index cbb8b62..eeabfd5 100644 (file)
@@ -16,9 +16,31 @@ public:
   AliHLTReconstructor(Bool_t doTracker, Bool_t doHough);
   virtual ~AliHLTReconstructor();
 
+  virtual void         Reconstruct(TTree* digitsTree, TTree* clustersTree) const{
+    AliReconstructor::Reconstruct(digitsTree,clustersTree);
+  }
+  virtual void         Reconstruct(AliRawReader* rawReader, TTree* clustersTree) const {
+    AliReconstructor::Reconstruct(rawReader,clustersTree);
+  }
   virtual void         Reconstruct(AliRunLoader* runLoader) const;
+  virtual void         Reconstruct(AliRunLoader* runLoader, 
+                                  AliRawReader* rawReader) const {
+    AliReconstructor::Reconstruct(runLoader,rawReader);
+  }
   virtual AliTracker*  CreateTracker(AliRunLoader*) const;
+  virtual void         FillESD(TTree* digitsTree, TTree* clustersTree, 
+                              AliESD* esd) const {
+    AliReconstructor::FillESD(digitsTree,clustersTree,esd);
+  }
+  virtual void         FillESD(AliRawReader* rawReader, TTree* clustersTree, 
+                              AliESD* esd) const {
+    AliReconstructor::FillESD(rawReader,clustersTree,esd);
+  }
   virtual void         FillESD(AliRunLoader* runLoader, AliESD* esd) const;
+  virtual void         FillESD(AliRunLoader* runLoader, 
+                              AliRawReader* rawReader, AliESD* esd) const {
+    AliReconstructor:: FillESD(runLoader,rawReader,esd);
+  }
   void SetDoBench(Bool_t b){fDoBench=b;}
   void SetDoCleanup(Bool_t b){fDoCleanUp=b;}