diff --git a/dataClasses/AEvent.cpp b/dataClasses/AEvent.cpp
index 7ecf7814aa023ae07c30fe9c866f08d684658eed..07d29de21c28959806f6b1567ced2f10b1d684dd 100644
--- a/dataClasses/AEvent.cpp
+++ b/dataClasses/AEvent.cpp
@@ -65,6 +65,7 @@ void AEvent::ProcessEvent(Bool_t bSmooth) {
 	SetChargeCFD();
 	SetChargeLED();
 	SetChargeTF();
+	SetToT();
 
 //	SmoothGraphs();
 
@@ -86,6 +87,8 @@ void AEvent::Reset() {
 	fTime10=0.;
 	fTime90=0.;
 	fTimeMid=0.;
+	fToT=-100.;
+	fAmpMid=0.;
 	fAmpMax = 0.;
 	fTimeAmpMax = 0.;
 	fTimeCFD = -100.;
@@ -249,6 +252,7 @@ void AEvent::FindFrontProperties() {
 	fEdgeXi = fit1->GetChisquare();
 
 	fTimeMid = (fTime90 -fTime10)*0.5 + fTime10; 	//time point between fTime90 and fTime10
+	fAmpMid = fGraphSignal->Eval(fTimeMid);
 
 	//adding point where fit function crosses zero
 	Double_t a = 0, b = 0;
@@ -427,3 +431,29 @@ void AEvent::SetLED(Double_t threshold) {
 	// сделать через функцию getpoint и цикл по точкам от 
 
 }
+
+void AEvent::SetToT() {
+
+	Double_t time = fTimeMid;
+	Double_t timeBack = 0;
+	const Double_t ns = 15.; //withing this interval signal should end for sure, in nanosec
+
+	const Double_t timeStep = 0.05;
+
+	//cout<<"fAmpMid "<<fAmpMid<<endl;
+	while( fGraphSignal->Eval(time) >= fAmpMid && time < fTimeMid + ns) {
+		//cout<<"timeback "<<timeBack<<endl;
+		//cout<<"fGraphSignal->Eval(time) "<<fGraphSignal->Eval(time)<<endl;
+		//cout<<endl;
+		//if(timeBack>150.) {return;}
+		timeBack = time;
+		time = time + timeStep;
+	}
+	//cout<<"timeback "<<timeBack<<endl;
+
+	fToT = timeBack - fTimeMid;
+	//cout<<"ftot "<<fToT<<endl;
+
+
+
+}
diff --git a/dataClasses/AEvent.h b/dataClasses/AEvent.h
index 779610f879b57b5d6981a1529bb50bbc953432ca..e2d86f8fa090dbeddf0c8417ba82b6c20ac8194e 100644
--- a/dataClasses/AEvent.h
+++ b/dataClasses/AEvent.h
@@ -44,6 +44,8 @@ private:
 	Double_t fTime10;		//time of 10% of rising edge amplitude in ns
 	Double_t fTime90;		//time of 10% of rising edge amplitude in ns
 	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;
 
 	TArrayD fAmpCFD;	//array for CFD amplitudes (attenuated, inversed and delayed)
 	Double_t fTimeCFD;			//zero-crossing time
@@ -107,6 +109,10 @@ public:
 	void SetSmoothPoints(Int_t numofp) {fWinSize = numofp; };
 	//set number of smoothing points
 
+	void SetToT();
+	//calculate time-over-threshold. the threshold value is fTimeMid - middle point of the rising edge
+	//ToT is calculated within 15 ns range in order to consider all the weirdness of the signal form
+
 	void Reset();
 	 //Resets arrays to zeros
 
diff --git a/macros/testShowGraphs.cxx b/macros/testShowGraphs.cxx
index 7fd9cca91b58bbde4b160ccf8dbfeb9fbf11b2a1..7d802976c1aa6df5d80c0e89da427708a7baccb6 100644
--- a/macros/testShowGraphs.cxx
+++ b/macros/testShowGraphs.cxx
@@ -27,7 +27,7 @@ void testShowGraphs()
 
 //	TFile fr("../data/dataTektronix/exp18.root");
 
-	TFile fr("../data/dataDSR4/analysis_08_2.root");
+	TFile fr("../data/dataDSR4/analysis_07_8.root");
 
 //	TFile fr("../data/dataDSR4/Neurad_081216_2NEW.root");
 //	TFile fr("../data/dataTektronix/exp18.root");
@@ -81,7 +81,7 @@ void testShowGraphs()
 		//f1->SetRange(t10[k], t90[k]);
 		//gr[k]->Fit(f1, "RQ");
 	}
-	c1->Print(Form("../macros/picsDRS4/file%s/signals%s", foldername, ext));
+	//c1->Print(Form("../macros/picsDRS4/file%s/signals%s", foldername, ext));
 //	c1->cd(2);
 //	tr->Draw("gAmp.Draw()","","goff",1,124);
 }