Added GetCosmicMuonParam method to AliTOFRecoParam class and some minor changes

diff --git a/TOF/AliTOFClusterFinderV1.cxx b/TOF/AliTOFClusterFinderV1.cxx
index 227aa2a8595012533c4741cced3bad17d9303c77..1606479ddb3bda80e8d32e7e8112ff2ac453b283 100644 (file)
--- a/TOF/AliTOFClusterFinderV1.cxx
+++ b/TOF/AliTOFClusterFinderV1.cxx
@@ -233,7 +233,7 @@ void AliTOFClusterFinderV1::Digits2RecPoints(TTree* digitsTree, TTree* clusterTr
     info[0] = tdcCorr;//tofDigit->GetTdc();
     info[1] = tofDigit->GetAdc();
     info[2] = tofDigit->GetToT();
-    info[3] = tofDigit->GetTdc();//tofDigit->GetTdcND();
+    info[3] = tofDigit->GetTdcND();//tofDigit->GetTdc();//
     tracks  = tofDigit->GetTracks();
 
     dummy = detectorIndex[3];
@@ -3402,10 +3402,6 @@ void AliTOFClusterFinderV1::AverageCalculations(Int_t number, Float_t *interesti
   //
   //
 
-  Double_t posX = 0.;
-  Double_t posY = 0.;
-  Double_t posZ = 0.;
- 
   Double_t tofAverage = 0.;
   Double_t totAverage = 0.;
   Double_t adcAverage = 0.;
@@ -3441,9 +3437,4 @@ void AliTOFClusterFinderV1::AverageCalculations(Int_t number, Float_t *interesti
   parTOF[3] = Int_t(tofAverage);
   parTOF[4] = Int_t(tofAverage);
 
-  //insert cluster
-  posClus[0] = posX;
-  posClus[1] = posY;
-  posClus[2] = posZ;
-
 }

diff --git a/TOF/AliTOFRecoParam.cxx b/TOF/AliTOFRecoParam.cxx
index c9c496099f84fc13f104a4588577fdc4abbfa3d9..0e6ad8e48c07e3ad61fc50e51f98b683435eaaac 100644 (file)
--- a/TOF/AliTOFRecoParam.cxx
+++ b/TOF/AliTOFRecoParam.cxx
@@ -17,11 +17,13 @@
 ///////////////////////////////////////////////////////////////////////////////
 //                                                                           //
 // Class with TOF reconstruction parameters                                  //
-//                                                                           //  
+//                                                                           //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
 
+#include "AliLog.h"
+
 #include "AliTOFRecoParam.h"
 
 ClassImp(AliTOFRecoParam)
@@ -144,3 +146,47 @@ AliTOFRecoParam *AliTOFRecoParam::GetPPparam(){
   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.;
+  return param;
+}
+
+//_____________________________________________________________________________
+void AliTOFRecoParam::PrintParameters() const
+{
+  //
+  // Printing of the used TOF reconstruction parameters
+  //
+
+  AliInfo(Form(" Use Time Zero info in Pid: %i", fTimeZero));
+  AliInfo(Form(" Use Time Zero as determined by T0: %i", fTimeZerofromT0));
+  AliInfo(Form(" Use Time Zero as determined from TOF: %i",
+              fTimeZerofromTOF));
+  AliInfo(Form(" Correct for signal time walk in z: %i", fTimeWalkCorr));
+  AliInfo(Form(" Apply high flux cuts: %i", fApplyPbPbCuts));
+
+  AliInfo(Form(" Cluster search window - size, Y: %f cm", fWindowSizeMaxY));
+  AliInfo(Form(" Cluster search window - size, Z: %f cm", fWindowSizeMaxZ));
+  AliInfo(Form(" Cluster search window - scale factor: %f",
+              fWindowScaleFact));
+
+  AliInfo(Form(" Cut on the closest approach distance: %f", fDistanceCut));
+  AliInfo(Form(" Average radius of sensitive volumes: %f cm", fSensRadius));
+  AliInfo(Form(" Propagation step size: %f cm", fStepSize));
+  AliInfo(Form(" Maximum X2 track-tof clusters: %f", fMaxChi2));
+
+  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",
+              fTimeNSigma));
+
+}

diff --git a/TOF/AliTOFRecoParam.h b/TOF/AliTOFRecoParam.h
index 8c1a150fbab57f249dd0715e9d6432fbc1f43d98..55ce14550df746abacc05bcd80d5c8fd593232cb 100644 (file)
--- a/TOF/AliTOFRecoParam.h
+++ b/TOF/AliTOFRecoParam.h
@@ -19,6 +19,9 @@ class AliTOFRecoParam : public AliDetectorRecoParam
   AliTOFRecoParam(const AliTOFRecoParam &p); //Copy Ctor 
   AliTOFRecoParam& operator=(const AliTOFRecoParam &p); // ass. op.
   virtual ~AliTOFRecoParam();
