Fixes for Coverity warnings (A. Mastroserio)

[u/mrichter/AliRoot.git] / ITS / AliITSresponseSDD.h

diff --git a/ITS/AliITSresponseSDD.h b/ITS/AliITSresponseSDD.h
index 2026ffc335a5135108fbb848a096b0c80c7ef0da..1fb39ec6c0e1af4c34ee392f50ca5604598fcef2 100644 (file)
--- a/ITS/AliITSresponseSDD.h
+++ b/ITS/AliITSresponseSDD.h
@@ -18,7 +18,7 @@
 
 class AliITSresponseSDD : public TObject {
  public:
-  enum {kVDCorr2Side = BIT(14)};   // if bit set, the object contains separate corrections for 2 sides
+  enum {kVDCorr2Side = BIT(14),kVDCorrMult = BIT(15)};   // if bit set, the object contains separate corrections for 2 sides
   //
   AliITSresponseSDD();
   virtual ~AliITSresponseSDD(){};
@@ -46,7 +46,10 @@ class AliITSresponseSDD : public TObject {
   virtual void SetHalfLadderATimeZero(Int_t lay, Int_t lad, Float_t tzero);
   virtual void SetHalfLadderCTimeZero(Int_t lay, Int_t lad, Float_t tzero);
   virtual void SetModuleTimeZero(Int_t modIndex, Float_t tzero){
-    if(modIndex<kNSPDmods || modIndex>kNSPDmods+kNSDDmods) AliError(Form("SDD module number %d out of range",modIndex));
+    if(modIndex<kNSPDmods || modIndex>=kNSPDmods+kNSDDmods){
+      AliError(Form("SDD module number %d out of range",modIndex));
+      return;
+    }
     fTimeZero[modIndex-kNSPDmods]=tzero;
   }
 
@@ -61,13 +64,15 @@ class AliITSresponseSDD : public TObject {
   }
   // 
   Bool_t IsVDCorr2Side()                       const {return TestBit(kVDCorr2Side);}
+  Bool_t IsVDCorrMult()                        const {return TestBit(kVDCorrMult);}
   void   SetVDCorr2Side(Bool_t v=kTRUE)              {SetBit(kVDCorr2Side,v);}
+  void   SetVDCorrMult(Bool_t v=kTRUE)               {SetBit(kVDCorrMult,v);}
   //
   static Float_t DefaultTimeOffset() {return fgkTimeOffsetDefault;}
   virtual void SetTimeOffset(Float_t to){fTimeOffset = to;}
   virtual Float_t GetTimeOffset()const {return fTimeOffset;}
   virtual Float_t GetTimeZero(Int_t modIndex) const {
-    if(modIndex<kNSPDmods || modIndex>kNSPDmods+kNSDDmods){
+    if(modIndex<kNSPDmods || modIndex>=kNSPDmods+kNSDDmods){
       AliError(Form("SDD module number %d out of range",modIndex));
       return 0.;
     }
@@ -77,11 +82,14 @@ class AliITSresponseSDD : public TObject {
   virtual void SetADC2keV(Float_t conv){fADC2keV=conv;}
   virtual Float_t GetADC2keV()const {return fADC2keV;}
   virtual void SetADCtokeV(Int_t modIndex, Float_t conv){
-    if(modIndex<kNSPDmods || modIndex>kNSPDmods+kNSDDmods) AliError(Form("SDD module number %d out of range",modIndex));
+    if(modIndex<kNSPDmods || modIndex>=kNSPDmods+kNSDDmods){
+      AliError(Form("SDD module number %d out of range",modIndex));
+      return;
+    }
     fADCtokeV[modIndex-kNSPDmods]=conv;
   }
   virtual Float_t GetADCtokeV(Int_t modIndex) const {
-    if(modIndex<kNSPDmods || modIndex>kNSPDmods+kNSDDmods){
+    if(modIndex<kNSPDmods || modIndex>=kNSPDmods+kNSDDmods){
       AliError(Form("SDD module number %d out of range",modIndex));
       return 0.;
     }