Commit b3ddd8eb authored by Kostyleva D.A's avatar Kostyleva D.A

Readme with logbook information is added, some warnings are eliminated

parent 5180a1eb
...@@ -2,7 +2,7 @@ Application for convertation of binary files acquired by DRS4 to ROOT file. ...@@ -2,7 +2,7 @@ Application for convertation of binary files acquired by DRS4 to ROOT file.
1. read_binary.cpp complies within makefile (commaned make clean, then make in Neurad_test) and makes object file read_binary in current directory 1. read_binary.cpp complies within makefile (commaned make clean, then make in Neurad_test) and makes object file read_binary in current directory
2. To convert binary file to root file do: 2. To convert binary file to root file do:
./read_binary_DRS4 ./data/rawDataDSR4/input_file_name.dat ../data/rawDataDSR4/output_file_name.root ./read_binary_DRS4 ../data/rawDataDSR4/input_file_name.dat ../data/rawDataDSR4/output_file_name.root
!both input and output files should be specified! !both input and output files should be specified!
...@@ -333,11 +333,9 @@ int main(int argc, const char * argv[]) ...@@ -333,11 +333,9 @@ int main(int argc, const char * argv[])
rfile->Write(); rfile->Write();
rfile->Close(); rfile->Close();
// delete event; for (Int_t i = 0; i < 4; i ++) {
printf("error1\n"); delete event[i];
delete[] event; }
printf("error2\n");
return 1; return 1;
} }
Raw data. Both in binary and root format. Raw data. Both in binary and root format.
Logbook
File name | Num of events | Comment
------------------------|---------------|---------------------------------------------------------------------|
NeuRad_test_071216_1.dat| 500 |
NeuRad_test_071216_2.dat| 500 | collimated gamma source; ch0 and ch1 have coincidence; ?trigger ch0?|
NeuRad_test_071216_3.dat| | neutron source Cf |
NeuRad_test_071216_4.dat| 2000 | source 60Co; trigger ch1; ch1-front, ch2,ch3,ch4 - back |
NeuRad_test_071216_5.dat| 2000 | source 60Co; trigger ch1; ch1-front, ch2,ch3,ch4 - back |
NeuRad_test_071216_6.dat| 2000 | source 60Co; trigger ch1; ch1-front, ch2,ch3,ch4 - back |
NeuRad_test_071216_7.dat| 2000 | source 60Co; trigger ch1; ch1-front, ch2,ch3,ch4 - back |
***
Change of PMT amplification: increasing voltage up to 1100 mV, threshold 25 mV
***
NeuRad_test_071216_8.dat| 10000 | source 60Co; trigger ch1; ch1-front, ch2,ch3,ch4 - back |
NeuRad_test_081216_1.dat| | trigger ch3 |
NeuRad_test_081216_2.dat| | collimated gamma source; two channels only: ch1 and ch2 |
...@@ -55,11 +55,8 @@ void AEvent::ProcessEvent() { ...@@ -55,11 +55,8 @@ void AEvent::ProcessEvent() {
fTime[j] = time[j]; fTime[j] = time[j];
} }
// SetGraphs();
const Double_t zeroLevel = FindZeroLevel(); const Double_t zeroLevel = FindZeroLevel();
// const Double_t zeroLevel = 0;
for(Int_t j = 0; j < fNPoints; j++) { for(Int_t j = 0; j < fNPoints; j++) {
//fAmpPos[j] = amp[j]*(-1.) - zeroLevel;
fAmpPos[j] = fAmpPos[j] - zeroLevel; fAmpPos[j] = fAmpPos[j] - zeroLevel;
} }
...@@ -176,26 +173,22 @@ void AEvent::SetCFD() { ...@@ -176,26 +173,22 @@ void AEvent::SetCFD() {
Double_t AEvent::FindZeroLevel(Int_t pmin, Int_t pmax) { Double_t AEvent::FindZeroLevel(Int_t pmin, Int_t pmax) {
// fGraphZero->Set(fNPoints);
// const Double_t *amp = fInputEvent->GetAmp();
// const Double_t *time = fInputEvent->GetTime();
SetGraphs(); SetGraphs();
Double_t correction = 0; Double_t correction = 0;
TF1 *fit1 = new TF1("fit1","[0]"); TF1 *fit1 = new TF1("fit1","[0]"); //function for one parameter fitting in the range of pmin-pmax
fit1->SetRange(pmin,pmax); fit1->SetRange(pmin,pmax);
// Warning("AEvent::FindZeroLevel", "Graph was not set");
if (!fGraphSignal) { if (!fGraphSignal) {
Warning("AEvent::FindZeroLevel", "Graph was not set"); Warning("AEvent::FindZeroLevel", "Graph was not set");
return 0; return 0;
} }
// fGraphSignal->Print();
fGraphSignal->Fit(fit1,"RQN","goff"); fGraphSignal->Fit(fit1,"RQN","goff");
// fGraphSignal->Fit(fit1,"QR","goff");
correction = fit1->GetParameter(0); correction = fit1->GetParameter(0);
// printf("zero level %f\n", correction);
delete fit1; delete fit1;
return correction; return correction;
}
Double_t AEvent::GetfCFD() { Double_t AEvent::GetfCFD() {
return fCFD; return fCFD;
......
...@@ -85,8 +85,7 @@ public: ...@@ -85,8 +85,7 @@ public:
//draws signal shape graphs //draws signal shape graphs
Double_t FindZeroLevel(Int_t pmin = 10, Int_t pmax = 100); Double_t FindZeroLevel(Int_t pmin = 10, Int_t pmax = 100);
//for zero level correction //for zero level correction. one parameter fit between pmin and pmax
//one parameter fit between pmin and pmax
//returns fit parameter i.e. number on which amplitude should be corrected //returns fit parameter i.e. number on which amplitude should be corrected
private: private:
......
...@@ -2,7 +2,7 @@ void analyse() ...@@ -2,7 +2,7 @@ void analyse()
{ {
gSystem->Load("../libData.so"); gSystem->Load("../libData.so");
TFile *f = new TFile("../data/rawDataDSR4/NeuRad_test_07_1.root"); TFile *f = new TFile("../data/rawDataDSR4/NeuRad_test_07_3.root");
TTree *tr = (TTree*)f->Get("rtree"); TTree *tr = (TTree*)f->Get("rtree");
const Int_t noBranches = 4; const Int_t noBranches = 4;
...@@ -19,7 +19,7 @@ void analyse() ...@@ -19,7 +19,7 @@ void analyse()
// tr->SetMakeClass(1); // tr->SetMakeClass(1);
TFile *fw = new TFile("../data/dataDSR4/analysis_07_1.root", "RECREATE"); //create .root file with somehow analyzed data TFile *fw = new TFile("../data/dataDSR4/analysis_07_3.root", "RECREATE"); //create .root file with somehow analyzed data
TTree *tw = new TTree("atree", "title of drs4 analysis tree"); //create analysis tree atree in it TTree *tw = new TTree("atree", "title of drs4 analysis tree"); //create analysis tree atree in it
AEvent *wevent[noBranches]; // pointer to the array (of AEvent class) in which analyzed data for each channel will be put AEvent *wevent[noBranches]; // pointer to the array (of AEvent class) in which analyzed data for each channel will be put
......
...@@ -29,10 +29,9 @@ CONVERTRAWTOANALYZED = $(PWD)/convertRawToAnalyzed ...@@ -29,10 +29,9 @@ CONVERTRAWTOANALYZED = $(PWD)/convertRawToAnalyzed
-include $(DATA)/Data.mk -include $(DATA)/Data.mk
all: libData.so \ all: libData.so \
read_binary_DRS4 \ read_binary_DRS4 \
convertTektronix \ convertTektronix
convertRawToAnalyzed
#ROOT html documentation, it will be done as a program which will be alsa compiled by this makefile, program will be as a last condition after all of the libraries #ROOT html documentation, it will be done as a program which will be alsa compiled by this makefile, program will be as a last condition after all of the libraries
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment