Merge branch 'master' of https://git.cern.ch/reps/AliRoot

[u/mrichter/AliRoot.git] / ITS / AliITSModuleDaSSD.cxx

diff --git a/ITS/AliITSModuleDaSSD.cxx b/ITS/AliITSModuleDaSSD.cxx
index f59e1a4fe37f689d2ae929d03dc74a181a44a3cc..2b3efb489bf77690d0e391d22d78ac4ee6ff10b9 100644 (file)
--- a/ITS/AliITSModuleDaSSD.cxx
+++ b/ITS/AliITSModuleDaSSD.cxx
@@ -395,7 +395,7 @@ Bool_t AliITSModuleDaSSD::SetEventsNumber(const Long_t eventsnumber)
     if (fStrips[i]) { 
       if (!fStrips[i]->SetEvenetsNumber(eventsnumber)) {
         for (Int_t j = 0; j < i; j++) fStrips[j]->DeleteSignal();
-        AliError(Form("AliITSModuleDaSSD: Error allocating memory for i% events for module %i, strip %i",eventsnumber, (Int_t)fModuleId, i));
+        AliError(Form("AliITSModuleDaSSD: Error allocating memory for %ld event for module %d, strip %d",eventsnumber, (Int_t)fModuleId, i));
         return kFALSE;
       }
     }
@@ -495,22 +495,3 @@ Short_t  AliITSModuleDaSSD::GetCMFerom(const Int_t chipn, const Long_t evn)   co
   else return fCmFerom[chipn][evn];
 }
 
-
-
-UChar_t AliITSModuleDaSSD::CheckIfBad(const Int_t stripn) const
-{
-//Applies the bad channel creteria and set the appropriate flags for returned valie 
-  UInt_t          bcflags = 0;
-  const UInt_t    WOffsetMask = 0x000003FF;
-  if (!fStrips[stripn]) bcflags |= 3;
-  else {
-    if (fStrips[stripn]->GetNoiseCM() == AliITSChannelDaSSD::GetUndefinedValue()) bcflags |= 8;
-    if (fStrips[stripn]->GetNoiseCM() > 20) bcflags |= 8;
-    if (fStrips[stripn]->GetNoiseCM() < 1) bcflags |= 16;
-    if (fStrips[stripn]->GetPedestal() > ((WOffsetMask >> 1) - 1))  bcflags |= 4;
-    else if ((-(fStrips[stripn]->GetPedestal())) > (WOffsetMask >> 1))  bcflags |= 4;
-    if (bcflags) bcflags |= 3;
-  }
-  return bcflags;
-}
-