Changeset 12170

Timestamp:

10/11/11 19:26:14 (13 years ago)

Author:

neise

Message:

small fix: Thomas and Werner

Location:

fact/tools/rootmacros

Files:

• FPedestalAllPx.c (modified) (4 diffs)
• testFPedestalAllPx.C (modified) (6 diffs)

fact/tools/rootmacros/FPedestalAllPx.c

@@ -1 +1 @@
 #include <cstdio>
-int FPedestalAllPx(fits &datafile, vector<int16_t> &data, vector<int16_t> &data_offset, vector<float> &drs_basemean, vector<float> &drs_gainmean, vector<float> &drs_triggeroffsetmean, UInt_t data_px, UInt_t data_roi, float pedestal_mean[], float pedestal_rms[])
+int FPedestalAllPx(
+    fits &datafile,
+    vector<int16_t> &data,
+    vector<int16_t> &data_offset,
+    vector<float> &drs_basemean,
+    vector<float> &drs_gainmean,
+    vector<float> &drs_triggeroffsetmean,
+    UInt_t data_px,
+    UInt_t data_roi,
+    float pedestal_mean[],
+    float pedestal_rms[] )
 {
 //      TCanvas *canv_base = new TCanvas( "canv_base", "Determine the baseline", 100, 520, 700, 500 );
@@ -9 +19 @@
         TH1F* baseline[data_px];
         for(int i=0; i<data_px; i++) {
-                std::sprintf(title_base,"Baseline of Px %i (data: %s, DRS: %s)",i);
+
+                std::sprintf(title_base,"Baseline of Px %i",i);
                 std::sprintf(name_base,"base%i",i);
+
                 baseline[i] = new TH1F(name_base,title_base,2000,-99.5,100.5);
                 baseline[i]->GetXaxis()->SetTitle("Sample value (mV)");
@@ -16 +28 @@
         }
         
-//      TH1F *baseline = new TH1F("baseline", title_base, 1000,-10,40);
-//      baseline[i]->GetXaxis()->SetTitle("Sample value (mV)");
-//      baseline[i]->GetYaxis()->SetTitle("Entries");
-        
 //-------------------------------------------
 //Find the baseline
 //-------------------------------------------
-        for (size_t i=0; i<datafile.GetNumRows(); i++)
+        for (size_t i=0; ( i<datafile.GetNumRows() ); i++)
         {
                 datafile.GetRow(i);
-                cout << "Loop variable: " << i << endl;
+                if( i%50 == 0 ) cout << "Loop variable: " << i << endl;
                 
                 //Iterate over the pixels
@@ -52 +60 @@
                 pedestal_rms[j] = baseline[j]->GetRMS();
         }
-        std::cout << "Value of maximal probability: " << pedestal_mean[1348] << " +- " << pedestal_rms[1348] << std::endl;
+//      std::cout << "Value of maximal probability Px 1348: " << pedestal_mean[1348] << " +- " << pedestal_rms[1348] << std::endl;
         
 //      canv_base->cd();

fact/tools/rootmacros/testFPedestalAllPx.C

@@ -11 +11 @@
 #include "FPedestalAllPx.c"
 
-int testFPedestalAllPx(const char *name, const char *drsname)
+int testFPedestalAllPx(
+    const char *name = "../raw/20110916_025.fits",
+    const char *drsname = "../raw/20110916_024.drs.fits")
 {
 //******************************************************************************
@@ -19 +21 @@
 //Example call in ROOT:
 //root [74] .x calscope.C++("20110804_024.fits","20110804_023.drs.fits",10,1348)
-//T. Krähenbühl, August 2011, tpk@phys.ethz.ch
+//T. Kr�henb�hl, August 2011, tpk@phys.ethz.ch
 //******************************************************************************
 
@@ -52 +54 @@
         vector<float> drs_gainmean;
         vector<float> drs_triggeroffsetmean;
+    
         FOpenCalibFile(drsname, drs_basemean, drs_gainmean, drs_triggeroffsetmean, drs_n);
         
+    
 //-------------------------------------------
 //Check the sizes of the data columns
@@ -62 +66 @@
                 return 1;
         }
+    else{
+        cout << "Data and DRS file compatible" << endl;
+        // continue
+    }
         
         
@@ -75 +83 @@
         float pedestal_mean[data_px];
         float pedestal_rms[data_px];
+
         FPedestalAllPx(datafile, data, data_offset, drs_basemean, drs_gainmean, drs_triggeroffsetmean, data_px, data_roi, pedestal_mean, pedestal_rms);
+
 //      vector<float> calevent(data_px*data_roi); //Vector for the calibrated event
 //      FGetCalEvent(data, data_offset, drs_basemean, drs_gainmean, drs_triggeroffsetmean, calevent, data_px, data_roi);
@@ -82 +92 @@
 //Draw the data
 //-------------------------------------------
+    
         TCanvas *canv_mean= new TCanvas( "canv_mean", "mean in mV", 30, 300, 900, 500 );
         TH1F* histo_mean = new TH1F("histo_mean","Value of maximal probability",2000,-99.5,100.5);