+
+  virtual void PrintParameters() const;
+
   //Getters
   Bool_t   UseTimeZero()           const  { return fTimeZero;}
   Bool_t   GetTimeZerofromT0()     const  { return fTimeZerofromT0;}
@@ -56,8 +59,9 @@ class AliTOFRecoParam : public AliDetectorRecoParam
   void  SetTimeResolution(Double_t in)  {fTimeResolution=in;}
   void  SetTimeNSigma(Double_t in)  {fTimeNSigma=in;}
 
-  static   AliTOFRecoParam *GetPbPbparam();      // reco param for PbPb.
-  static   AliTOFRecoParam *GetPPparam();       // reco param for PP
+  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
@@ -73,11 +77,11 @@ class AliTOFRecoParam : public AliDetectorRecoParam
   Float_t fSensRadius;  // Average radius of sensitive volumes (cm)
   Float_t fStepSize;  // Propagation step size (cm)
   Double_t fMaxChi2;  // maximum X2 track-tof clusters
-  Double_t fMaxChi2TRD;  // maximum X2 track-tof clusters
+  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 
 
-  ClassDef(AliTOFRecoParam, 2)
+  ClassDef(AliTOFRecoParam, 3)
 };
 
 #endif

diff --git a/TOF/AliTOFtracker.cxx b/TOF/AliTOFtracker.cxx
index ade63ec5a089d497167267bb25382104e1725935..cf4023cb642b6270df07a3b82dc1e4a70424e5e7 100644 (file)
--- a/TOF/AliTOFtracker.cxx
+++ b/TOF/AliTOFtracker.cxx
@@ -212,11 +212,14 @@ Int_t AliTOFtracker::PropagateBack(AliESDEvent* event) {
   AliInfo("Initializing params for TOF... ");
 
   fRecoParam = AliTOFReconstructor::GetRecoParam();  // instantiate reco param from STEER...
+
   if (fRecoParam == 0x0) { 
     AliFatal("No Reco Param found for TOF!!!");
   }
   //fRecoParam->Dump();
   if(fRecoParam->GetApplyPbPbCuts())fRecoParam=fRecoParam->GetPbPbparam();
+  //fRecoParam->PrintParameters();
+
   Double_t parPID[2];   
   parPID[0]=fRecoParam->GetTimeResolution();
   parPID[1]=fRecoParam->GetTimeNSigma();
@@ -567,7 +570,7 @@ void AliTOFtracker::MatchTracks( Bool_t mLastStep){
 
     // now choose the cluster to be matched with the track.
 
-    Int_t idclus=0;
+    Int_t idclus=-1;
     Float_t  recL = 0.;
     Float_t  xpos=0.;
     Float_t  mindist=1000.;

diff --git a/TOF/AliTOFtrackerMI.cxx b/TOF/AliTOFtrackerMI.cxx
index fdbb62a2ee6da063ad789ba79dbbfe15d6fc2121..70350765838f6f59552913e26d22a21b0cceb8f3 100644 (file)
--- a/TOF/AliTOFtrackerMI.cxx
+++ b/TOF/AliTOFtrackerMI.cxx
@@ -179,11 +179,14 @@ Int_t AliTOFtrackerMI::PropagateBack(AliESDEvent* event) {
   AliInfo("Initializing params for TOF... ");
 
   fRecoParam = AliTOFReconstructor::GetRecoParam();  // instantiate reco param from STEER...
+
   if (fRecoParam == 0x0) { 
     AliFatal("No Reco Param found for TOF!!!");
   }
   //fRecoParam->Dump();
   if(fRecoParam->GetApplyPbPbCuts())fRecoParam=fRecoParam->GetPbPbparam();
+  //fRecoParam->PrintParameters();
+
   Double_t parPID[2];   
   parPID[0]=fRecoParam->GetTimeResolution();
   parPID[1]=fRecoParam->GetTimeNSigma();

diff --git a/TOF/AliTOFtrackerV1.cxx b/TOF/AliTOFtrackerV1.cxx
index e3947c1d7fe014beb435d58eef2b17125b0fb91d..0b0c002a2582ba9e87d677516d8646e326437a55 100644 (file)
--- a/TOF/AliTOFtrackerV1.cxx
+++ b/TOF/AliTOFtrackerV1.cxx
@@ -191,11 +191,14 @@ Int_t AliTOFtrackerV1::PropagateBack(AliESDEvent* event) {
   AliInfo("Initializing params for TOF... ");
 
   fRecoParam = AliTOFReconstructor::GetRecoParam();  // instantiate reco param from STEER...
+
   if (fRecoParam == 0x0) { 
     AliFatal("No Reco Param found for TOF!!!");
   }
   //fRecoParam->Dump();
   if(fRecoParam->GetApplyPbPbCuts())fRecoParam=fRecoParam->GetPbPbparam();
+  //fRecoParam->PrintParameters();
+
   Double_t parPID[2];   
   parPID[0]=fRecoParam->GetTimeResolution();
   parPID[1]=fRecoParam->GetTimeNSigma();