Use TMath::Abs instead of fabs (Alpha)

[u/mrichter/AliRoot.git] / ITS / AliITSFindClusters.C

diff --git a/ITS/AliITSFindClusters.C b/ITS/AliITSFindClusters.C
index 4d1bf4af54a6125e639301ce6dd6b43c411a57d4..cc74a05234f06c88cfbc99a76ff4d2b0a68d982a 100644 (file)
--- a/ITS/AliITSFindClusters.C
+++ b/ITS/AliITSFindClusters.C
@@ -23,6 +23,7 @@ Int_t AliITSFindClusters() {
    Int_t ver = ITS->IsVersion(); 
    cerr<<"ITS version "<<ver<<" has been found !\n";
 
+    ITS->MakeTreeC();
 // Set the models for cluster finding
    AliITSgeom *geom = ITS->GetITSgeom();
 
@@ -39,22 +40,22 @@ Int_t AliITSFindClusters() {
 
 
    // SDD
-   Float_t baseline = 10.;
-   Float_t noise = 1.67;
-   Int_t thres = baseline+3.*noise;
-
    AliITSDetType *iDetType=ITS->DetType(1);
    AliITSsegmentationSDD *seg1=(AliITSsegmentationSDD*)iDetType->GetSegmentationModel();
    if (!seg1) seg1 = new AliITSsegmentationSDD(geom);
    AliITSresponseSDD *res1 = (AliITSresponseSDD*)iDetType->GetResponseModel();
    if (!res1) res1=new AliITSresponseSDD();
-   res1->SetNoiseParam(noise,baseline);
+   Float_t baseline,noise;
+   res1->GetNoiseParam(noise,baseline);
+   Float_t noise_after_el = res1->GetNoiseAfterElectronics();
+   Float_t thres = baseline;
+   thres += (4.*noise_after_el);  // TB // (4.*noise_after_el);
+   printf("thres %f\n",thres);
+//   res1->Print();
    TClonesArray *dig1  = ITS->DigitsAddress(1);
    TClonesArray *recp1  = ITS->ClustersAddress(1);
    AliITSClusterFinderSDD *rec1=new AliITSClusterFinderSDD(seg1,res1,dig1,recp1);
-   rec1->SetMinNCells(6);
-   rec1->SetTimeCorr(70.);
-   rec1->SetCutAmplitude(thres);
+   rec1->SetCutAmplitude((int)thres);
    ITS->SetReconstructionModel(1,rec1);
 
 
@@ -62,8 +63,7 @@ Int_t AliITSFindClusters() {
    AliITSDetType *iDetType=ITS->DetType(2);
    AliITSsegmentationSSD *seg2=(AliITSsegmentationSSD*)iDetType->GetSegmentationModel();
    TClonesArray *dig2  = ITS->DigitsAddress(2);
-   TClonesArray *recp2  = ITS->ClustersAddress(2);
-   AliITSClusterFinderSSD *rec2=new AliITSClusterFinderSSD(seg2,dig2,recp2);
+   AliITSClusterFinderSSD *rec2=new AliITSClusterFinderSSD(seg2,dig2);
    ITS->SetReconstructionModel(2,rec2);
    // test
    printf("SSD dimensions %f %f \n",seg2->Dx(),seg2->Dz());
@@ -71,29 +71,17 @@ Int_t AliITSFindClusters() {
 
 
 
+   if(!gAlice->TreeR()) gAlice->MakeTree("R");
+   //make branch
+   ITS->MakeBranch("R");
 
    TStopwatch timer;
 
-   switch (ver) {
-   case 5:
-      cerr<<"Looking for clusters...\n";
-      {
-       timer.Start();
-       ITS->DigitsToRecPoints(0,1,"All");
-      }
-      break;
-   default:
-      cerr<<"Invalid ITS version !\n";
-      return 5;
-   }
-
+   cerr<<"Looking for clusters...\n";
+   timer.Start();
+   ITS->DigitsToRecPoints(0,0,"All");
    timer.Stop(); timer.Print();
 
-   delete rec0;
-   delete rec1;
-   delete rec2;
-
-
    delete gAlice; gAlice=0;
 
    in->Close();