Added protection, fixed dynamic cast

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

diff --git a/ITS/AliITSMapSDD.h b/ITS/AliITSMapSDD.h
index 8f06eb176f07af8fa3b7a84a5d8aee288e5c4f79..5d12b51fe8883ca99c0f2909b348c247286cac06 100644 (file)
--- a/ITS/AliITSMapSDD.h
+++ b/ITS/AliITSMapSDD.h
@@ -13,6 +13,8 @@
 //                                                               //
 ///////////////////////////////////////////////////////////////////
 
+#include "AliITSsegmentationSDD.h"
+#include "AliITSCorrMapSDD.h"
 #include<TNamed.h>
 #include "AliLog.h"
 class TH1F;
@@ -26,20 +28,25 @@ class AliITSMapSDD : public TNamed {
   virtual ~AliITSMapSDD(){};
 
   void SetMap(TH2F* hmap);
-  void SetCellContent(Int_t iAn, Int_t iTb, Float_t devMicron){
-    if(iAn<0 || iAn>=fgkNAnodPts || iTb<0 || iTb >= fgkNDrifPts){
+  Bool_t CheckBounds(Int_t iAn, Int_t iTb) const {
+    if(iAn<0 || iAn>=fgkNAnodPts || iTb<0 || iTb >= fgkNDrifPts){ 
       AliWarning(Form("Cell out of bounds, anode=%d time-bin=%d",iAn,iTb));
-      return;
+      return kFALSE;
     }
-    fMap[iAn][iTb]=devMicron;
+    return kTRUE;
+  }
+  void SetCellContent(Int_t iAn, Int_t iTb, Float_t devMicron){
+    if(CheckBounds(iAn,iTb)) fMap[iAn][iTb]=(Short_t)(devMicron*10.+0.5);
   }
+
   Float_t GetCellContent(Int_t iAn, Int_t iTb) const {
-    if(iAn<0 || iAn>=fgkNAnodPts || iTb<0 || iTb >= fgkNDrifPts){
-      AliWarning(Form("Cell out of bounds, anode=%d timebin=%d",iAn,iTb));
-      return 0.;
-    }
-    else return fMap[iAn][iTb];
+    if(CheckBounds(iAn,iTb)) return (Float_t)fMap[iAn][iTb]/10.;
+    else return 0.;
   }
+  Float_t GetCorrection(Float_t z, Float_t x, AliITSsegmentationSDD *seg);
+  static Int_t GetNBinsAnode() {return fgkNAnodPts;}
+  static Int_t GetNBinsDrift() {return fgkNDrifPts;}
+  AliITSCorrMapSDD* ConvertToNewFormat() const;
 
   TH2F* GetMapHisto() const;
   TH1F* GetResidualDistr(Float_t dmin=-300., Float_t dmax=300.) const;
@@ -47,8 +54,11 @@ class AliITSMapSDD : public TNamed {
  protected:
   static const Int_t fgkNAnodPts = 256; // number of map points along anodes
   static const Int_t fgkNDrifPts = 72; // number of map points along anodes
-  Float_t fMap[fgkNAnodPts][fgkNDrifPts];   // map of deviations
+  Short_t fMap[fgkNAnodPts][fgkNDrifPts];   // map of deviations
+                                            // stored as Short_t: integer 
+                                            // values from -32000 to 32000
+                                            // in the range -3.2 - 3.2 mm
 
-  ClassDef(AliITSMapSDD,1);
+  ClassDef(AliITSMapSDD,2);
 };
 #endif