Use noise information in cluster finder

diff --git a/TRD/Cal/AliTRDCalPad.cxx b/TRD/Cal/AliTRDCalPad.cxx
index 5bd03ac31536e48e4c4b35134d3c52abcf4b4479..1b3d43951316f30bea7ef001d74581e43563df8b 100644 (file)
--- a/TRD/Cal/AliTRDCalPad.cxx
+++ b/TRD/Cal/AliTRDCalPad.cxx
@@ -150,6 +150,23 @@ Bool_t AliTRDCalPad::ScaleROCs(const AliTRDCalDet* values)
   return result;
 }
 
+//_____________________________________________________________________________
+void AliTRDCalPad::SetCalROC(Int_t det, AliTRDCalROC* calroc)
+{
+  // 
+  // Set the AliTRDCalROC to this one
+  //
+  
+  if (!calroc) return;
+  if (fROC[det]) { 
+    for(Int_t icol = 0; icol < calroc->GetNcols(); icol++){
+      for(Int_t irow = 0; irow < calroc->GetNrows(); irow++){
+       fROC[det]->SetValue(icol,irow,calroc->GetValue(icol,irow));
+      }
+    }
+  }
+
+}
 //_____________________________________________________________________________
 Double_t AliTRDCalPad::GetMeanRMS(Double_t &rms, const AliTRDCalDet *calDet, Int_t type)
 {

diff --git a/TRD/Cal/AliTRDCalPad.h b/TRD/Cal/AliTRDCalPad.h
index 54f7745603971fff39bf3e5411e3f8ea20bdac2d..e65bd0611e9f18b5882e7b6ba7b8b83956af0ec8 100644 (file)
--- a/TRD/Cal/AliTRDCalPad.h
+++ b/TRD/Cal/AliTRDCalPad.h
@@ -41,6 +41,8 @@ class AliTRDCalPad : public TNamed
   
   Bool_t              ScaleROCs(const AliTRDCalDet* values);
 
+  void                SetCalROC(Int_t det, AliTRDCalROC *calroc);
+
   // Statistic
   Double_t GetMeanRMS(Double_t &rms, const AliTRDCalDet *calDet = 0, Int_t type = 0);
   Double_t GetMean(const AliTRDCalDet *calDet = 0, Int_t type = 0, AliTRDCalPad* outlierPad = 0);

diff --git a/TRD/Cal/AliTRDCalPadStatus.cxx b/TRD/Cal/AliTRDCalPadStatus.cxx
index 7df6e0874866aebb46ccd043f182a87c6054c291..86d5c30c252ebe0d16c4e941a9e922875cd0e189 100644 (file)
--- a/TRD/Cal/AliTRDCalPadStatus.cxx
+++ b/TRD/Cal/AliTRDCalPadStatus.cxx
@@ -202,9 +202,11 @@ TH2F *AliTRDCalPadStatus::MakeHisto2DSmPl(Int_t sm, Int_t pl)
        for (Int_t irow=0; irow<calRoc->GetNrows(); irow++){
          Int_t binz     = 0;
          Int_t kb       = kNcham-1-k;
-         if(kb > 2) binz = 16*(kb-1)+12+irow+1+2*(kb+1);
-         else binz = 16*kb+irow+1+2*(kb+1); 
-         Int_t biny = icol+1+2;
+         Int_t krow     = calRoc->GetNrows()-1-irow;
+         Int_t kcol     = calRoc->GetNcols()-1-icol;
+         if(kb > 2) binz = 16*(kb-1)+12+krow+1+2*(kb+1);
+         else binz = 16*kb+krow+1+2*(kb+1); 
+         Int_t biny = kcol+1+2;
          Float_t value = calRoc->GetStatus(icol,irow);
          his->SetBinContent(binz,biny,value);
        }
@@ -215,25 +217,25 @@ TH2F *AliTRDCalPadStatus::MakeHisto2DSmPl(Int_t sm, Int_t pl)
          Int_t kb       = kNcham-1-k;
          if(kb > 2) binz = 16*(kb-1)+12+1+2*(kb+1)-(l+1);
          else binz = 16*kb+1+2*(kb+1)-(l+1); 
-         his->SetBinContent(binz,icol,20.0);
+         his->SetBinContent(binz,icol,50.0);
        }
       }
     }
   }
   for(Int_t icol = 1; icol < 147; icol++){
-    his->SetBinContent(88,icol,20.0);
-    his->SetBinContent(87,icol,20.0);
+    his->SetBinContent(88,icol,50.0);
+    his->SetBinContent(87,icol,50.0);
   }
   for(Int_t irow = 1; irow < 89; irow++){
-    his->SetBinContent(irow,1,20.0);
-    his->SetBinContent(irow,2,20.0);
-    his->SetBinContent(irow,147,20.0);
-    his->SetBinContent(irow,148,20.0);
+    his->SetBinContent(irow,1,50.0);
+    his->SetBinContent(irow,2,50.0);
+    his->SetBinContent(irow,147,50.0);
+    his->SetBinContent(irow,148,50.0);
   }
 
   his->SetXTitle("z (cm)");
   his->SetYTitle("y (cm)");
