add option "cc" to disable radial correction of clusters during

reconstruction.
This option was asked in order to check influence of vd calibration
algorithms on dEdx slices.

diff --git a/TRD/AliTRDReconstructor.cxx b/TRD/AliTRDReconstructor.cxx
index 1150ed46cb7bc6a052cbeab395b8a4a49563d7a0..8b4ffee41eae3f83ec9751e1f5383898cf697efa 100644 (file)
--- a/TRD/AliTRDReconstructor.cxx
+++ b/TRD/AliTRDReconstructor.cxx
@@ -47,9 +47,10 @@ Char_t const * AliTRDReconstructor::fgSteerNames[kNsteer] = {
  ,"Write Clusters         "
  ,"Write Online Tracklets "
  ,"Stand Alone Tracking   "
  ,"Write Clusters         "
  ,"Write Online Tracklets "
  ,"Stand Alone Tracking   "

- ,"HLT Mode               "
- ,"Process Online Tracklets"
- ,"Debug Streaming        "
+ ,"HLT Mode              "
+ ,"Process Online Trklts  "
+ ,"Debug Streaming       "
+ ,"Cl. Radial Correction  "

 };
 Char_t const * AliTRDReconstructor::fgSteerFlags[kNsteer] = {
   "dc"// digits conversion [false]
 };
 Char_t const * AliTRDReconstructor::fgSteerFlags[kNsteer] = {
   "dc"// digits conversion [false]


@@ -59,6 +60,7 @@ Char_t const * AliTRDReconstructor::fgSteerFlags[kNsteer] = {
  ,"hlt"// HLT reconstruction [false]
  ,"tp"// also use online tracklets for reconstruction [false]
  ,"deb"// Write debug stream [false]
  ,"hlt"// HLT reconstruction [false]
  ,"tp"// also use online tracklets for reconstruction [false]
  ,"deb"// Write debug stream [false]

+ ,"cc" // Cluster radial correction during reconstruction [true]

 };
 Char_t const * AliTRDReconstructor::fgTaskNames[AliTRDrecoParam::kTRDreconstructionTasks] = {
   "Clusterizer"
 };
 Char_t const * AliTRDReconstructor::fgTaskNames[AliTRDrecoParam::kTRDreconstructionTasks] = {
   "Clusterizer"


@@ -85,7 +87,8 @@ AliTRDReconstructor::AliTRDReconstructor()
   SETFLG(fSteerParam, kWriteClusters);
   // track seeding (stand alone tracking) [sa]
   SETFLG(fSteerParam, kSeeding);
   SETFLG(fSteerParam, kWriteClusters);
   // track seeding (stand alone tracking) [sa]
   SETFLG(fSteerParam, kSeeding);

-
+  // Cluster radial correction during reconstruction [cc]
+  SETFLG(fSteerParam, kClRadialCorr);

   memset(fDebugStream, 0, sizeof(TTreeSRedirector *) * AliTRDrecoParam::kTRDreconstructionTasks);
 }
 
   memset(fDebugStream, 0, sizeof(TTreeSRedirector *) * AliTRDrecoParam::kTRDreconstructionTasks);
 }
 

diff --git a/TRD/AliTRDReconstructor.h b/TRD/AliTRDReconstructor.h
index 2d78a37ed2d298335e10ae8b1580e9630a6a0c48..0d960d2652bff8ab92d3c5cb7245b8d7ad150279 100644 (file)
--- a/TRD/AliTRDReconstructor.h
+++ b/TRD/AliTRDReconstructor.h
@@ -33,8 +33,9 @@ public:
     ,kHLT            = BIT(4)
     ,kProcTracklets  = BIT(5) // process online tracklets
     ,kDebug          = BIT(6)
     ,kHLT            = BIT(4)
     ,kProcTracklets  = BIT(5) // process online tracklets
     ,kDebug          = BIT(6)

-    ,kOwner          = BIT(7)
-    ,kNsteer         = 7       // number of tasks
+    ,kClRadialCorr   = BIT(7) // toggle radial correction in clusters
+    ,kOwner          = BIT(8)
+    ,kNsteer         = 8      // number of tasks

   };
   AliTRDReconstructor();
   virtual ~AliTRDReconstructor();
   };
   AliTRDReconstructor();
   virtual ~AliTRDReconstructor();


