Some parameters changed to get the correct ADC conversion

diff --git a/ITS/AliITSFindClusters.C b/ITS/AliITSFindClusters.C
index 05d61a5d50a0c0b7fcb8449f8266810beebc47d9..03305f4ae9d2b941b8aa5deb39907826d9db77db 100644 (file)
--- a/ITS/AliITSFindClusters.C
+++ b/ITS/AliITSFindClusters.C
@@ -41,28 +41,24 @@ Int_t AliITSFindClusters() {
    // SDD
    Float_t baseline = 10.;
    Float_t noise = 1.67;
-   Int_t thres = baseline+3.*noise;
+   Float_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);
-
-   res1->SetNoiseParam(noise,baseline);
+   res1->SetMagicValue(900.);
    Float_t magic = res1->MagicValue();
    Float_t top = res1->MaxAdc();
    thres *= top/magic;
-
+   res1->SetNoiseParam(noise,baseline);
    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);
 
 

diff --git a/ITS/AliITSresponseSDD.h b/ITS/AliITSresponseSDD.h
index dce88ca11a26a9db7c6e9aa8adc71c84c7b224c1..0c67be939183f9aac2435b99e5c7606815a85004 100644 (file)
--- a/ITS/AliITSresponseSDD.h
+++ b/ITS/AliITSresponseSDD.h
@@ -30,10 +30,10 @@ public:
     return fMaxAdc;
   }                       
   
-  virtual void    SetMagicValue(Float_t p1=96.95) {
+  virtual void    SetMagicValue(Float_t p1=900.) {
     // Set maximum Adc-top value
     fTopValue=p1;
-    //it was 1024
+    //it was 96.95
   }
   virtual Float_t MagicValue()  {
     // Get maximum Adc-top value
@@ -87,7 +87,7 @@ public:
     strcpy(opt1,fParam1.Data()); strcpy(opt2,fParam2.Data());
   }
   
-  virtual  void  SetNoiseParam(Float_t n=1.8, Float_t b=20.){
+  virtual  void  SetNoiseParam(Float_t n=1.75, Float_t b=10.){
     // Noise and baseline
     fNoise=n; fBaseline=b;
   }   

diff --git a/ITS/ITSDigitsToClusters.C b/ITS/ITSDigitsToClusters.C
index ff792bb5cfea19f48ea9260c1af3b511126ceae8..80f34e1f7f07098d0dc0c66ed6300b14cad87cb3 100644 (file)
--- a/ITS/ITSDigitsToClusters.C
+++ b/ITS/ITSDigitsToClusters.C
@@ -45,6 +45,15 @@ void ITSDigitsToClusters (Int_t evNumber1=0,Int_t evNumber2=0)
    AliITSgeom *geom = ITS->GetITSgeom();
 
 
+   // NOTE: if you foresee to have (in segmentation or response) parameter
+   // values other than the default ones, and these values are used not only in
+   // simulation but in cluster finder as well, please set them via your
+   // local Config.C - the streamer will take care of writing the correct
+   // info and you'll no longer be obliged to set them again for your cluster
+   // finder as it's done in this macro (ugly and impractical, no? )
+
+
+
    // Set the models for cluster finding
 
    // SPD
@@ -64,7 +73,7 @@ void ITSDigitsToClusters (Int_t evNumber1=0,Int_t evNumber2=0)
 
    Float_t baseline = 10.;
    Float_t noise = 1.67;
-   Int_t thres = (Int_t)(baseline+3*noise);
+   Float_t thres = baseline+3*noise;
    printf("thresh %d\n",thres);
 
    AliITSDetType *iDetType=ITS->DetType(1);
@@ -74,14 +83,11 @@ void ITSDigitsToClusters (Int_t evNumber1=0,Int_t evNumber2=0)
    if (!seg1) seg1 = new AliITSsegmentationSDD(geom);
    AliITSresponseSDD *res1 = (AliITSresponseSDD*)iDetType->GetResponseModel();
    if (!res1) res1=new AliITSresponseSDD();
-
-   //res1->SetNoiseParam(noise,baseline);
-
-   res1->SetNoiseParam(noise,baseline);
+   res1->SetMagicValue(900.);
    Float_t magic = res1->MagicValue();
    Float_t top = res1->MaxAdc();
    thres *= top/magic;
-       
+   res1->SetNoiseParam(noise,baseline);
    Float_t n,b;
    res1->GetNoiseParam(n,b);
     printf("SDD: noise baseline %f %f zs option %s data type %s\n",n,b,res1->ZeroSuppOption(),res1->DataType());
@@ -94,7 +100,7 @@ void ITSDigitsToClusters (Int_t evNumber1=0,Int_t evNumber2=0)
    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);
 
    // SSD