Skip to content

Commit

Permalink
tail charge definition added to AD recoparam
Browse files Browse the repository at this point in the history
  • Loading branch information
cmayer authored and cmayer committed May 17, 2016
1 parent 091a856 commit 331690d
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 3 deletions.
2 changes: 2 additions & 0 deletions AD/ADrec/AliADRecoParam.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ AliADRecoParam::AliADRecoParam() : AliDetectorRecoParam(),
fEndClock(12),
fNPreClocks(1),
fNPostClocks(2),
fTailBegin(16),
fTailEnd(20),
fAdcThresHold(1.0),
fTimeWindowBBALow(-9.5),
fTimeWindowBBAUp(22.5),
Expand Down
10 changes: 9 additions & 1 deletion AD/ADrec/AliADRecoParam.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@ class AliADRecoParam : public AliDetectorRecoParam
void SetMaxResid (Float_t val) { fMaxResid = val; }
void SetResidRise (Float_t val) { fResidRise = val; }

void SetTailBegin(Int_t tailBegin) { fTailBegin = tailBegin; }
void SetTailEnd(Int_t tailEnd) { fTailEnd = tailEnd; }

Float_t GetNSigmaPed() const { return fNSigmaPed; }
Int_t GetStartClock() const { return fStartClock; }
Int_t GetEndClock() const { return fEndClock; }
Expand All @@ -57,6 +60,9 @@ class AliADRecoParam : public AliDetectorRecoParam
Float_t GetTimeWindowBGCUp () const { return fTimeWindowBGCUp ; }
Float_t GetMaxResid () const { return fMaxResid; }
Float_t GetResidRise () const { return fResidRise; }

Int_t GetTailBegin() const { return fTailBegin; }
Int_t GetTailEnd() const { return fTailEnd; }

private:

Expand All @@ -65,6 +71,8 @@ class AliADRecoParam : public AliDetectorRecoParam
Int_t fEndClock; // End clock for max adc search
Int_t fNPreClocks; // Number of pre-clocks used in adc charge sum
Int_t fNPostClocks; // Number of post-clocks used in adc charge sum
Int_t fTailBegin; // tail charge begin (BC)
Int_t fTailEnd; // tail charge end (BC)

// Cuts used in the trigger mask creation
Float_t fAdcThresHold; // Threshold on the ADC
Expand All @@ -79,6 +87,6 @@ class AliADRecoParam : public AliDetectorRecoParam
Float_t fMaxResid; // Maximum residual of a single channel time
Float_t fResidRise; // Rise of the early hit cut

ClassDef(AliADRecoParam, 4)
ClassDef(AliADRecoParam, 5)
};
#endif
9 changes: 7 additions & 2 deletions AD/ADrec/AliADReconstructor.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,11 @@ void AliADReconstructor::FillESD(TTree* digitsTree, TTree* /*clustersTree*/,AliE
// start and end BCs for charge integration
const Int_t start = TMath::Max( 0, imax - GetRecoParam()->GetNPreClocks());
const Int_t end = TMath::Min(20, imax + GetRecoParam()->GetNPostClocks());


// start and end BCs for tail charge integration
const Int_t tailBegin = GetRecoParam()->GetTailBegin();
const Int_t tailEnd = GetRecoParam()->GetTailEnd();

// integrated charge without saturation correction
adc[pmNumber] = 0.0f;
for (Int_t iClock=start; iClock<=end; ++iClock)
Expand All @@ -411,7 +415,8 @@ void AliADReconstructor::FillESD(TTree* digitsTree, TTree* /*clustersTree*/,AliE
for (Int_t bc=13; bc<kADNClocks-1 && !isPileUp; ++bc)
isPileUp |= (adcPedSub[bc+1] > adcPedSub[bc] + threshold);

for (Int_t iClock=16; iClock<kADNClocks; ++iClock)

for (Int_t iClock=tailBegin; iClock<=tailEnd; ++iClock)
tail[pmNumber] += adcPedSub[iClock];

adcTrigger[pmNumber] = adcPedSub[10];
Expand Down

0 comments on commit 331690d

Please sign in to comment.