Changeset 12556

Timestamp:

11/18/11 18:22:42 (13 years ago)

Author:

Jens Buss

Message:

...now has most propable Single peak in one Histogram with Landau-fit

File:

• fact/tools/rootmacros/tpeak.C (modified) (11 diffs)

fact/tools/rootmacros/tpeak.C

@@ -74 +74 @@
 vector<float> Vcfd(FAD_MAX_SAMPLES);    // CDF result
 vector<float> Vcfd2(FAD_MAX_SAMPLES);    // CDF result + 2nd sliding average
+
 typedef struct{
   float maxAmpl;
@@ -96 +97 @@
 TH1F *hMaxPeakOverlay;
 //TH2F *hPixelPeakOverlay;
-TH2F *hEventPeakOverlay;
+//TH2F *hEventPeakOverlay;
 int hPeakOverlayXaxisLeft,hPeakOverlayXaxisRight; 
 
@@ -140 +141 @@
         TCanvas *cFiltered = NULL;
         if (spikeDebug){
-                cFiltered = new TCanvas("cFiltered","filtered DRS Waveforms",1,10,400,300);
+                cFiltered = new TCanvas("cFiltered","filtered DRS Waveforms", 1,310,400,300);
                 cFiltered->Divide(1, 3);
         }
         // Canvases to show the peak template
         TCanvas *cPeakOverlay = NULL;
-        cPeakOverlay = new TCanvas("cPeakOverlay", "Overlay of detected Peaks", 1, 1, 400, 600);
-        cPeakOverlay->Divide(1,2);
-        // All peaks of one Pixel
-        TCanvas *cPixelPeakOverlay = NULL;
-        cPixelPeakOverlay = new TCanvas("cPixelPeakOverlay", "Overlay of detected Peaks of all Events of one Pixel", 401, 1, 400, 400);
-        // All Peaks of one Event
-        TCanvas *cYProjection = NULL;
-        cYProjection = new TCanvas("cYProjection", "Y Projection of peak overlay for each bin ", 802, 1, 400, 400);
+        cPeakOverlay = new TCanvas("cPeakOverlay", "Overlay of detected Peaks", 1, 1, 1200, 600);
+        cPeakOverlay->Divide(2,1);
+//        // All peaks of one Pixel
+//        TCanvas *cPixelPeakOverlay = NULL;
+//        cPixelPeakOverlay = new TCanvas("cPixelPeakOverlay", "Overlay of detected Peaks of all Events of one Pixel", 401, 1, 400, 400);
+//        // All Peaks of one Event
+//        TCanvas *cYProjection = NULL;
+//        cYProjection = new TCanvas("cYProjection", "Y Projection of peak overlay for each bin ", 802, 1, 400, 400);
 
 
@@ -205 +206 @@
   if (verbosityLevel > 0)
     cout <<"of, which "<< npixel << "will be processed"<< endl;
-
 //Get the DRS calibration
         FOpenCalibFile( drsfilename,
@@ -212 +212 @@
                                         drs_triggeroffsetmean,
                                         drs_n);
-
+cout << "test4" << endl;
 // Book the histograms
         BookHistos( );
@@ -276 +276 @@
                                             hPeakOverlay->Fill( pos - (it->maxPos), Vslide[pos]) ;
 //                                            hPixelPeakOverlay->Fill( pos - (it->maxPos), Vcorr[pos]) ;
-                                            hEventPeakOverlay->Fill( pos - (it->maxPos), 2*Vcorr[pos]) ;
+//                                            hEventPeakOverlay->Fill( pos - (it->maxPos), 2*Vcorr[pos]) ;
                                         }
                                 }
@@ -364 +364 @@
                                 if (ProduceGraphic){
                                                 if (ev % 50 == 0){
-                //OVERLAY PEAKS
-                cPeakOverlay->cd(1);
-                hPeakOverlay->Draw("COLZ");
-                cPeakOverlay->cd(2);
-                hMaxPeakOverlay->Draw("COLZ");
-                cPeakOverlay->Modified();
-                cPeakOverlay->Update();
-
-//                cPixelPeakOverlay->cd();
-//                hPixelPeakOverlay->Draw("COLZ");
-//                cPixelPeakOverlay->Modified();
-//                cPixelPeakOverlay->Update();
+
+                    //OVERLAY PEAKS
+                    cPeakOverlay->cd(1);
+                    hPeakOverlay->Draw("COLZ");
+                    cPeakOverlay->cd(2);
+                  //  hMaxPeakOverlay->Draw("");
+                    cPeakOverlay->Modified();
+                    cPeakOverlay->Update();
                   }
                                 }
@@ -385 +381 @@
 // end of loop over Events
 //-------------------------------------