-  his->SetMaximum(10);
+  his->SetMaximum(50);
   his->SetMinimum(0.0);
   his->SetStats(0);
 

diff --git a/TRD/Cal/AliTRDCalROC.cxx b/TRD/Cal/AliTRDCalROC.cxx
index 9e9545fdda3d9386abde4c83121661501765e1da..4ed4343f780d019eeafb268cac68779801ab105b 100644 (file)
--- a/TRD/Cal/AliTRDCalROC.cxx
+++ b/TRD/Cal/AliTRDCalROC.cxx
@@ -408,7 +408,7 @@ Bool_t AliTRDCalROC::Divide(const AliTRDCalROC*  roc)
 }
 
 //__________________________________________________________________________________
-TH2F * AliTRDCalROC::MakeHisto2D(Float_t min, Float_t max,Int_t type)
+TH2F * AliTRDCalROC::MakeHisto2D(Float_t min, Float_t max,Int_t type,  Float_t mu)
 {
   //
   // make 2D histo
@@ -452,7 +452,7 @@ TH2F * AliTRDCalROC::MakeHisto2D(Float_t min, Float_t max,Int_t type)
   TH2F * his = new TH2F(name,name,fNrows,0, fNrows, fNcols, 0, fNcols);
   for (Int_t irow=0; irow<fNrows; irow++){
     for (Int_t icol=0; icol<fNcols; icol++){
-      his->Fill(irow+0.5,icol+0.5,GetValue(icol,irow));
+      his->Fill(irow+0.5,icol+0.5,GetValue(icol,irow)*mu);
     }
   }
   his->SetStats(0);
@@ -462,7 +462,7 @@ TH2F * AliTRDCalROC::MakeHisto2D(Float_t min, Float_t max,Int_t type)
 }
 
 //_______________________________________________________________________________________
-TH1F * AliTRDCalROC::MakeHisto1D(Float_t min, Float_t max,Int_t type)
+TH1F * AliTRDCalROC::MakeHisto1D(Float_t min, Float_t max,Int_t type,  Float_t mu)
 {
   //
   // make 1D histo
@@ -507,7 +507,7 @@ TH1F * AliTRDCalROC::MakeHisto1D(Float_t min, Float_t max,Int_t type)
   TH1F * his = new TH1F(name,name,100, min,max);
   for (Int_t irow=0; irow<fNrows; irow++){
     for (Int_t icol=0; icol<fNcols; icol++){
-      his->Fill(GetValue(icol,irow));
+      his->Fill(GetValue(icol,irow)*mu);
     }
   }
   return his;

diff --git a/TRD/Cal/AliTRDCalROC.h b/TRD/Cal/AliTRDCalROC.h
index c6b4aa6535a96af41cd3f3f5f43ae786aa30d20f..2d8c1f3da36237fbc2b24b5d7087c9053358c4c5 100644 (file)
--- a/TRD/Cal/AliTRDCalROC.h
+++ b/TRD/Cal/AliTRDCalROC.h
@@ -64,8 +64,8 @@ class AliTRDCalROC : public TObject
   Bool_t Divide(const AliTRDCalROC * roc);   
   
   //Plots
-  TH2F *   MakeHisto2D(Float_t min, Float_t max,Int_t type);
-  TH1F *   MakeHisto1D(Float_t min, Float_t max,Int_t type);
+  TH2F *   MakeHisto2D(Float_t min, Float_t max,Int_t type, Float_t mu = 1.0);
+  TH1F *   MakeHisto1D(Float_t min, Float_t max,Int_t type, Float_t mu = 1.0);
   
  protected: