Adding switch - usage of maximal or total charge for dEdx

Upper and lower limit for truncated dEdx calculation

(Marian)

diff --git a/TPC/AliTPCRecoParam.cxx b/TPC/AliTPCRecoParam.cxx
index fa78566d8eda4d50d296add6cc56414ee715dd98..6a077623ba1ab8abdec16e8eb1cdaa5a51842ade 100644 (file)
--- a/TPC/AliTPCRecoParam.cxx
+++ b/TPC/AliTPCRecoParam.cxx
@@ -81,7 +81,6 @@ AliTPCRecoParam::AliTPCRecoParam():
   fBSpecialSeeding(kFALSE),
   fBKinkFinder(kTRUE),
   fLastSeedRowSec(120),
   fBSpecialSeeding(kFALSE),
   fBKinkFinder(kTRUE),
   fLastSeedRowSec(120),

-  fUseTransformation(0),

   fUseFieldCorrection(0),      // use field correction
   fUseRPHICorrection(0),      // use rphi correction
   fUseRadialCorrection(0),    // use radial correction
   fUseFieldCorrection(0),      // use field correction
   fUseRPHICorrection(0),      // use rphi correction
   fUseRadialCorrection(0),    // use radial correction


@@ -91,6 +90,10 @@ AliTPCRecoParam::AliTPCRecoParam():
   fUseDriftCorrectionGY(0),   // use drif correction global y
   fUseGainCorrectionTime(0),  // use gain correction time
   fUseExBCorrection(1),  // use ExB correction
   fUseDriftCorrectionGY(0),   // use drif correction global y
   fUseGainCorrectionTime(0),  // use gain correction time
   fUseExBCorrection(1),  // use ExB correction

