From de01b6ade14f4d0d57972d1e9f87a9aba0d6477f Mon Sep 17 00:00:00 2001 From: "Muzalevsky I.A" Date: Mon, 17 Apr 2017 11:08:24 +0300 Subject: [PATCH] merge --- dataClasses/AEvent.h | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/dataClasses/AEvent.h b/dataClasses/AEvent.h index e2d86f8..d55c67d 100644 --- a/dataClasses/AEvent.h +++ b/dataClasses/AEvent.h @@ -46,13 +46,16 @@ private: Double_t fTimeMid; //time point between fTime90 and fTime10 Double_t fAmpMid; //amplitude in fTimeMid point. Used in ToT on 50% of rising edge determination Double_t fToT; + Double_t fTimeLast; //! TArrayD fAmpCFD; //array for CFD amplitudes (attenuated, inversed and delayed) Double_t fTimeCFD; //zero-crossing time - Double_t fChargeCFD; //! + Double_t fChargeCFD; Double_t fChargeLED; //charge of the signal in Coulomb Double_t fChargeTF; // + Double_t fTimeThresh; // time of thresh crossing rising edge + Double_t fTimeThreshBack; // time of threshBack crossing Double_t fTimeLED; //time of LED threshold crossing Double_t fTimeFront; //time of front fit crossing zero level @@ -86,10 +89,16 @@ public: Double_t GetEdgeXi(); + Double_t GetfChargeCFD(); + + Double_t GetfChargeTF(); + Double_t GetfCFD(); Double_t GetfLED(); - + + Double_t GetfThresh(); + Double_t GetOnefTime(Int_t i); Double_t GetOnefAmpPos(Int_t i); @@ -153,10 +162,11 @@ public: //void SetLED(Double_t threshold = 0.001); - void SetLED(Double_t threshold = 0.02); + void SetLED(Double_t threshold = 0.01); //leading edge discriminator - + void SetThreshold(Double_t thresholdBack = 0.035, Double_t threshRise = 0.01); + private: void Init(); void SetMaxAmplitudes(); -- 2.18.1