Added another recoParam to the TOF recoParam object, i.e. time window to discriminate...

diff --git a/OCDB/TOF/Calib/RecoParam/Run0_999999999_v0_s0.root b/OCDB/TOF/Calib/RecoParam/Run0_999999999_v0_s0.root
index 066b18d4ec7aac573c117b61fbc5a7a16a3858f1..58e22fc4bcf9ee3fe9c908662d9f8ebfdbcb8f08 100644 (file)
Binary files a/OCDB/TOF/Calib/RecoParam/Run0_999999999_v0_s0.root and b/OCDB/TOF/Calib/RecoParam/Run0_999999999_v0_s0.root differ

diff --git a/TOF/AliTOFClusterFinderV1.cxx b/TOF/AliTOFClusterFinderV1.cxx
index a0792a60269e188ba30f610733a4446d0cc630c2..d285f5bffb55753be4d1c69b76250b731979b6e2 100644 (file)
--- a/TOF/AliTOFClusterFinderV1.cxx
+++ b/TOF/AliTOFClusterFinderV1.cxx
@@ -56,6 +56,8 @@ Revision 0.01  2008/05/10 A. De Caro
 #include "AliTOFdigit.h"
 #include "AliTOFDigitMap.h"
 #include "AliTOFrawData.h"
+#include "AliTOFReconstructor.h"
+#include "AliTOFRecoParam.h"
 
 ClassImp(AliTOFClusterFinderV1)
 
@@ -66,7 +68,7 @@ AliTOFClusterFinderV1::AliTOFClusterFinderV1(AliTOFcalib *calib):
   fRecPoints(new TClonesArray("AliTOFcluster", 4000)),
   fNumberOfTofClusters(0),
   fNumberOfTofDigits(0),
-  fMaxDeltaTime(2),
+  fMaxDeltaTime(0),
   fVerbose(0),
   fDecoderVersion(0),
   fTOFcalib(calib),
@@ -78,7 +80,8 @@ AliTOFClusterFinderV1::AliTOFClusterFinderV1(AliTOFcalib *calib):
 //
 // Constructor
 //
-
+  const AliTOFRecoParam *recoParam = AliTOFReconstructor::GetRecoParam();  // instantiate reco param from STEER...
+  fMaxDeltaTime = recoParam->GetMaxDeltaTime();
 }
 
 //_____________________________________________________________________________
