Changeset 12364 for fact/tools

Timestamp:

11/02/11 15:19:45 (13 years ago)

Author:

kraehenb

Message:

New version which is easier to use (by first getting the full calibrated event with FCalibrateEvent). Unfortunately a bit slower...

File:

• fact/tools/rootmacros/FOscilloscopeAllPx.c (modified) (5 diffs)

fact/tools/rootmacros/FOscilloscopeAllPx.c

@@ -1 +1 @@
 #include <cstdio>
+#include "FCalibrateEvent.c"
+#include <numeric>
 int FOscilloscopeAllPx(fits &datafile, vector<int16_t> &data, vector<int16_t> &data_offset, unsigned int &data_num, UInt_t data_px, vector<float> &drs_basemean, vector<float> &drs_gainmean, vector<float> &drs_triggeroffsetmean, UInt_t data_roi, float threshold, TH1F* spectrum[])
 //Data, calibration, data_roi, data_num, data_px, threshold, two histograms
@@ -8 +10 @@
         UInt_t integration_size = 10;
         UInt_t integration_delay = 5;
+        
+        vector<float> calevent(data_px*data_roi); //Vector for the calibrated event
         
         float sample, last_sample, integral;
@@ -18 +22 @@
                 cout << "Event number: " << data_num << endl;
                 
+                FCalibrateEvent(data, data_offset, drs_basemean, drs_gainmean, drs_triggeroffsetmean, calevent, data_px, data_roi);
+                
                 //Iterate over the pixels
                 for (int j=0; j<data_px; j++)
@@ -24 +30 @@
                 
                         //Iterate over the slices
-                        drs_calib_offset = (start_sample-1+data_offset[j])%data_roi;
-                        last_sample = (data[j*data_roi+start_sample-1]*2000/4096.-drs_basemean[j*data_roi+drs_calib_offset]-drs_triggeroffsetmean[j*data_roi+start_sample-1])/drs_gainmean[j*data_roi+drs_calib_offset]*1907.35;
                         for (UInt_t k=start_sample; k<end_sample; k++)
                         {
-                                drs_calib_offset = (k+data_offset[j])%data_roi;
-                                sample = (data[j*data_roi+k]*2000/4096.-drs_basemean[j*data_roi+drs_calib_offset]-drs_triggeroffsetmean[j*data_roi+k])/drs_gainmean[j*data_roi+drs_calib_offset]*1907.35;
-                                if((last_sample<threshold)&&(sample>threshold))
+                                if((calevent[j*data_roi+k-1]<threshold)&&(calevent[j*data_roi+k]>threshold))
                                 {
-                                        integral = 0;
+                                        integral = 0; //std::accumulate(calevent.begin()[k+integration_delay],calevent.begin()[k+integration_delay+integration_size]);
                                         for(UInt_t l=integration_delay; l<integration_delay+integration_size; l++)
                                         {
-                                                drs_calib_offset = (k+l+data_offset[j])%data_roi;
-                                                integral+=(data[j*data_roi+k+l]*2000/4096.-drs_basemean[j*data_roi+drs_calib_offset]-drs_triggeroffsetmean[j*data_roi+k+l])/drs_gainmean[j*data_roi+drs_calib_offset]*1907.35;
+                                                integral+=calevent[j*data_roi+k+l];
                                         }
 //                                      if((integral>60)&&(integral<=300)) {
@@ -50 +51 @@
                                         k+=min_dist;
                                 }
-                                //TBD: mistake that after the deadtime the last_sample must be set new...
-                                //Solution: first process full pipeline
-                                last_sample = sample;
                         }
                 }