+  //
+  fUseTotCharge(kTRUE),          // switch use total or max charge
+  fMinFraction(0.01),           // truncated mean - lower threshold
+  fMaxFaction(0.7),            // truncated mean - upper threshold

   fUseTOFCorrection(kTRUE)
 {
   //
   fUseTOFCorrection(kTRUE)
 {
   //


@@ -133,6 +136,7 @@ AliTPCRecoParam *AliTPCRecoParam::GetHighFluxParam(){
   param->fCtgRange = 1.05;
   param->fFirstBin = 0;
   param->fLastBin  = 1000;  
   param->fCtgRange = 1.05;
   param->fFirstBin = 0;
   param->fLastBin  = 1000;  

+  param->fUseTotCharge=kFALSE;

   param->SetName("High Flux");
   param->SetTitle("High Flux");
   return param;
   param->SetName("High Flux");
   param->SetTitle("High Flux");
   return param;

diff --git a/TPC/AliTPCRecoParam.h b/TPC/AliTPCRecoParam.h
index 4adb324a9ac74692ab60adc900bb5645c6070725..be3ab13ff703b6e87321ea74f5321732b30c0d4e 100644 (file)
--- a/TPC/AliTPCRecoParam.h
+++ b/TPC/AliTPCRecoParam.h
@@ -56,7 +56,6 @@ class AliTPCRecoParam : public AliDetectorRecoParam
   //
   // Correction setup
   //
   //
   // Correction setup
   //

-  void  SetUseTransformation(Int_t flag){fUseTransformation=flag;}

   void  SetUseFieldCorrection(Int_t flag){fUseFieldCorrection=flag;}
   void  SetUseRPHICorrection(Int_t flag){fUseRPHICorrection=flag;}
   void  SetUseRadialCorrection(Int_t flag){fUseRadialCorrection=flag;}
   void  SetUseFieldCorrection(Int_t flag){fUseFieldCorrection=flag;}
   void  SetUseRPHICorrection(Int_t flag){fUseRPHICorrection=flag;}
   void  SetUseRadialCorrection(Int_t flag){fUseRadialCorrection=flag;}


@@ -68,7 +67,6 @@ class AliTPCRecoParam : public AliDetectorRecoParam
   void  SetUseExBCorrection(Int_t flag){fUseExBCorrection=flag;}
   void  SetUseTOFCorrection(Bool_t flag) {fUseTOFCorrection = flag;}
   //
   void  SetUseExBCorrection(Int_t flag){fUseExBCorrection=flag;}
   void  SetUseTOFCorrection(Bool_t flag) {fUseTOFCorrection = flag;}
   //

-  Int_t GetUseTransformation() const {return fUseTransformation;}

   Int_t GetUseFieldCorrection() const {return fUseFieldCorrection;}
   Int_t GetUseRPHICorrection() const {return fUseRPHICorrection;}
   Int_t GetUseRadialCorrection() const {return fUseRadialCorrection;}
   Int_t GetUseFieldCorrection() const {return fUseFieldCorrection;}
   Int_t GetUseRPHICorrection() const {return fUseRPHICorrection;}
   Int_t GetUseRadialCorrection() const {return fUseRadialCorrection;}


@@ -78,6 +76,11 @@ class AliTPCRecoParam : public AliDetectorRecoParam
   Int_t GetUseDriftCorrectionGY() const {return fUseDriftCorrectionGY;}
   Int_t GetUseGainCorrectionTime() const {return fUseGainCorrectionTime;}
   Int_t GetUseExBCorrection() const {return fUseExBCorrection;}
   Int_t GetUseDriftCorrectionGY() const {return fUseDriftCorrectionGY;}
   Int_t GetUseGainCorrectionTime() const {return fUseGainCorrectionTime;}
   Int_t GetUseExBCorrection() const {return fUseExBCorrection;}

+  //
+  Bool_t   GetUseTotCharge(){return fUseTotCharge;}          // switch use total or max charge
+  Float_t  GetMinFraction() {return fMinFraction;}           // truncated mean - lower threshold
+  Float_t  GetMaxFraction(){return fMaxFaction;}            // truncated mean - upper threshold
+

   Bool_t   GetUseTOFCorrection() {return fUseTOFCorrection;}
 
   //
   Bool_t   GetUseTOFCorrection() {return fUseTOFCorrection;}
 
   //


@@ -120,7 +123,6 @@ class AliTPCRecoParam : public AliDetectorRecoParam
   //
   // Correction switches
   //
   //
   // Correction switches
   //

-  Int_t fUseTransformation;      // use transformation 

   Int_t fUseFieldCorrection;     // use field correction
   Int_t fUseRPHICorrection;      // use rphi correction
   Int_t fUseRadialCorrection;    // use radial correction
   Int_t fUseFieldCorrection;     // use field correction
   Int_t fUseRPHICorrection;      // use rphi correction
   Int_t fUseRadialCorrection;    // use radial correction


@@ -131,13 +133,18 @@ class AliTPCRecoParam : public AliDetectorRecoParam
   Int_t fUseGainCorrectionTime;  // use gain correction time
   Int_t fUseExBCorrection;       // use ExB correction
   //
   Int_t fUseGainCorrectionTime;  // use gain correction time
   Int_t fUseExBCorrection;       // use ExB correction
   //

+  // dEdx switches
+  //
+  Bool_t   fUseTotCharge;          // switch use total or max charge
+  Float_t fMinFraction;           // truncated mean - lower threshold
+  Float_t fMaxFaction;            // truncated mean - upper threshold

 
   Bool_t fUseTOFCorrection;  // switch - kTRUE use TOF correction kFALSE - do not use
   //
   //  misscalibration
   //
   Double_t fSystematicErrors[5];  //systematic errors in the track parameters - to be added to TPC covariance matrix    
 
   Bool_t fUseTOFCorrection;  // switch - kTRUE use TOF correction kFALSE - do not use
   //
   //  misscalibration
   //
   Double_t fSystematicErrors[5];  //systematic errors in the track parameters - to be added to TPC covariance matrix    

-  ClassDef(AliTPCRecoParam, 6)
+  ClassDef(AliTPCRecoParam, 7)

 };
 
 
 };