@@ -43,7 +44,7 @@ public:
 
   virtual void        ConvertDigits(AliRawReader *rawReader, TTree *digitsTree) const;
   virtual AliTracker* CreateTracker() const;
 
   virtual void        ConvertDigits(AliRawReader *rawReader, TTree *digitsTree) const;
   virtual AliTracker* CreateTracker() const;

-  TTreeSRedirector*   GetDebugStream(AliTRDrecoParam::ETRDReconstructionTask task) const { return task < AliTRDrecoParam::kTRDreconstructionTasks ? fDebugStream[task] : 0x0; }
+  TTreeSRedirector*   GetDebugStream(AliTRDrecoParam::ETRDReconstructionTask task) const { return task < AliTRDrecoParam::kTRDreconstructionTasks ? fDebugStream[task] : NULL; }

 
   virtual void        FillESD(AliRawReader *, TTree *clusterTree, AliESDEvent *esd) const { FillESD((TTree * )NULL, clusterTree, esd);                    }
   virtual void        FillESD(TTree *digitsTree, TTree *clusterTree, AliESDEvent *esd) const;
 
   virtual void        FillESD(AliRawReader *, TTree *clusterTree, AliESDEvent *esd) const { FillESD((TTree * )NULL, clusterTree, esd);                    }
   virtual void        FillESD(TTree *digitsTree, TTree *clusterTree, AliESDEvent *esd) const;


@@ -62,6 +63,7 @@ public:
   Bool_t              IsSeeding() const          { return fSteerParam&kSeeding;}
   Bool_t              IsProcessingTracklets() const { return fSteerParam&kProcTracklets;}
   Bool_t              IsDebugStreaming() const { return fSteerParam&kDebug;}
   Bool_t              IsSeeding() const          { return fSteerParam&kSeeding;}
   Bool_t              IsProcessingTracklets() const { return fSteerParam&kProcTracklets;}
   Bool_t              IsDebugStreaming() const { return fSteerParam&kDebug;}

+  Bool_t              UseClusterRadialCorrection() const { return fSteerParam&kClRadialCorr;}

 
   static void         Options(UInt_t steer=0);
   virtual void        Reconstruct(AliRawReader *rawReader, TTree *clusterTree) const;
 
   static void         Options(UInt_t steer=0);
   virtual void        Reconstruct(AliRawReader *rawReader, TTree *clusterTree) const;

diff --git a/TRD/AliTRDcluster.cxx b/TRD/AliTRDcluster.cxx
index 211f1549a7b5b93819ec989528484fd8b799434d..a7673a1491e44fa8bea9a0956deb6180002c4d6b 100644 (file)
--- a/TRD/AliTRDcluster.cxx
+++ b/TRD/AliTRDcluster.cxx
@@ -682,32 +682,10 @@ Float_t AliTRDcluster::GetXloc(Double_t t0, Double_t vd
   td -= 0.189;
 
   // apply fitted correction 
   td -= 0.189;
 
   // apply fitted correction 

-  Float_t x = td*vd + GetXcorr(fLocalTimeBin);
+  Float_t x = td*vd + HasXcorr() ? GetXcorr(fLocalTimeBin) : 0.;

   if(x>0.&&x<.5*AliTRDgeometry::CamHght()+AliTRDgeometry::CdrHght()) SetInChamber();
 
   return x;
   if(x>0.&&x<.5*AliTRDgeometry::CamHght()+AliTRDgeometry::CdrHght()) SetInChamber();
 
   return x;

-
-/*
-  // calculate radial posion of clusters in the drift region
-
-  // invert drift time function
-  Double_t xM= AliTRDgeometry::CamHght()+AliTRDgeometry::CdrHght(),
-           x = vd*td + .5*AliTRDgeometry::CamHght(), 
-           t = cp->TimeStruct(vd, x, z), dx1=0.,dx2;
-  while(TMath::Abs(td-t)>1.e-4){ // convergence on 100ps
-    dx2 = vd*(td-t);
-    if(TMath::Abs(TMath::Abs(dx2)-TMath::Abs(dx1))<1.e-6){
-      x+=.5*dx2;
-      break;
-    } else x+=dx2;
-
-    if(x<0. || x>xM) return 0.;
-    t = cp->TimeStruct(vd, x, z);
-    dx1 = dx2;
-  }
-
-  return x-.5*AliTRDgeometry::CamHght();
-*/

 }
 
 //_____________________________________________________________________________
 }
 
 //_____________________________________________________________________________