@@ -88,7 +91,7 @@ AliTOFClusterFinderV1::AliTOFClusterFinderV1(AliRunLoader* runLoader, AliTOFcali
   fRecPoints(new TClonesArray("AliTOFcluster", 4000)),
   fNumberOfTofClusters(0),
   fNumberOfTofDigits(0),
-  fMaxDeltaTime(2),
+  fMaxDeltaTime(0),
   fVerbose(0),
   fDecoderVersion(0),
   fTOFcalib(calib),
@@ -100,6 +103,8 @@ AliTOFClusterFinderV1::AliTOFClusterFinderV1(AliRunLoader* runLoader, AliTOFcali
 //
 // Constructor
 //
+  const AliTOFRecoParam *recoParam = AliTOFReconstructor::GetRecoParam();  // instantiate reco param from STEER...
+  fMaxDeltaTime = recoParam->GetMaxDeltaTime();
 
 }
 //_____________________________________________________________________________
@@ -278,7 +283,7 @@ void AliTOFClusterFinderV1::Digits2RecPoints(TTree* digitsTree, TTree* clusterTr
   FillRecPoint();
   clusterTree->Fill();
 
-  AliInfo(Form("Number of found TOF clusters: %d", fNumberOfTofClusters));
+  AliInfo(Form("Number of found clusters: %d", fNumberOfTofClusters));
 
   ResetRecpoint();
 

diff --git a/TOF/AliTOFRecoParam.cxx b/TOF/AliTOFRecoParam.cxx
index caead71874558183826e38c147a04004cc55bfd2..93d0eaee1359b533bab1d8cc56c8135c81eb4c54 100644 (file)
--- a/TOF/AliTOFRecoParam.cxx
+++ b/TOF/AliTOFRecoParam.cxx
@@ -45,7 +45,8 @@ AliTOFRecoParam::AliTOFRecoParam():
   fMaxChi2(10.),
   fMaxChi2TRD(150.),
   fTimeResolution(80.),
-  fTimeNSigma(5.)
+  fTimeNSigma(5.),
+  fMaxDeltaTime(2)
 {
   //
   // constructor
@@ -69,7 +70,8 @@ AliTOFRecoParam::AliTOFRecoParam(const AliTOFRecoParam &p):
   fMaxChi2(p.fMaxChi2),
   fMaxChi2TRD(p.fMaxChi2TRD),
   fTimeResolution(p.fTimeResolution),
-  fTimeNSigma(p.fTimeNSigma)
+  fTimeNSigma(p.fTimeNSigma),
+  fMaxDeltaTime(p.fMaxDeltaTime)
  { 
   //copy Ctor
 
@@ -87,21 +89,22 @@ AliTOFRecoParam& AliTOFRecoParam::operator=(const AliTOFRecoParam &p)
   
   AliDetectorRecoParam::operator=(p);
   fTimeZero=p.fTimeZero;       
-   fTimeZerofromT0=p.fTimeZerofromT0;
-   fTimeZerofromTOF=p.fTimeZerofromTOF;       
-   fTimeWalkCorr=p.fTimeWalkCorr;       
-   fApplyPbPbCuts=p.fApplyPbPbCuts;       
-   fWindowSizeMaxY=p.fWindowSizeMaxY;
-   fWindowSizeMaxZ=p.fWindowSizeMaxZ;
-   fDistanceCut=p.fDistanceCut;
-   fWindowScaleFact=p.fWindowScaleFact;
-   fStepSize=p.fStepSize;
-   fSensRadius=p.fSensRadius;
-   fMaxChi2=p.fMaxChi2;
-   fMaxChi2TRD=p.fMaxChi2TRD;
-   fTimeResolution=p.fTimeResolution;
-   fTimeNSigma=p.fTimeNSigma;   
-   return *this;
+  fTimeZerofromT0=p.fTimeZerofromT0;
+  fTimeZerofromTOF=p.fTimeZerofromTOF;       
+  fTimeWalkCorr=p.fTimeWalkCorr;       
+  fApplyPbPbCuts=p.fApplyPbPbCuts;       
+  fWindowSizeMaxY=p.fWindowSizeMaxY;
+  fWindowSizeMaxZ=p.fWindowSizeMaxZ;
+  fDistanceCut=p.fDistanceCut;
+  fWindowScaleFact=p.fWindowScaleFact;
+  fStepSize=p.fStepSize;
+  fSensRadius=p.fSensRadius;
+  fMaxChi2=p.fMaxChi2;
+  fMaxChi2TRD=p.fMaxChi2TRD;
+  fTimeResolution=p.fTimeResolution;
+  fTimeNSigma=p.fTimeNSigma;   
+  fMaxDeltaTime=p.fMaxDeltaTime;
+  return *this;
 }
 //_____________________________________________________________________________
 AliTOFRecoParam::~AliTOFRecoParam() 
@@ -120,6 +123,7 @@ AliTOFRecoParam *AliTOFRecoParam::GetPbPbparam(){
   param->fApplyPbPbCuts = kTRUE;
   param->fWindowScaleFact = 5.;
   param->fDistanceCut = 3.;
+  param->fMaxDeltaTime = 2;
   return param;
 }
 
@@ -132,18 +136,7 @@ AliTOFRecoParam *AliTOFRecoParam::GetPPparam(){
   param->fApplyPbPbCuts = kFALSE;
   param->fWindowScaleFact = 5.;
   param->fDistanceCut = 10.;
-  return param;
-}
-
-//_____________________________________________________________________________
-AliTOFRecoParam *AliTOFRecoParam::GetCosmicMuonParam(){
-  //
-  // set default reconstruction parameters for cosmic muon run
-  //
-  AliTOFRecoParam *param = new AliTOFRecoParam();
-  param->fApplyPbPbCuts = kFALSE;
-  param->fWindowScaleFact = 5.;
-  param->fDistanceCut = 10.;
+  param->fMaxDeltaTime = 2;
   return param;
 }
 
@@ -174,7 +167,12 @@ void AliTOFRecoParam::PrintParameters() const
   AliInfo(Form(" Maximum X2 track-tof clusters (TRD): %f", fMaxChi2TRD));
   AliInfo(Form(" Time resolution for responce function in PID: %f ps",
               fTimeResolution));
-  AliInfo(Form("  N-Sigma Range used for responce function in PID: %f",
+  AliInfo(Form(" N-Sigma Range used for responce function in PID: %f",
               fTimeNSigma));
+  AliInfo(Form(" Max time difference between two (or more) time measurements"
+              " coming from two (or more) neighbouring pads"
+              " to define if they are coming from the same ionization event"
+              " or not: %2d bins -> %f ps",
+              fMaxDeltaTime, fMaxDeltaTime*AliTOFGeometry::TdcBinWidth()))
 
 }

diff --git a/TOF/AliTOFRecoParam.h b/TOF/AliTOFRecoParam.h
index 55ce14550df746abacc05bcd80d5c8fd593232cb..08e275323300d71c1cca93aa7d260330a686ffdc 100644 (file)
--- a/TOF/AliTOFRecoParam.h
+++ b/TOF/AliTOFRecoParam.h
@@ -12,6 +12,8 @@
 
 #include "AliDetectorRecoParam.h"
 
+#include "AliTOFGeometry.h"
+
 class AliTOFRecoParam : public AliDetectorRecoParam
 {
  public: 
@@ -36,9 +38,10 @@ class AliTOFRecoParam : public AliDetectorRecoParam
   Float_t  GetSensRadius()         const  { return fSensRadius;}
   Float_t  GetStepSize()           const  { return fStepSize;}
   Double_t  GetMaxChi2()           const  { return fMaxChi2;}
-  Double_t  GetMaxChi2TRD()           const  { return fMaxChi2TRD;}
+  Double_t  GetMaxChi2TRD()        const  { return fMaxChi2TRD;}
   Double_t  GetTimeResolution()    const  { return fTimeResolution;}
   Double_t  GetTimeNSigma()        const  { return fTimeNSigma;}
+  Int_t     GetMaxDeltaTime()      const  { return fMaxDeltaTime;}
 
   //Setters
 
@@ -58,10 +61,11 @@ class AliTOFRecoParam : public AliDetectorRecoParam
   void  SetMaxChi2TRD(Double_t in)  {fMaxChi2TRD=in;}
   void  SetTimeResolution(Double_t in)  {fTimeResolution=in;}
   void  SetTimeNSigma(Double_t in)  {fTimeNSigma=in;}
+  void  SetMaxDeltaTime(Int_t a)   {fMaxDeltaTime = a;}; // to set deltaTime [bin number]
+  void  SetMaxDeltaTime(Float_t a) {fMaxDeltaTime = (Int_t)(a/AliTOFGeometry::TdcBinWidth());}; // to set deltaTime [ps]
 
   static   AliTOFRecoParam *GetPbPbparam();       // reco param for PbPb.
   static   AliTOFRecoParam *GetPPparam();         // reco param for PP
-  static   AliTOFRecoParam *GetCosmicMuonParam(); // reco param for cosmic muons
  private:
 
   Bool_t fTimeZero; //use Time Zero info in Pid
@@ -80,8 +84,11 @@ class AliTOFRecoParam : public AliDetectorRecoParam
   Double_t fMaxChi2TRD;  // maximum X2 track-tof clusters (TRD)
   Double_t fTimeResolution;  // Time resolution for resp. function in PID (ps)
   Double_t fTimeNSigma;  // N-Sigma Range used for resp. function in PID 
+  Int_t    fMaxDeltaTime; // max time difference in between two tof
+                          // measurements for two neighbouring pads
+                          // [number of bins]
 
-  ClassDef(AliTOFRecoParam, 3)
+  ClassDef(AliTOFRecoParam, 4)
 };
 
 #endif