-        //TH1D* hProjPeak =     TH2::ProjectionY(const char* name = "proj_py", Int_t firstxbin = 0, Int_t lastxbin = -1, Option_t* option = "");
-         SingleMaximum.resize(hPeakOverlay->GetNbinsX());
-         for (int TimeSlice = 0; TimeSlice <= hPeakOverlay->GetNbinsX(); TimeSlice++ ){
-               TH1D* hProjPeak =        hPeakOverlay->ProjectionY("proj_py", TimeSlice, TimeSlice, "");
-               SingleMaximum[ TimeSlice ].maxAmpl = (hProjPeak->GetMaximumBin() * 0.5) - 55.5;
-               SingleMaximum[ TimeSlice ].countOfMax = hProjPeak->GetBinContent( hProjPeak->GetMaximumBin() );
-//               cout << "Timeslice:" << "\t" << "MaxAmplitude" << "\t" << "Counts" << "\t" << "max. Value on X Axis: " << endl;
-//               cout << TimeSlice << "\t \t" << SingleMaximum[ TimeSlice ].maxAmpl << "\t \t" << SingleMaximum[ TimeSlice ].countOfMax<< "\t \t"  << ((hProjPeak->GetNbinsX() * 0.5) -55.5)<< endl;
-               hMaxPeakOverlay->SetBinContent(TimeSlice, SingleMaximum[ TimeSlice ].maxAmpl );
-
-                 }
-
+
+//-------------------------------------
+// Histogramm of Maximas in Overlay Spectra
+//-------------------------------------
+      // resize vector SingleMaximum to number of timeslices in Overlay Spectra
+      SingleMaximum.resize(hPeakOverlay->GetNbinsX());
+
+      //put maximumvalue of every Y-projection of every timeslice into vector
+      for (int TimeSlice = 0; TimeSlice <= hPeakOverlay->GetNbinsX(); TimeSlice++ ){
+        TH1D* hProjPeak =       hPeakOverlay->ProjectionY("proj_py", TimeSlice, TimeSlice, "");
+        SingleMaximum[ TimeSlice ].maxAmpl = (hProjPeak->GetMaximumBin() * 0.5) - 54;
+        SingleMaximum[ TimeSlice ].countOfMax = hProjPeak->GetBinContent( hProjPeak->GetMaximumBin() );
+        hMaxPeakOverlay->SetBinContent(TimeSlice, SingleMaximum[ TimeSlice ].maxAmpl );
+      }
+      hMaxPeakOverlay->Fit("landau", "", "", -50, 250);
+
+//-------------------------------------
+// Draw Histograms
+//-------------------------------------
         if (ProduceGraphic){
             //OVERLAY PEAKS
             cPeakOverlay->cd(1);
             hPeakOverlay->Draw("COLZ");
-//            cPeakOverlay->Modified();
-//            cPeakOverlay->Update();
             cPeakOverlay->cd(2);
             hMaxPeakOverlay->Draw("");
@@ -414 +415 @@
 
         }
-
-
-//        cPixelPeakOverlay->cd();
-//        hPixelPeakOverlay->Draw();
-//        cPixelPeakOverlay->Modified();
-//        cPixelPeakOverlay->Update();
-
         SaveHistograms( OutRootFileName );
 
@@ -482 +476 @@
         hMaxPeakOverlay->GetXaxis()->SetTitle( "Timeslices" );
         hMaxPeakOverlay->GetYaxis()->SetTitle( "Amplitude [a.u.]" );
-        //hMaxPeakOverlay->SetBit(TH2F::kCanRebin);
         hList.Add( hMaxPeakOverlay );
 
@@ -492 +485 @@
 //        hList.Add( hPixelPeakOverlay );
 
-        hEventPeakOverlay = new TH2F("hEventPeakOverlay", "Overlay of detected Peaks of all Pixel of one Event",
-               hPeakOverlayXaxisLeft + hPeakOverlayXaxisRight , (-1*hPeakOverlayXaxisLeft)-0.5, hPeakOverlayXaxisRight-0.5 ,
-               4096, -48.5, 200.5 );
-        hEventPeakOverlay->GetXaxis()->SetTitle( "Timeslices" );
-        hEventPeakOverlay->GetYaxis()->SetTitle( "Amplitude [a.u.]" );
-        hList.Add( hEventPeakOverlay );
+//        hEventPeakOverlay = new TH2F("hEventPeakOverlay", "Overlay of detected Peaks of all Pixel of one Event",
+//               hPeakOverlayXaxisLeft + hPeakOverlayXaxisRight , (-1*hPeakOverlayXaxisLeft)-0.5, hPeakOverlayXaxisRight-0.5 ,
+//               4096, -48.5, 200.5 );
+//        hEventPeakOverlay->GetXaxis()->SetTitle( "Timeslices" );
+//        hEventPeakOverlay->GetYaxis()->SetTitle( "Amplitude [a.u.]" );
+//        hList.Add( hEventPeakOverlay );
 
 }