restore threshold getters after parameter dynamics update (fw v. >= A012)

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

diff --git a/ITS/AliITSPlaneEffSPD.cxx b/ITS/AliITSPlaneEffSPD.cxx
index eeb6637ac85c9bcb3a2f1201cc6b99d8262d3197..af9dec7c85b5e987cc42b39589ee3be5998379b3 100644 (file)
--- a/ITS/AliITSPlaneEffSPD.cxx
+++ b/ITS/AliITSPlaneEffSPD.cxx
@@ -341,11 +341,17 @@ Int_t nf=-1;
 Int_t nt=-1;
 if(fo) {
  AliWarning("PlaneEff: you asked for FO efficiency");
- nf=fFound[GetKey(im,ic,fo,bcm4)];
- nt=fTried[GetKey(im,ic,fo,bcm4)];
+ UInt_t key=GetKey(im,ic,fo,bcm4);
+ if(key<kNModule*kNChip*(kNClockPhase+1)) {
+   nf=fFound[key];
+   nt=fTried[key];
+ }
 } else {
- nf=fFound[GetKey(im,ic)];
- nt=fTried[GetKey(im,ic)];
+ UInt_t key=GetKey(im,ic);
+ if (key<kNModule*kNChip) {
+  nf=fFound[key];
+  nt=fTried[key];
+ }
 }
 return AliITSPlaneEff::PlaneEff(nf,nt);
 }
@@ -366,11 +372,17 @@ Int_t nf=-1;
 Int_t nt=-1;
 if(fo) {
  AliWarning("ErrPlaneEff: you asked for FO efficiency");
- nf=fFound[GetKey(im,ic,fo,bcm4)];
- nt=fTried[GetKey(im,ic,fo,bcm4)];
+ UInt_t key=GetKey(im,ic,fo,bcm4);
+ if(key<kNModule*kNChip*(kNClockPhase+1)) {
+   nf=fFound[key];
+   nt=fTried[key];
+ }
 } else {
- nf=fFound[GetKey(im,ic)];
- nt=fTried[GetKey(im,ic)];
+ UInt_t key=GetKey(im,ic);
+ if (key<kNModule*kNChip) {
+   nf=fFound[key];
+   nt=fTried[key];
+ }
 }
 return AliITSPlaneEff::ErrPlaneEff(nf,nt);
 } 
@@ -383,14 +395,20 @@ if (im>=kNModule || ic>=kNChip)
 if(fo && bcm4>=kNClockPhase)
  {AliError("UpDatePlaneEff: you asked for Fast Or in a wrong phase"); return kFALSE;}
 if (!fo) {
- fTried[GetKey(im,ic)]++;
- if(Kfound) fFound[GetKey(im,ic)]++;
- return kTRUE;
+ UInt_t key=GetKey(im,ic);
+ if(key<kNModule*kNChip) {
+   fTried[key]++;
+   if(Kfound) fFound[key]++;
+   return kTRUE;
+ }
 }
 else {
- fTried[GetKey(im,ic,fo,bcm4)]++;
- if(Kfound) fFound[GetKey(im,ic,fo,bcm4)]++;
- return kTRUE;
+ UInt_t key=GetKey(im,ic,fo,bcm4);
+ if(key<kNModule*kNChip*(kNClockPhase+1)) {
+   fTried[key]++;
+   if(Kfound) fFound[key]++;
+   return kTRUE;
+ }
 }
 return kFALSE;
 }
@@ -406,10 +424,10 @@ UInt_t AliITSPlaneEffSPD::GetKey(const UInt_t mod, const UInt_t chip, const Bool
   // get key given a basic block
 UInt_t key=99999;
 if(mod>=kNModule || chip>=kNChip)
-  {AliWarning("GetKey: you asked for a non existing block"); return 99999;}
+  {AliDebug(1,"GetKey: you asked for a non existing block"); return 99999;}
 key = mod*kNChip+chip;
 if(FO) { 
-  if(BCm4>= kNClockPhase) {AliWarning("GetKey: you have asked Fast OR and a non exisiting BC modulo 4"); return 99999;}
+  if(BCm4>= kNClockPhase) {AliDebug(1,"GetKey: you have asked Fast OR and a non exisiting BC modulo 4"); return 99999;}
   key += kNModule*kNChip*(BCm4+1);
 }
 return key;
@@ -423,7 +441,7 @@ UInt_t AliITSPlaneEffSPD::SwitchChipKeyNumbering(UInt_t key) const {
 // Implemented by valerio.altini@ba.infn.it
 
 if(key>=kNModule*kNChip*(kNClockPhase+1))
-  {AliWarning("SwitchChipKeyNumbering: you asked for a non existing key"); return 99999;}
+  {AliDebug(1,"SwitchChipKeyNumbering: you asked for a non existing key"); return 99999;}
 UInt_t mod=9999,chip=9999,phase=9999;
 GetModAndChipFromKey(key,mod,chip);
 if(mod<kNModuleLy1) chip = kNChip-(chip+1);
@@ -452,7 +470,7 @@ UInt_t AliITSPlaneEffSPD::GetBCm4FromKey(const UInt_t key) const {
 if(key>=kNModule*kNChip*(kNClockPhase+1))
   {AliError("GetBCm4FromKey: you asked for a non existing key"); return 999;}
 if(key<kNModule*kNChip) 
-  {AliWarning("GetBCm4FromKey: key is below 1200, why are you asking for FO related stuff"); return 999;}
+  {AliDebug(1,"GetBCm4FromKey: key is below 1200, why are you asking for FO related stuff"); return 999;}
 
 return key/(kNModule*kNChip) - 1 ;
 }
@@ -705,7 +723,7 @@ Bool_t AliITSPlaneEffSPD::GetBlockBoundaries(const UInt_t key, Float_t& xmn,Floa
 //  Return: kTRUE if computation was succesfully, kFALSE otherwise
 //
 if(key>=kNModule*kNChip)
-  {AliWarning("GetBlockBoundaries: you asked for a non existing key"); return kFALSE;}
+  {AliDebug(1,"GetBlockBoundaries: you asked for a non existing key"); return kFALSE;}
 UInt_t chip=GetChipFromKey(key);
 zmn=GetLocZFromCol(chip*kNCol);
 zmx=GetLocZFromCol((chip+1)*kNCol);