X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=ITS%2FAliITSCorrMapSDD.h;h=d55803864884b08c7b9f4d257d2231f75bd31c82;hb=1b6d1da1bf722dca58697e90c4a56f26577bf7d8;hp=2f149c6c33e0c1881b7ebb24e45cdbbf0f9f15f8;hpb=6c790b32ae67b4f2732f1737f739fd243920d4c9;p=u%2Fmrichter%2FAliRoot.git

diff --git a/ITS/AliITSCorrMapSDD.h b/ITS/AliITSCorrMapSDD.h
index 2f149c6c33e..d5580386488 100644
--- a/ITS/AliITSCorrMapSDD.h
+++ b/ITS/AliITSCorrMapSDD.h
@@ -22,10 +22,20 @@ class TH2F;
 class AliITSCorrMapSDD : public TNamed {
 
  public:
+  // maps produced from residuals stores Xtrue-Xmeasured in drift lenght.
+  // Since the map computes xtrue-xmeas in drift coordinate
+  // and the difference is added to measured local coordinate, we have
+  // Left:  Xmeas_loc_corr = Xmeas_loc + (Xtrue-Xmeas)_loc = Xmeas_loc - (Xtrue-Xmeas)_drift
+  // Right: Xmeas_loc_corr = Xmeas_loc + (Xtrue-Xmeas)_loc = Xmeas_loc + (Xtrue-Xmeas)_drift
+  // hence, for the left side the sign of the correction need to inverted
+  enum {kLeftInvBit = BIT(14)};   
   AliITSCorrMapSDD();
   AliITSCorrMapSDD(Char_t *mapname);
   virtual ~AliITSCorrMapSDD(){};
-
+  //
+  void   SetInversionBit(Bool_t v=kTRUE)           {SetBit(kLeftInvBit,v);}
+  Bool_t GetInversionBit()               const     {return TestBit(kLeftInvBit);}
+  //
   Int_t GetNBinsAnode() const {return fNAnodePts;}
   Int_t GetNBinsDrift() const {return fNDriftPts;}
   void SetNBinsAnode(Int_t nbins) {
@@ -38,18 +48,12 @@ class AliITSCorrMapSDD : public TNamed {
   }
 
   Bool_t CheckAnodeBounds(Int_t iAn) const {
-    if(iAn<0 || iAn>=fNAnodePts){
-      AliWarning(Form("Cell out of bounds, anode=%d",iAn));
-      return kFALSE;
-    }
-    return kTRUE;
+    if(iAn<0 || iAn>=fNAnodePts)return kFALSE;
+    else return kTRUE;
   }
   Bool_t CheckDriftBounds(Int_t iTb) const {
-    if(iTb<0 || iTb >= fNDriftPts){ 
-      AliWarning(Form("Cell out of bounds, time-bin=%d",iTb));
-      return kFALSE;
-    }
-    return kTRUE;
+    if(iTb<0 || iTb >= fNDriftPts)return kFALSE;
+    else return kTRUE;
   }
 
   virtual void Set1DMap(TH1F* /*hmap*/){
@@ -70,7 +74,9 @@ class AliITSCorrMapSDD : public TNamed {
     return -99999.;
   }
 
+  void    ComputeGridPoints(Float_t z, Float_t x, AliITSsegmentationSDD *seg, Bool_t isReco=kTRUE);
   Float_t GetCorrection(Float_t z, Float_t x, AliITSsegmentationSDD *seg);
+  Float_t GetShiftForSimulation(Float_t z, Float_t x, AliITSsegmentationSDD *seg);
   TH2F* GetMapHisto() const;
   TH1F* GetMapProfile() const;
   TH1F* GetResidualDistr(Float_t dmin=-300., Float_t dmax=300.) const;
@@ -86,6 +92,13 @@ class AliITSCorrMapSDD : public TNamed {
   Int_t fNAnodePts; // number of map points along anodes
   Int_t fNDriftPts; // number of map points along anodes
 
-  ClassDef(AliITSCorrMapSDD,1);
+  Float_t fXt1;   // true coordinate in lower grid point
+  Float_t fXt2;   // true coordinate in upper grid point
+  Float_t fXm1;   // measured coordinate in lower grid point
+  Float_t fXm2;   // measured coordinate in upper grid point
+  Float_t fDrLen; // drift length
+
+  ClassDef(AliITSCorrMapSDD,2);
 };
 #endif
+