X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=ITS%2FAliITSCalibrationSPD.cxx;h=9d4d869c00429b3c9b49dd61ea94c30a1b8183e5;hb=c52bf5542bf2394093c8e318c53031e606f97483;hp=9f71ec3b5ed7f5369f83a69eb784c3aef29ad7bc;hpb=b15de2d227dc229b7a81172ca9c5e251a02fa520;p=u%2Fmrichter%2FAliRoot.git

diff --git a/ITS/AliITSCalibrationSPD.cxx b/ITS/AliITSCalibrationSPD.cxx
index 9f71ec3b5ed..9d4d869c004 100644
--- a/ITS/AliITSCalibrationSPD.cxx
+++ b/ITS/AliITSCalibrationSPD.cxx
@@ -21,13 +21,14 @@
 //
 //  Modified by D. Elia, G.E. Bruno, H. Tydesjo
 //  March-April 2006
-//  Last mod:  H. Tydesjo  January 2007
+//  Last mod:  H. Tydesjo  Oct 2007
+//  September   2007: CouplingRowDefault = 0.055 (was 0.047)
 //
 ///////////////////////////////////////////////////////////////////////////
 const Double_t AliITSCalibrationSPD::fgkThreshDefault = 3000.;
 const Double_t AliITSCalibrationSPD::fgkSigmaDefault = 250.;
 const Double_t AliITSCalibrationSPD::fgkCouplColDefault = 0.;
-const Double_t AliITSCalibrationSPD::fgkCouplRowDefault = 0.047;
+const Double_t AliITSCalibrationSPD::fgkCouplRowDefault = 0.055;
 const Double_t AliITSCalibrationSPD::fgkBiasVoltageDefault = 18.182;
 
 ClassImp(AliITSCalibrationSPD)	
@@ -42,10 +43,8 @@ fSigma(fgkSigmaDefault),
 fCouplCol(fgkCouplColDefault),
 fCouplRow(fgkCouplRowDefault),
 fBiasVoltage(fgkBiasVoltageDefault),
-fNrDead(0),
-fDeadChannels(0),
-fNrNoisy(0),
-fNoisyChannels(0){
+fNrBad(0),
+fBadChannels(0){
   // constructor
 
    SetThresholds(fgkThreshDefault,fgkSigmaDefault);
@@ -54,86 +53,43 @@ fNoisyChannels(0){
    SetNoiseParam(0.,0.);
    SetDataType("simulated");
 }
-//_________________________________________________________________________
-
-void AliITSCalibrationSPD::AddDead(UInt_t col, UInt_t row) {
-  //
-  // Add a dead channel to fDeadChannel array
-  //
-  fDeadChannels.Set(fNrDead*2+2);
-  fDeadChannels.AddAt(col,fNrDead*2);
-  fDeadChannels.AddAt(row,fNrDead*2+1);
-  fNrDead++;
-}
-//_________________________________________________________________________
-Int_t AliITSCalibrationSPD::GetDeadColAt(UInt_t index) {
-  // 
-  // Returns column of index-th dead channel
-  //
-  if (index<fNrDead) {
-    return fDeadChannels.At(index*2);
-  }
-  return -1;
-}
-//_________________________________________________________________________
-Int_t AliITSCalibrationSPD::GetDeadRowAt(UInt_t index) {
-  // 
-  // Returns row of index-th dead channel
-  //
-  if (index<fNrDead) {
-    return fDeadChannels.At(index*2+1);
-  }
-  return -1;
-}
-//_________________________________________________________________________
-Bool_t AliITSCalibrationSPD::IsPixelDead(Int_t col, Int_t row) const {
-  //
-  // Check if pixel (col,row) is dead
-  //
-  for (UInt_t i=0; i<fNrDead; i++) { 
-    if (fDeadChannels.At(i*2)==col && fDeadChannels.At(i*2+1)==row) {
-      return true;
-    }
-  }
-  return false;
-}
 //____________________________________________________________________________
-void AliITSCalibrationSPD::AddNoisy(UInt_t col, UInt_t row) {
+void AliITSCalibrationSPD::AddBad(UInt_t col, UInt_t row) {
   //
-  // add noisy pixel 
+  // add bad pixel 
   //
-  fDeadChannels.Set(fNrNoisy*2+2);
-  fNoisyChannels.AddAt(col,fNrNoisy*2);
-  fNoisyChannels.AddAt(row,fNrNoisy*2+1);
-  fNrNoisy++;
+  fBadChannels.Set(fNrBad*2+2);
+  fBadChannels.AddAt(col,fNrBad*2);
+  fBadChannels.AddAt(row,fNrBad*2+1);
+  fNrBad++;
 }
 //____________________________________________________________________________
-Int_t AliITSCalibrationSPD::GetNoisyColAt(UInt_t index) {
+Int_t AliITSCalibrationSPD::GetBadColAt(UInt_t index) {
   //
-  // Get column of index-th noisy pixel
+  // Get column of index-th bad pixel
   //
-  if (index<fNrNoisy) {
-    return fNoisyChannels.At(index*2);
+  if (index<fNrBad) {
+    return fBadChannels.At(index*2);
   }
   return -1;
 }
 //____________________________________________________________________________
-Int_t AliITSCalibrationSPD::GetNoisyRowAt(UInt_t index) {
+Int_t AliITSCalibrationSPD::GetBadRowAt(UInt_t index) {
   //
-  // Get row of index-th noisy pixel
+  // Get row of index-th bad pixel
   //
-  if (index<fNrNoisy) {
-    return fNoisyChannels.At(index*2+1);
+  if (index<fNrBad) {
+    return fBadChannels.At(index*2+1);
   }
   return -1;
 }
 //____________________________________________________________________________
-Bool_t AliITSCalibrationSPD::IsPixelNoisy(Int_t col, Int_t row) const {
+Bool_t AliITSCalibrationSPD::IsPixelBad(Int_t col, Int_t row) const {
   //
-  // Check if pixel (col,row) is noisy
+  // Check if pixel (col,row) is bad
   //
-  for (UInt_t i=0; i<fNrNoisy; i++) { 
-    if (fNoisyChannels.At(i*2)==col && fNoisyChannels.At(i*2+1)==row) {
+  for (UInt_t i=0; i<fNrBad; i++) { 
+    if (fBadChannels.At(i*2)==col && fBadChannels.At(i*2+1)==row) {
       return true;
     }
   }