Modifications to store in the OCDB the drift speed corrections (Delta Vdrift) from...

diff --git a/ITS/AliITSCalibrationSDD.h b/ITS/AliITSCalibrationSDD.h
index 17cdc49cfa78e0cfd3e8a5e9d0760d81fcbb9598..61facfbc53f6d00e934f13ef1fc40fd0cf3a2742 100644 (file)
--- a/ITS/AliITSCalibrationSDD.h
+++ b/ITS/AliITSCalibrationSDD.h
@@ -147,7 +147,6 @@ class AliITSCalibrationSDD : public AliITSCalibration {
     virtual void SetAMAt20MHz() {fAMAt20MHz=kTRUE;}
     virtual Bool_t IsAMAt20MHz() const {return fAMAt20MHz;}
 
-    virtual Float_t GetDriftPath(Float_t time, Float_t xAnode) const {return time*GetDriftSpeedAtAnode(xAnode);}
     void GetCorrections(Float_t z, Float_t x, Float_t &devz, Float_t &devx, AliITSsegmentationSDD* seg);
     virtual Float_t GetThresholdAnode(Int_t anode,Int_t nsigma=3) const {
       return nsigma*fNoiseAfterEl[anode];}

diff --git a/ITS/AliITSClusterFinderV2SDD.cxx b/ITS/AliITSClusterFinderV2SDD.cxx
index 9e6fbf93032dcb357bce1980171638c2d561e0e6..4e05236a4ce7db39441bef8e57de4e2871514411 100644 (file)
--- a/ITS/AliITSClusterFinderV2SDD.cxx
+++ b/ITS/AliITSClusterFinderV2SDD.cxx
@@ -232,7 +232,8 @@ FindClustersSDD(AliBin* bins[2], Int_t nMaxBin, Int_t nzBins,
        Float_t zdet = GetSeg()->GetLocalZFromAnode(zAnode);
        Float_t driftTimeUncorr = GetSeg()->GetDriftTimeFromTb(timebin)+jitter*rsdd->GetCarlosRXClockPeriod();
        Float_t driftTime=driftTimeUncorr-rsdd->GetTimeZero(fModule);
-       Float_t driftPathMicron = cal->GetDriftPath(driftTime,zAnode);
+       Float_t driftSpeed = cal->GetDriftSpeedAtAnode(zAnode) + rsdd->GetDeltaVDrift(fModule);
+       Float_t driftPathMicron = driftTime*driftSpeed;
        const Double_t kMicronTocm = 1.0e-4; 
        Float_t xdet=(driftPathMicron-GetSeg()->Dx())*kMicronTocm; // xdet is negative
        if (s==0) xdet=-xdet; // left side has positive local x

diff --git a/ITS/AliITSresponseSDD.cxx b/ITS/AliITSresponseSDD.cxx
index bf0b41c6f8ae050b0ce3bd7e50b5205edca03055..118dd5dc981af904507e42f2714bdde517e8a023 100644 (file)
--- a/ITS/AliITSresponseSDD.cxx
+++ b/ITS/AliITSresponseSDD.cxx
@@ -42,6 +42,7 @@ fADC2keV(fgkADC2keVDefault){
   // default constructor
   for(Int_t i=0; i<kNSDDmods;i++){
     fTimeZero[i]=fgkTimeOffsetDefault;
+    fDeltaVDrift[i]=0.;
   }  
 }
 //_________________________________________________________________________

diff --git a/ITS/AliITSresponseSDD.h b/ITS/AliITSresponseSDD.h
index 71b7b73558e092a348096cac246ad81d8b4cfb8c..b9d2f4e3349da051f77d21401cff15d19ec5e9de 100644 (file)
--- a/ITS/AliITSresponseSDD.h
+++ b/ITS/AliITSresponseSDD.h
@@ -17,79 +17,92 @@
 ///////////////////////////////////////////////////////////// 
 
 class AliITSresponseSDD : public TObject {
-  public:
-
-    AliITSresponseSDD();
-    virtual ~AliITSresponseSDD(){};
-
-    virtual void SetSideATimeZero(Float_t tzero){
-      SetLayer3ATimeZero(tzero);
-      SetLayer4ATimeZero(tzero);
-    }
-    virtual void SetSideCTimeZero(Float_t tzero){
-      SetLayer3CTimeZero(tzero);
-      SetLayer4CTimeZero(tzero);
-    }
-    virtual void SetLayer3ATimeZero(Float_t tzero){
-      for(Int_t iLad=1; iLad<=kNLaddersLay3; iLad++) SetHalfLadderATimeZero(3,iLad,tzero);      
-    }
-    virtual void SetLayer3CTimeZero(Float_t tzero){
-      for(Int_t iLad=1; iLad<=kNLaddersLay3; iLad++) SetHalfLadderCTimeZero(3,iLad,tzero);
+ public:
+
+  AliITSresponseSDD();
+  virtual ~AliITSresponseSDD(){};
+
+  virtual void SetSideATimeZero(Float_t tzero){
+    SetLayer3ATimeZero(tzero);
+    SetLayer4ATimeZero(tzero);
+  }
+  virtual void SetSideCTimeZero(Float_t tzero){
+    SetLayer3CTimeZero(tzero);
+    SetLayer4CTimeZero(tzero);
+  }
+  virtual void SetLayer3ATimeZero(Float_t tzero){
+    for(Int_t iLad=1; iLad<=kNLaddersLay3; iLad++) SetHalfLadderATimeZero(3,iLad,tzero);      
+  }
+  virtual void SetLayer3CTimeZero(Float_t tzero){
+    for(Int_t iLad=1; iLad<=kNLaddersLay3; iLad++) SetHalfLadderCTimeZero(3,iLad,tzero);
+  }
+  virtual void SetLayer4ATimeZero(Float_t tzero){
+    for(Int_t iLad=1; iLad<=kNLaddersLay4; iLad++) SetHalfLadderATimeZero(4,iLad,tzero);      
+  }
+  virtual void SetLayer4CTimeZero(Float_t tzero){
+    for(Int_t iLad=1; iLad<=kNLaddersLay4; iLad++) SetHalfLadderCTimeZero(4,iLad,tzero);
+  }
+  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));
+    fTimeZero[modIndex-kNSPDmods]=tzero;
+  }
+
+  virtual void SetDeltaVDrift(Int_t modIndex, Float_t dv){
+    if(modIndex<kNSPDmods || modIndex>kNSPDmods+kNSDDmods) AliError(Form("SDD module number %d out of range",modIndex));
+    fDeltaVDrift[modIndex-kNSPDmods]=dv;
+  }
+
+  virtual void SetTimeOffset(Float_t to){fTimeOffset = to;}
+  virtual Float_t GetTimeOffset()const {return fTimeOffset;}
+  virtual Float_t GetTimeZero(Int_t modIndex){
+    if(modIndex<kNSPDmods || modIndex>kNSPDmods+kNSDDmods){
+      AliError(Form("SDD module number %d out of range",modIndex));
+      return 0.;
     }
-    virtual void SetLayer4ATimeZero(Float_t tzero){
-      for(Int_t iLad=1; iLad<=kNLaddersLay4; iLad++) SetHalfLadderATimeZero(4,iLad,tzero);      
-    }
-    virtual void SetLayer4CTimeZero(Float_t tzero){
-      for(Int_t iLad=1; iLad<=kNLaddersLay4; iLad++) SetHalfLadderCTimeZero(4,iLad,tzero);
-    }
-    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));
-      fTimeZero[modIndex-kNSPDmods]=tzero;
-    }
-
-    virtual void SetTimeOffset(Float_t to){fTimeOffset = to;}
-    virtual Float_t GetTimeOffset()const {return fTimeOffset;}
-    virtual Float_t GetTimeZero(Int_t modIndex){
-      if(modIndex<kNSPDmods || modIndex>kNSPDmods+kNSDDmods){
-       AliError(Form("SDD module number %d out of range",modIndex));
-       return 0.;
-      }
-      return fTimeZero[modIndex-kNSPDmods];
+    return fTimeZero[modIndex-kNSPDmods];
+  }
+  virtual Float_t GetDeltaVDrift(Int_t modIndex){
+    if(modIndex<kNSPDmods || modIndex>kNSPDmods+kNSDDmods){
+      AliError(Form("SDD module number %d out of range",modIndex));
+      return 0.;
     }
-    static Float_t DefaultTimeOffset() {return fgkTimeOffsetDefault;}
+    return fDeltaVDrift[modIndex-kNSPDmods];
+  }
+  static Float_t DefaultTimeOffset() {return fgkTimeOffsetDefault;}
 