diff --git a/TRD/AliTRDcluster.h b/TRD/AliTRDcluster.h
index f2b7009033446df5777f4ba37405eadb54339560..6373fc462b9a478ba31db8b0534f05ae9b10c1cd 100644 (file)
--- a/TRD/AliTRDcluster.h
+++ b/TRD/AliTRDcluster.h
@@ -25,6 +25,7 @@ public:
    ,kLUT       = BIT(18)
    ,kGAUS      = BIT(19)
    ,kCOG       = BIT(20)
    ,kLUT       = BIT(18)
    ,kGAUS      = BIT(19)
    ,kCOG       = BIT(20)

+   ,kXcorr     = BIT(21)  // steer efficient vd corrections

   };
   enum ETRDclusterMask { 
     kMaskedLeft   = 0
   };
   enum ETRDclusterMask { 
     kMaskedLeft   = 0


@@ -53,6 +54,7 @@ public:
           Bool_t    IsUsed() const                  { return IsClusterUsed();      }
           Bool_t    IsFivePad() const               { return TestBit(kFivePad);    }
   inline  Bool_t    IsRPhiMethod(ETRDclusterStatus m) const;
           Bool_t    IsUsed() const                  { return IsClusterUsed();      }
           Bool_t    IsFivePad() const               { return TestBit(kFivePad);    }
   inline  Bool_t    IsRPhiMethod(ETRDclusterStatus m) const;

+          Bool_t    HasXcorr() const                { return TestBit(kXcorr);      }

 
           UChar_t   GetPadMaskedPosition() const    { return fClusterMasking & 7;  }
           UChar_t   GetPadMaskedStatus() const      { return fClusterMasking >> 3; }
 
           UChar_t   GetPadMaskedPosition() const    { return fClusterMasking & 7;  }
           UChar_t   GetPadMaskedStatus() const      { return fClusterMasking >> 3; }


@@ -96,6 +98,7 @@ public:
   void        SetPadMaskedStatus(UChar_t status);
   void        SetSigmaY2(Float_t s2, Float_t dt, Float_t exb, Float_t x0, Float_t z=-1., Float_t tgp=0.);
   inline void SetRPhiMethod(ETRDclusterStatus m);
   void        SetPadMaskedStatus(UChar_t status);
   void        SetSigmaY2(Float_t s2, Float_t dt, Float_t exb, Float_t x0, Float_t z=-1., Float_t tgp=0.);
   inline void SetRPhiMethod(ETRDclusterStatus m);

+  void        SetXcorr(Bool_t xc = kTRUE)                 { SetBit(kXcorr,xc);                  }

 
   void        Use(Int_t u = 1)                            { SetBit(AliCluster::kUsed, u ? kTRUE : kFALSE); }
 
 
   void        Use(Int_t u = 1)                            { SetBit(AliCluster::kUsed, u ? kTRUE : kFALSE); }
 

diff --git a/TRD/AliTRDclusterizer.cxx b/TRD/AliTRDclusterizer.cxx
index 6bcd40a5a9db2deb7bf4b5bef5d14f294d916352..2669c20e45f581e5b998f391a6c0d1518504e190 100644 (file)
--- a/TRD/AliTRDclusterizer.cxx
+++ b/TRD/AliTRDclusterizer.cxx
@@ -1017,6 +1017,7 @@ void AliTRDclusterizer::CreateCluster(const MaxStruct &Max)
     cluster.SetPadMaskedPosition(maskPosition);
     cluster.SetPadMaskedStatus(GetPadStatus(Max.padStatus));
   }
     cluster.SetPadMaskedPosition(maskPosition);
     cluster.SetPadMaskedStatus(GetPadStatus(Max.padStatus));
   }

+  cluster.SetXcorr(fReconstructor->UseClusterRadialCorrection());

 
   // Transform the local cluster coordinates into calibrated 
   // space point positions defined in the local tracking system.
 
   // Transform the local cluster coordinates into calibrated 
   // space point positions defined in the local tracking system.