Coverity

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

diff --git a/ITS/AliITSModuleDaSSD.h b/ITS/AliITSModuleDaSSD.h
index 4f9d2eb6acc05f3f3add7f644b3af556d3f5ce07..76e0be70cc17ec3b2dd1d3b26aabb85ef8222f69 100644 (file)
--- a/ITS/AliITSModuleDaSSD.h
+++ b/ITS/AliITSModuleDaSSD.h
@@ -43,13 +43,12 @@ class AliITSModuleDaSSD : public TObject {
     Float_t*     GetCM(const Int_t chipn)   const { return chipn < fNumberOfChips ? fCm[chipn].GetArray() : NULL; }
     Float_t      GetCM(const Int_t chipn, const Long_t evn)   const;
     TArrayF*     GetCM() const { return fCm; }
-    Short_t*     GetCMFerom(const Int_t chipn)   const { return chipn < fgkChipsPerModule ? fCmFerom[chipn].GetArray() : NULL; }
+    Short_t*     GetCMFerom(const Int_t chipn)   const { return (fCmFerom && (chipn < fgkChipsPerModule)) ? fCmFerom[chipn].GetArray() : NULL; }
     Short_t      GetCMFerom(const Int_t chipn, const Long_t evn)   const;
     TArrayS*     GetCMFerom() const { return fCmFerom; }
     Int_t        GetNumberOfChips() const  { return fNumberOfChips; }
     AliITSChannelDaSSD*  GetStrip(const Int_t stripnumber)  const 
                                 { return (fStrips) ? fStrips[stripnumber] : NULL; }
-    UChar_t CheckIfBad(const Int_t stripn) const;
     Bool_t  SetEventsNumber(const Long_t eventsnumber);
     Bool_t  SetNumberOfStrips(const Int_t numberofstrips);
     Bool_t  SetNumberOfChips(const Int_t nchips);
@@ -63,7 +62,8 @@ class AliITSModuleDaSSD : public TObject {
     void    DeleteCM () {if (fCm) { delete [] fCm; fNumberOfChips = 0; fCm = NULL; } }
     void    DeleteSignal() {if (fStrips) for (Int_t i = 0; i < fNumberOfStrips; i++) 
                                             if (fStrips[i]) fStrips[i]->DeleteSignal(); fEventsNumber = 0; }
-    void    SetCMFerom (Short_t* cm, const Int_t chipn)  { if (chipn < fgkChipsPerModule) fCmFerom[chipn].Set(fCmFerom[chipn].GetSize(), cm); }
+       Bool_t  AllocateCMFeromArray(void);
+    void    SetCMFerom (Short_t* cm, const Int_t chipn);
     Bool_t  SetCMFerom (const Short_t cm, const Int_t chipn, const Int_t evn);
     Bool_t  SetCMFeromEventsNumber(const Long_t eventsnumber); 
     void    DeleteCMFerom () {if (fCmFerom) { delete [] fCmFerom; fCmFerom = NULL; } }
@@ -100,8 +100,9 @@ class AliITSModuleDaSSD : public TObject {
   private:
     Bool_t ForbiddenAdcNumber (const UChar_t adcn) const { return ((adcn == 6) || (adcn == 7)); }
  
-    ClassDef(AliITSModuleDaSSD, 4) 
+    ClassDef(AliITSModuleDaSSD, 6) 
  
 };
 
 #endif
+