-    virtual void SetADC2keV(Float_t conv){fADC2keV=conv;}
-    virtual Float_t GetADC2keV()const {return fADC2keV;}
-    static Float_t DefaulttADC2keV() {return fgkADC2keVDefault;}
+  virtual void SetADC2keV(Float_t conv){fADC2keV=conv;}
+  virtual Float_t GetADC2keV()const {return fADC2keV;}
+  static Float_t DefaulttADC2keV() {return fgkADC2keVDefault;}
 
-    static Float_t GetCarlosRXClockPeriod() {return fgkCarlosRXClockPeriod;}
+  static Float_t GetCarlosRXClockPeriod() {return fgkCarlosRXClockPeriod;}
  
 
  protected:
 
-    enum {kNSPDmods = 240};
-    enum {kNSDDmods = 260};
-    enum {kNLaddersLay3 = 14};
-    enum {kNLaddersLay4 = 22};
+  enum {kNSPDmods = 240};
+  enum {kNSDDmods = 260};
+  enum {kNLaddersLay3 = 14};
+  enum {kNLaddersLay4 = 22};
 
 
-    static const Float_t fgkTimeOffsetDefault; // default for fTimeOffset
-    static const Float_t fgkADC2keVDefault; // default for fADC2keV
-    static const Float_t fgkCarlosRXClockPeriod;  // clock period for CarlosRX
+  static const Float_t fgkTimeOffsetDefault;   // default for fTimeOffset
+  static const Float_t fgkADC2keVDefault;      // default for fADC2keV
+  static const Float_t fgkCarlosRXClockPeriod; // clock period for CarlosRX
 
