diff --git a/convertDRS4/read_binary.cpp b/convertDRS4/read_binary.cpp index 8641367399cc95a07d58b55ee40cbee91baf406f..d001c21035086f52ef177a555ad67982362c1754 100644 --- a/convertDRS4/read_binary.cpp +++ b/convertDRS4/read_binary.cpp @@ -113,15 +113,15 @@ int main(int argc, const char * argv[]) TTree* rtree = new TTree("rtree", "tree for drs4 analysis"); //rtree->Branch("t1", &t1, "t1/D"); //br for time of threshold crossing signal in 1 ch // rtree->Branch("t2", &t2, "t2/D"); //br for time of threshold crossing signal in 2 ch - int ncell; - const int ncellMax = 1024; - double amp_ch1[ncellMax], time_ch1[ncellMax]; //variable size array +// int ncell; +// const int ncellMax = 1024; +// double amp_ch1[ncellMax], time_ch1[ncellMax]; //variable size array //------for other channels // double amp_ch2[ncellMax], time_ch2[ncellMax]; - rtree->Branch("ncell", &ncell, "ncell/I"); - rtree->Branch("amp_ch1", amp_ch1, "amp_ch1[ncell]/D"); - rtree->Branch("time_ch1", time_ch1, "time_ch1[ncell]/D"); +// rtree->Branch("ncell", &ncell, "ncell/I"); +// rtree->Branch("amp_ch1", amp_ch1, "amp_ch1[ncell]/D"); +// rtree->Branch("time_ch1", time_ch1, "time_ch1[ncell]/D"); RawEvent *event = new RawEvent(); rtree->Bronch("rawEvent", "RawEvent", &event); @@ -250,9 +250,9 @@ int main(int argc, const char * argv[]) waveform[b][chn_index][i] = (voltage[i] / 65536. + eh.range/1000.0 - 0.5); //calculation of amplitudes values for each cell //for ROOT - ncell = i; + //ncell = i; if(chn_index == 0) { - amp_ch1[i] = waveform[b][chn_index][i]; + //amp_ch1[i] = waveform[b][chn_index][i]; event->SetAmp(waveform[b][chn_index][i], i); // event->InvertAmp(waveform[b][chn_index][i], i); /*printf("old ampl %f ",amp_ch1[i]); @@ -295,7 +295,7 @@ int main(int argc, const char * argv[]) //for ROOT for(i=0 ; i<1024 ; i++) { - time_ch1[i] = time[b][0][i]; + //time_ch1[i] = time[b][0][i]; event->SetTime(time[b][0][i],i); /*printf("old time %f ",time_ch1[i]); event->PrintTime(i); diff --git a/data/dataDSR4/analysis_07_1.root b/data/dataDSR4/analysis_07_1.root index cfec7acb0d50925486bb9ec988fab2c6a8f28a2b..7e9be1ec64520695fce7555d02879ad9dd3969f9 100644 Binary files a/data/dataDSR4/analysis_07_1.root and b/data/dataDSR4/analysis_07_1.root differ diff --git a/data/rawDataDSR4/NeuRad_test_07_1.root b/data/rawDataDSR4/NeuRad_test_07_1.root index 5ada2064d4a54249b23d386ef8e8b3e7ba96783d..a90be9ad699a72e85aec0c911f7414fde1378bde 100644 Binary files a/data/rawDataDSR4/NeuRad_test_07_1.root and b/data/rawDataDSR4/NeuRad_test_07_1.root differ diff --git a/dataClasses/RawEvent.h b/dataClasses/RawEvent.h index 0b67d18aa642747d9a576a086c5465b25bf66f30..7c29a06973e14a64c2895da0b1d4c7798f742325 100644 --- a/dataClasses/RawEvent.h +++ b/dataClasses/RawEvent.h @@ -51,11 +51,11 @@ public: void SetAmp(Double_t a, Int_t i); //Takes amplitude (raw data, voltage from binary file) - //and places it in the array Amp[NCELLS] + //and places it in the array fAmp void SetTime(Double_t t, Int_t i); //Takes time (raw data, times from binary file) - //and places it in the array Time[NCELLS] + //and places it in the array fTime void PrintAmp(Int_t i); //Prints i amplitudes (to make sense i shold be NCELLS)