Changeset 2904 for trunk/MagicSoft/Mars/mcalib/MHCalibrationPixel.cc

Timestamp:

01/24/04 01:52:51 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mcalib/MHCalibrationPixel.cc (modified) (33 diffs)

trunk/MagicSoft/Mars/mcalib/MHCalibrationPixel.cc

@@ -41 +41 @@
 #include <TCanvas.h>
 #include <TPaveText.h>
+#include <TText.h>
 
 #include "MLog.h"
@@ -56 +57 @@
       : fPixId(-1),
         fTotalEntries(0),
-        fHiGains(NULL),
-        fLoGains(NULL),
+        fHChargeHiGain(NULL),  
+        fHTimeHiGain(NULL), 
+        fHChargevsNHiGain(NULL),
+        fHChargeLoGain(NULL),  
+        fHTimeLoGain(NULL),    
+        fHChargevsNLoGain(NULL),
         fChargeGausFit(NULL), 
         fTimeGausFit(NULL), 
         fHivsLoGain(NULL),
         fFitLegend(NULL),
-        fLowerFitRange(-2000.),
-        fChargeFirstHiGain(-2000.5),
-        fChargeLastHiGain(9999.5),
-        fChargeNbinsHiGain(12000),
-        fChargeFirstLoGain(-2000.5),
+        fLowerFitRange(-100.),
+        fChargeFirstHiGain(-100.5),
+        fChargeLastHiGain(1999.5),
+        fChargeNbinsHiGain(2100),
+        fChargeFirstLoGain(-100.5),
         fChargeLastLoGain(9999.5),
-        fChargeNbinsLoGain(1200),
+        fChargeNbinsLoGain(1010),
         fChargeChisquare(-1.),
         fChargeProb(-1.),
@@ -81 +86 @@
         fTimeLowerFitRangeLoGain(0),
         fTimeUpperFitRangeLoGain(0),
-        fUseLoGain(kFALSE),
-        fFitOK(kFALSE),
         fOffset(0.),
         fSlope(0.)
@@ -111 +114 @@
     Int_t  ntbins = 16;
 
-    fHTimeHiGain = new TH1I("HTimeHiGain","Distribution of Mean Arrival Hi Gain Times Pixel ",
+    fHTimeHiGain = new TH1F("HTimeHiGain","Distribution of Mean Arrival Hi Gain Times Pixel ",
                             ntbins,tfirst,tlast);
     fHTimeHiGain->SetXTitle("Mean Arrival Times [Hi Gain FADC slice nr]");
@@ -117 +120 @@
     fHTimeHiGain->SetDirectory(NULL);
 
-    fHTimeLoGain = new TH1I("HTimeLoGain","Distribution of Mean Arrival Lo Gain Times Pixel ",
+    fHTimeLoGain = new TH1F("HTimeLoGain","Distribution of Mean Arrival Lo Gain Times Pixel ",
                             ntbins,tfirst,tlast);
     fHTimeLoGain->SetXTitle("Mean Arrival Times [Lo Gain FADC slice nr]");
@@ -170 +173 @@
     delete fHivsLoGain;
 
-
-}
-
-const Double_t MHCalibrationPixel::GetArea() const
-{
-    return fChargeGausFit->GetParameter(0);
-}
-
-const Double_t MHCalibrationPixel::GetAreaErr() const
-{
-    return fChargeGausFit->GetParError(0);
-}
-
-Bool_t MHCalibrationPixel::IsEmpty()
+}
+
+Bool_t MHCalibrationPixel::IsEmpty() const
 {
     return !(fHChargeHiGain->GetEntries() || fHChargeLoGain->GetEntries());
 }
-  
+
+Bool_t MHCalibrationPixel::IsUseLoGain() const
+{
+  return TESTBIT(fFlags,kUseLoGain);
+}
+
+Bool_t MHCalibrationPixel::IsFitOK() const 
+{
+    return TESTBIT(fFlags,kFitOK);
+}
+
 Bool_t MHCalibrationPixel::FillChargeLoGain(Float_t q)
 {
@@ -193 +195 @@
 }
 