-    Float_t  fTimeOffset;          // Time offset due to electronic delays 
-                                   // --> obsolete, kept for backw. comp. 
-    Float_t  fTimeZero[kNSDDmods]; // Time Zero for each module
-    Float_t  fADC2keV;             // Conversion factor from ADC to keV
+  Float_t  fTimeOffset;             // Time offset due to electronic delays 
+                                    // --> obsolete, kept for backw. comp. 
+  Float_t  fTimeZero[kNSDDmods];    // Time Zero for each module
+  Float_t  fDeltaVDrift[kNSDDmods]; // Vdrift correction (um/ns) for each module
+  Float_t  fADC2keV;                // Conversion factor from ADC to keV
 
  private:
 
-   AliITSresponseSDD(const AliITSresponseSDD &ob); // copy constructor
-   AliITSresponseSDD& operator=(const AliITSresponseSDD & /* source */); // ass. op.
+  AliITSresponseSDD(const AliITSresponseSDD &ob); // copy constructor
+  AliITSresponseSDD& operator=(const AliITSresponseSDD & /* source */); // ass. op.
 
-    ClassDef(AliITSresponseSDD,16) 
-    
+  ClassDef(AliITSresponseSDD,17) 
+     
     };
 #endif

diff --git a/ITS/StoreRespSDD.C b/ITS/StoreRespSDD.C
index b2b782fa3d5244faa02579651610bf8d2c5ab9e6..118f6dc8f0930e586b7758fbfc7355d981dc0857 100644 (file)
--- a/ITS/StoreRespSDD.C
+++ b/ITS/StoreRespSDD.C
@@ -35,5 +35,7 @@ void StoreRespSDD(Int_t firstRun=0, Int_t lastRun=999999999 ){
 //   rd->SetLayer3CTimeZero(287);
 //   rd->SetLayer4ATimeZero(202);
 //   rd->SetLayer4CTimeZero(230);
+  for(Int_t iMod=240; iMod<500; iMod++) rd->SetDeltaVDrift(iMod,0.);
+
   AliCDBManager::Instance()->GetDefaultStorage()->Put(rd, idRespSDD, md);  
 }