limit printouts

[u/mrichter/AliRoot.git] / JETAN / AliDAJetFinder.cxx

diff --git a/JETAN/AliDAJetFinder.cxx b/JETAN/AliDAJetFinder.cxx
index 19919c6400b79395947d0f02e95c6470f686ede2..3a27f736d30ac05e783bc97de70544e3c1c89f0d 100644 (file)
--- a/JETAN/AliDAJetFinder.cxx
+++ b/JETAN/AliDAJetFinder.cxx
@@ -68,7 +68,7 @@ void AliDAJetFinder::FindJets()
     TMatrixD *mPyx= new TMatrixD();
     TMatrixD *mY  = new TMatrixD();
        InitDetAnn(dEtSum,xData,vPx,vPy,mPyx,mY);
-       if (!fNin) return;
+       if (fNin < fNclustMax) return;
 
        Int_t nc=1, nk;
        DoubleClusters(nc,nk,vPy,mY);
@@ -117,7 +117,7 @@ void AliDAJetFinder::InitDetAnn(Double_t &dEtSum,Double_t **xData,TVectorD *vPx,
                dEtSum+=(*vPx)(iIn);
                iIn++;
        }
-       for (Int_t iIn=0; iIn<fNin; iIn++) (*vPx)(iIn)=(*vPx)(iIn)/dEtSum;
+       for (iIn=0; iIn<fNin; iIn++) (*vPx)(iIn)=(*vPx)(iIn)/dEtSum;
 
        Int_t njdim=2*fNclustMax+1;
        mPyx->ResizeTo(fNin,njdim);
@@ -127,7 +127,7 @@ void AliDAJetFinder::InitDetAnn(Double_t &dEtSum,Double_t **xData,TVectorD *vPx,
        (*vPy)(0)=1;
        TMatrixDColumn(*mPyx,0)=1;
        Double_t ypos=0,xpos=0;
-       for (Int_t iIn=0; iIn<fNin; iIn++){
+       for (iIn=0; iIn<fNin; iIn++){
                (*mY)(0,0)+=(*vPx)(iIn)*xEta[iIn];
                ypos+=(*vPx)(iIn)*TMath::Sin(xPhi[iIn]);
                xpos+=(*vPx)(iIn)*TMath::Cos(xPhi[iIn]);
@@ -136,7 +136,7 @@ void AliDAJetFinder::InitDetAnn(Double_t &dEtSum,Double_t **xData,TVectorD *vPx,
 }
 
 //-----------------------------------------------------------------------------------
-void AliDAJetFinder::DoubleClusters(Int_t nc,Int_t &nk,TVectorD *vPy,TMatrixD *mY)
+void AliDAJetFinder::DoubleClusters(Int_t nc,Int_t &nk,  TVectorD *vPy,  TMatrixD *mY) const
 {
        for(Int_t iClust=0; iClust<nc; iClust++){
                (*vPy)(iClust)=(*vPy)(iClust)/2;
@@ -147,7 +147,7 @@ void AliDAJetFinder::DoubleClusters(Int_t nc,Int_t &nk,TVectorD *vPy,TMatrixD *m
 }
 
 //-----------------------------------------------------------------------------------
-void AliDAJetFinder::Annealing(Int_t nk,Double_t **xData,TVectorD *vPx,TVectorD *vPy,TMatrixD *mPyx,TMatrixD *mY)
+void AliDAJetFinder::Annealing(Int_t nk,Double_t **xData,  TVectorD *vPx,  TVectorD *vPy,  TMatrixD *mPyx,  TMatrixD *mY)
 {
 // Main part of the algorithm
        const Double_t pi=TMath::Pi();
@@ -238,11 +238,11 @@ void AliDAJetFinder::Annealing(Int_t nk,Double_t **xData,TVectorD *vPx,TVectorD
     delete y;
     delete y1;
     delete ry;
-       delete [] m;
+    delete [] m;
 }
 
 //-----------------------------------------------------------------------------------
-void AliDAJetFinder::NumCl(Int_t &nc,Int_t &nk,TVectorD *vPy,TMatrixD *mPyx,TMatrixD *mY)
+void AliDAJetFinder::NumCl(Int_t &nc,Int_t &nk,TVectorD *vPy,  TMatrixD *mPyx,TMatrixD *mY)
 {
        static Bool_t growcl=true;
        
@@ -299,7 +299,7 @@ void AliDAJetFinder::NumCl(Int_t &nc,Int_t &nk,TVectorD *vPy,TMatrixD *mPyx,TMat
 }
 
 //-----------------------------------------------------------------------------------
-void AliDAJetFinder::ReduceClusters(Int_t **iSame,Int_t nc,Int_t &ncout,Int_t **cont,Int_t *nSameOut)
+void AliDAJetFinder::ReduceClusters(Int_t **iSame,Int_t nc,Int_t &ncout,Int_t **cont,Int_t *nSameOut) const
 {
        Int_t *nSame = new Int_t[nc];
        Int_t *iperm = new Int_t[nc];
@@ -378,7 +378,7 @@ void AliDAJetFinder::EndDetAnn(Int_t &nk,Double_t **xData,Int_t *xx,Double_t etx
 }
 
 //-----------------------------------------------------------------------------------
-void AliDAJetFinder::StoreJets(Int_t nk,Double_t **xData,Int_t *xx,TMatrixD *mY)
+void AliDAJetFinder::StoreJets(Int_t nk,Double_t **xData,  Int_t *xx,  TMatrixD *mY)
 {
 //evaluate significant clusters properties
        const Double_t pi=TMath::Pi();
@@ -477,7 +477,6 @@ void AliDAJetFinder::StoreJets(Int_t nk,Double_t **xData,Int_t *xx,TMatrixD *mY)
                                }
                        }
                        AddJet(jet);
-                       printf("jet %d, Eta: %f, Phi: %f, Et: %f\n",iClust,jet.Eta(),jet.Phi(),jet.Pt());
                }
        }
        delete [] dDeltaEta; delete [] dDeltaPhi;