-Bool_t MHCalibrationPixel::FillTimeLoGain(Int_t t)
+Bool_t MHCalibrationPixel::FillTimeLoGain(Float_t t)
 {
     return (fHTimeLoGain->Fill(t)   > -1);
@@ -205 +207 @@
 Bool_t MHCalibrationPixel::FillChargeHiGain(Float_t q)
 {
-    return (fHChargeHiGain->Fill(q)      > -1);
-}
-
-Bool_t MHCalibrationPixel::FillTimeHiGain(Int_t t)
-{
-    return (fHTimeHiGain->Fill(t)        > -1);
+    return (fHChargeHiGain->Fill(q) > -1);
+}
+
+Bool_t MHCalibrationPixel::FillTimeHiGain(Float_t t)
+{
+    return (fHTimeHiGain->Fill(t) > -1);
 }
 
@@ -285 +287 @@
 
 
+Bool_t MHCalibrationPixel::SetupFill(const MParList *plist)
+{
+ 
+  fHChargeHiGain->Reset();
+  fHTimeHiGain->Reset();
+  fHChargeLoGain->Reset();
+  fHTimeLoGain->Reset();
+
+  return kTRUE;
+}
+
+
 void MHCalibrationPixel::Reset()
 {
@@ -293 +307 @@
 
   for (Int_t i = 0; i < 16; i++)
-      fHTimeHiGain->SetBinContent(i, 1.e-20);
-  
-  fChargeLastHiGain     = 9999.5;
-
-  fHChargeHiGain->GetXaxis()->SetRangeUser(0.,fChargeLastHiGain);
+    fHTimeHiGain->SetBinContent(i, 1.e-20);
+
+  fChargeFirstHiGain    = -100.5;
+  fChargeLastHiGain     = 1999.5;
+
+  fHChargeHiGain->GetXaxis()->UnZoom();
 
  for (Int_t i = fHChargeLoGain->FindBin(fChargeFirstLoGain); 
@@ -306 +321 @@
       fHTimeLoGain->SetBinContent(i, 1.e-20);
   
+  fChargeFirstLoGain    = -100.5;
   fChargeLastLoGain     = 9999.5;
 
-  fHChargeLoGain->GetXaxis()->SetRangeUser(0.,fChargeLastLoGain);
+  fHChargeLoGain->GetXaxis()->UnZoom();
 
   return;
@@ -319 +335 @@
   if (fHChargeHiGain->Integral() > fHChargeLoGain->Integral())
     {
-      fUseLoGain = kFALSE;
+      CLRBIT(fFlags,kUseLoGain);
       return kFALSE;
     }
   else
     {
-      fUseLoGain = kTRUE;
+      SETBIT(fFlags,kUseLoGain);
       return kTRUE;
     }
 }
 
-void MHCalibrationPixel::SetPointInGraph(Float_t qhi,Float_t qlo)
+Bool_t MHCalibrationPixel::FillPointInGraph(Float_t qhi,Float_t qlo)
 {
 
@@ -337 +353 @@
   fHiGains->AddAt(qhi,fTotalEntries-1);
   fLoGains->AddAt(qlo,fTotalEntries-1);
+
+  return kTRUE;
 
 }
@@ -350 +368 @@
   fFitLegend = new TPaveText(0.05,0.05,0.95,0.95);
 
-  if (fFitOK) 
+  if (IsFitOK()) 
       fFitLegend->SetFillColor(80);
   else
@@ -360 +378 @@
   const TString line1 = 
     Form("Mean: Q_{#mu} = %2.2f #pm %2.2f",fChargeMean,fChargeMeanErr);
-
-  fFitLegend->AddText(line1);
-
+  TText *t1 = fFitLegend->AddText(line1);
+  t1->SetBit(kCanDelete);
 
   const TString line4 =
     Form("Sigma: #sigma_{Q} = %2.2f #pm %2.2f",fChargeSigma,fChargeSigmaErr);
-
-  fFitLegend->AddText(line4);
-
+  TText *t2 =  fFitLegend->AddText(line4);
+  t2->SetBit(kCanDelete);
 
   const TString line7 =
     Form("#chi^{2} / N_{dof}: %4.2f / %3i",fChargeChisquare,fChargeNdf);
-
-  fFitLegend->AddText(line7);
-
+  TText *t3 =  fFitLegend->AddText(line7);
+  t3->SetBit(kCanDelete);
 
   const TString line8 =
     Form("Probability: %4.3f ",fChargeProb);
-
-  fFitLegend->AddText(line8);
-
-  if (fFitOK)
-    fFitLegend->AddText("Result of the Fit: OK");
+  TText *t4 =  fFitLegend->AddText(line8);
+  t4->SetBit(kCanDelete);
+
+  if (IsFitOK())
+    {
+      TText *t5 = fFitLegend->AddText("Result of the Fit: OK");
+      t5->SetBit(kCanDelete);
+    }
   else
-    fFitLegend->AddText("Result of the Fit: NOT OK");
-
+    {
+      TText *t6 = fFitLegend->AddText("Result of the Fit: NOT OK");
+      t6->SetBit(kCanDelete);
+    }
+  
   fFitLegend->SetBit(kCanDelete);
   fFitLegend->Draw();
 
 }
+
+
+TObject *MHCalibrationPixel::DrawClone(Option_t *option) const
+{
+
+  gROOT->SetSelectedPad(NULL);
+  
+  MHCalibrationPixel *newobj = (MHCalibrationPixel*)Clone();
+
+  if (!newobj) 
+    return 0;
+  newobj->SetBit(kCanDelete);
+
+
+  if (strlen(option)) 
+    newobj->Draw(option);
+  else    
+    newobj->Draw(GetDrawOption());
+  
+  return newobj;
+}
+  
 
 
@@ -400 +443 @@
 
   if (!fHivsLoGain)
-    FitHiGainvsLoGain();
+   FitHiGainvsLoGain();
       
   gStyle->SetOptFit(0);
-  gStyle->SetOptStat(1111111);
+  gStyle->SetOptStat(111111);
+  
+  gROOT->SetSelectedPad(NULL);
   
   TCanvas *c = MakeDefCanvas(this,600,900); 
-  
-  gROOT->SetSelectedPad(NULL);
   
   c->Divide(2,4);
@@ -420 +463 @@
     gPad->SetLogy(0);
 
-  fHChargeHiGain->DrawCopy(opt);
+  fHChargeHiGain->Draw(opt);
   
   c->Modified();
   c->Update();
   
-  if (fUseLoGain)
+  if (IsUseLoGain())
     {
 
@@ -436 +479 @@
         gPad->SetLogy(0);
 
-      fHChargeLoGain->DrawCopy(opt);
+      fHChargeLoGain->Draw(opt);
       
       if (fChargeGausFit)
         {
-          if (fFitOK)
+          if (IsFitOK())
             fChargeGausFit->SetLineColor(kGreen);          
           else
             fChargeGausFit->SetLineColor(kRed);
           
-          fChargeGausFit->DrawCopy("same");
+          fChargeGausFit->Draw("same");
         }
       c->Modified();
@@ -453 +496 @@
       gROOT->SetSelectedPad(NULL);
       gStyle->SetOptFit();
-      fHivsLoGain->Draw("prof");
-
+      if (fHivsLoGain)
+        fHivsLoGain->Draw("prof");
       gPad->Modified();
       gPad->Update();
@@ -466 +509 @@
       if (fChargeGausFit)
         {
-          if (fFitOK)
+          if (IsFitOK())
             fChargeGausFit->SetLineColor(kGreen);          
           else
             fChargeGausFit->SetLineColor(kRed);
           
-          fChargeGausFit->DrawCopy("same");
+          fChargeGausFit->Draw("same");
         }
 
@@ -482 +525 @@
         gPad->SetLogy(0);
       
-      fHChargeLoGain->DrawCopy(opt);
+      fHChargeLoGain->Draw(opt);
       c->Modified();
       c->Update();
@@ -493 +536 @@
       gROOT->SetSelectedPad(NULL);
       gStyle->SetOptFit();
-      fHivsLoGain->Draw("prof");
+      if (fHivsLoGain)
+        fHivsLoGain->Draw("prof");
       gPad->Modified();
       gPad->Update();
@@ -506 +550 @@
   gPad->SetTicks();  
   gPad->SetLogy(0);
-  fHTimeHiGain->DrawCopy(opt);
+  fHTimeHiGain->Draw(opt);
   c->Modified();
   c->Update();
   
-  if (fUseLoGain)
+  if (IsUseLoGain())
       {
         
@@ -516 +560 @@
         gPad->SetTicks();
         gPad->SetLogy(0);
-        fHTimeLoGain->DrawCopy(opt);
+        fHTimeLoGain->Draw(opt);
         c->Modified();
         c->Update();
@@ -527 +571 @@
               fTimeGausFit->SetLineColor(kGreen);
             
-            fTimeGausFit->DrawCopy("same");
+            fTimeGausFit->Draw("same");
             c->Modified();
             c->Update();
@@ -541 +585 @@
               fTimeGausFit->SetLineColor(kGreen);
             
-            fTimeGausFit->DrawCopy("same");
+            fTimeGausFit->Draw("same");
             c->Modified();
             c->Update();
@@ -549 +593 @@
         gPad->SetTicks();
         gPad->SetLogy(0);
-        fHTimeLoGain->DrawCopy(opt);    
+        fHTimeLoGain->Draw(opt);        
         c->Modified();
         c->Update();
@@ -559 +603 @@
     c->cd(7);
     gPad->SetTicks();
-    fHChargevsNHiGain->DrawCopy(opt);
+    fHChargevsNHiGain->Draw(opt);
     c->Modified();
     c->Update();
@@ -565 +609 @@
     c->cd(8);
     gPad->SetTicks();
-    fHChargevsNLoGain->DrawCopy(opt);
+    fHChargevsNLoGain->Draw(opt);
     c->Modified();
     c->Update();
 
-
+    return;
 }
 
@@ -575 +619 @@
 {
 
+  *fLog << inf << "Fit Hi Gain vs Lo Gain " << endl;
+
   if (fHivsLoGain)
+    return;
+
+  if ((!fHiGains) || (!fLoGains) || (fHiGains->GetSize() == 0) || (fLoGains->GetSize() == 0))
     return;
 
@@ -587 +636 @@
   titleHiLoGain += fPixId;
   fHivsLoGain->SetName(titleHiLoGain.Data());
-
   
   for (Int_t i=0;i<fTotalEntries;i++)
     fHivsLoGain->Fill(fHiGains->At(i),fLoGains->At(i),1);
   
-  fHivsLoGain->Fit("pol1","rq","",fHivsLoGain->GetMean()-2.5*fHivsLoGain->GetRMS(),fHivsLoGain->GetMean()+2.*fHivsLoGain->GetRMS());
+  fHivsLoGain->Fit("pol1","rq","",fHivsLoGain->GetMean()-2.5*fHivsLoGain->GetRMS(),
+                                  fHivsLoGain->GetMean()+2.0*fHivsLoGain->GetRMS());
   
   fOffset = fHivsLoGain->GetFunction("pol1")->GetParameter(0);
@@ -772 +821 @@
   if (fChargeProb < gkProbLimit) 
     {
-      *fLog << warn << "WARNING: Fit Probability " << fChargeProb 
-            << " is smaller than the allowed value: " << gkProbLimit << endl;
-      fFitOK = kFALSE;
+      //      *fLog << warn << "WARNING: Fit Probability " << fChargeProb 
+      //            << " is smaller than the allowed value: " << gkProbLimit << endl;
+      CLRBIT(fFlags,kFitOK);
       return kFALSE;
     }
   
-  fFitOK = kTRUE;
+  SETBIT(fFlags,kFitOK);
   return kTRUE;
 }
@@ -852 +901 @@
   if (fChargeProb < gkProbLimit) 
     {
-      *fLog << warn << "WARNING: Fit Probability " << fChargeProb 
-            << " is smaller than the allowed value: " << gkProbLimit << endl;
-      fFitOK = kFALSE;
+      //      *fLog << warn << "WARNING: Fit Probability " << fChargeProb 
+      //            << " is smaller than the allowed value: " << gkProbLimit << endl;
+      CLRBIT(fFlags,kFitOK);
       return kFALSE;
     }
   
-  
-  fFitOK = kTRUE;
+  SETBIT(fFlags,kFitOK);
     
   return kTRUE;