diff --git a/data/dataDSR4/analysis_07_1.root b/data/dataDSR4/analysis_07_1.root deleted file mode 100644 index 407c22db450ee7334e1f8a5a23d80e83cb095058..0000000000000000000000000000000000000000 Binary files a/data/dataDSR4/analysis_07_1.root and /dev/null differ diff --git a/dataClasses/AEvent.cpp b/dataClasses/AEvent.cpp index 1baa662e57cbcc62a3a5cebd83af577ae6914ab5..d3153b7ae2f98df0855bac8c0f96cda237382d49 100644 --- a/dataClasses/AEvent.cpp +++ b/dataClasses/AEvent.cpp @@ -52,6 +52,7 @@ void AEvent::ProcessEvent() { SetGraphs(); FindFrontProperties(); + SetLED(); // SetGraphs(); SetCFD(); SetChargeCFD(); @@ -279,3 +280,15 @@ void AEvent::SetMaxAmplitudes() { fTimeAmpMax = maxAmpT; } + +void AEvent::SetLED(Double_t threshold) { + + Double_t time = 0; + const Double_t timeStep = 0.1; + while( time < 200. && fGraphSignal->Eval(time) <= threshold ) { + fTimeLED = time; + time = time + timeStep; + } + //fTimeLED = time; + +} diff --git a/dataClasses/AEvent.h b/dataClasses/AEvent.h index 46923a18c4b319e587ae5d1795b0136a82374d33..90c31a819514df1d7fc20e09581cc6df208e1a61 100644 --- a/dataClasses/AEvent.h +++ b/dataClasses/AEvent.h @@ -48,6 +48,8 @@ private: Double_t fTimeCFD; //zero-crossing time Double_t fChargeCFD; //charge of the signal in Coulomb + Double_t fTimeLED; //time of LED threshold crossing + TGraph *fGraphSignal; TGraph *fGraphCFD; @@ -120,7 +122,7 @@ public: //in range of (tmin,tmax) in ns) //CFD time is taken as a start point - void SetLED(Double_t threshold = 0.001); + void SetLED(Double_t threshold = 0.015); //leading edge discriminator private: diff --git a/macros/NoiseSigma.cpp b/macros/NoiseSigma.cpp index ca47f1d6e3d593c656db9d6a7b72f6864d98cf0a..05bb9ae0eb440ac5a2f3025ecd6bb707cfe1fc0e 100644 --- a/macros/NoiseSigma.cpp +++ b/macros/NoiseSigma.cpp @@ -3,8 +3,8 @@ const Long64_t kFirstEvent = 128; - TFile fr("../data/dataDSR4/Neurad_7_08_NEW.root"); -// TFile fr("../data/dataDSR4/analysis_07_8.root"); +// TFile fr("../data/dataDSR4/Neurad_7_08_NEW.root"); + TFile fr("../data/dataDSR4/analysis_07_8.root"); // TFile fr("../data/dataDSR4/Neurad_081216_2NEW.root"); // TFile fr("../data/dataTektronix/exp18.root"); // TFile fr("../data/dataTektronix/analysisExp7.root"); @@ -35,6 +35,8 @@ c1->cd(i+1); histNoise[i]->Draw(); + histNoise[i]->Fit("gaus"); + gStyle->SetOptFit(); c1->Update(); } diff --git a/macros/histCorr.C b/macros/histCorr.C index c9d304a343d35082afdb746bef1f960ac4e36e05..41846dc5610c6ac1a21bbedc57c7c5bfe57f9826 100644 --- a/macros/histCorr.C +++ b/macros/histCorr.C @@ -1,8 +1,5 @@ //#include "TCanvas.h" -<<<<<<< HEAD -void histCorr(const char *filename = "analysis_07_8.root", const char *foldername = "7_8", const char *ext = ".eps", const Bool_t can1 = 0, const Bool_t can2 = 0, const Bool_t can3 = 0, const Bool_t can4 = 0, const Bool_t can5 = 1) -======= void histCorr( // const char *filename = "analysis_07_8.root", const char *filename = "analysis_08_2.root", @@ -10,12 +7,8 @@ void histCorr( const char *foldername = "8_2", // const char *ext = ".eps", const char *ext = ".gif", -<<<<<<< HEAD - const Bool_t can1 = 1, const Bool_t can2 = 1, const Bool_t can3 = 1, const Bool_t can4 = 1, const Bool_t can5 = 1) ->>>>>>> 1612d04b19c3139e125a1642bdb0763585790d84 -======= + const Bool_t can1 = 0, const Bool_t can2 = 0, const Bool_t can3 = 0, const Bool_t can4 = 0, const Bool_t can5 = 1) ->>>>>>> 07d2b501d7fd6bf88dd2d6b203a724d53357bbe3 { gSystem->Load("../libData.so"); TFile *f = new TFile(Form("../data/dataDSR4/%s", filename));