Changeset 2641 for trunk/MagicSoft

Timestamp:

12/11/03 14:01:52 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• manalysis/MExtractedSignalPix.cc (modified) (3 diffs)
• manalysis/MExtractedSignalPix.h (modified) (4 diffs)
• mhist/MHCalibrationBlindPixel.cc (modified) (11 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -9 +9 @@
         - calculate signal with only 6 most significant slices (2 before, 4 after the maximum)
 
+   * mhist/MHCalibrationBlindPixel:
+        - do the consistency check fitting the pedestal
+
+   * mhist/MHCalibrationPixel:
+        - store Hi Gain vs. Lo Gain values to extract the conversion factor
 
  2003/12/11: Thomas Bretz

trunk/MagicSoft/Mars/manalysis/MExtractedSignalPix.cc

@@ -41 +41 @@
 
 MExtractedSignalPix::MExtractedSignalPix(const char* name, const char* title)
-  : fExtractedSignal(-1.),
-    fExtractedSignalError(-1.),
+  : fExtractedSignalHiGain(-1.),
+    fExtractedSignalHiGainError(-1.),
+    fExtractedSignalLoGain(-1.),
+    fExtractedSignalLoGainError(-1.),
     fIsLoGainUsed(kFALSE),
     fNumHiGainSaturated(0),
@@ -62 +64 @@
 {
 
-  fExtractedSignal = -1.;
-  fExtractedSignalError = -1.;
+  fExtractedSignalHiGain = -1.;
+  fExtractedSignalHiGainError = -1.;
   fIsLoGainUsed = kFALSE;
   fNumHiGainSaturated = 0;
@@ -75 +77 @@
   *fLog << all << GetDescriptor() << ":" << endl;
 
-  *fLog << " Signal: " << fExtractedSignal 
-        << " +- " << fExtractedSignalError
+  *fLog << " Signal: " << fExtractedSignalHiGain
+        << " +- " << fExtractedSignalHiGainError
         << " LoGain? " << fIsLoGainUsed
         << " Nr. Sat. Hi Gain: " <<  fNumHiGainSaturated

trunk/MagicSoft/Mars/manalysis/MExtractedSignalPix.h

@@ -10 +10 @@
 private:
 
-    Float_t fExtractedSignal;      // mean value of the extracted signal
-    Float_t fExtractedSignalError; // error of the mean value of the extracted signal
+    Float_t fExtractedSignalHiGain;      // mean value of the extracted signal
+    Float_t fExtractedSignalHiGainError; // error of the mean value of the extracted signal
+    Float_t fExtractedSignalLoGain;      // mean value of the extracted signal
+    Float_t fExtractedSignalLoGainError; // error of the mean value of the extracted signal
     Bool_t fIsLoGainUsed;
     Byte_t fNumHiGainSaturated;
@@ -25 +27 @@
     void Clear(Option_t *o="");
 
-    Float_t GetExtractedSignal()      const   { return fExtractedSignal; }
-    Float_t GetExtractedSignalError() const   { return fExtractedSignalError; }
+    Float_t GetExtractedSignalHiGain()      const   { return fExtractedSignalHiGain; }
+    Float_t GetExtractedSignalHiGainError() const   { return fExtractedSignalHiGainError; }
+
+    Float_t GetExtractedSignalLoGain()      const   { return fExtractedSignalLoGain; }
+    Float_t GetExtractedSignalLoGainError() const   { return fExtractedSignalLoGainError; }
 
     Float_t GetMeanArrivalTime()      const   { return fMeanArrivalTime; }
@@ -33 +38 @@
     void SetExtractedSignal(Float_t sig, Float_t sigerr)   
                                         { 
-                                          fExtractedSignal = sig; 
-                                          fExtractedSignalError = sigerr; 
+                                          fExtractedSignalHiGain = sig; 
+                                          fExtractedSignalHiGainError = sigerr; 
+                                        }
+
+    void SetExtractedSignal(Float_t sighi, Float_t sighierr,Float_t siglo, Float_t sigloerr)   
+                                        { 
+                                          fExtractedSignalHiGain = sighi; 
+                                          fExtractedSignalHiGainError = sighierr; 
+                                          fExtractedSignalLoGain = siglo; 
+                                          fExtractedSignalLoGainError = sigloerr; 
                                         }
 
@@ -49 +62 @@
     Bool_t IsLoGainUsed()               { return fIsLoGainUsed; }
 
-    Bool_t IsValid() const              { return fExtractedSignal >= 0 || fExtractedSignalError >= 0; }
+    Bool_t IsValid() const              { return fExtractedSignalHiGain >= 0. || fExtractedSignalHiGainError >= 0.; }
 
     void PrintOut();

trunk/MagicSoft/Mars/mhist/MHCalibrationBlindPixel.cc

@@ -62 +62 @@
 //
 MHCalibrationBlindPixel::MHCalibrationBlindPixel(const char *name, const char *title)
-    : fSinglePheFit(NULL), fTimeGausFit(NULL)
+  : fSinglePheFit(NULL), fTimeGausFit(NULL), fSinglePhePedFit(NULL),
+    fLambda(0.), fMu0(0.), fMu1(0.), fSigma0(0.), fSigma1(0.),
+    fLambdaErr(0.), fMu0Err(0.), fMu1Err(0.), fSigma0Err(0.), fSigma1Err(0.),    
+    fChisquare(0.), fProb(0.),  fNdf(0),
+    fMeanTime(0.),  fMeanTimeErr(0.), fSigmaTime(0.), fSigmaTimeErr(0.),
+    fLambdaCheck(0.), fLambdaCheckErr(0.)
 {
 
@@ -77 +82 @@
     fHBlindPixelCharge->SetXTitle("Sum FADC Slices");
     fHBlindPixelCharge->SetYTitle("Nr. of events");
-    fHBlindPixelCharge->Sumw2();
+    //    fHBlindPixelCharge->Sumw2();
 
     fErrBlindPixelChargefirst = 0.;
@@ -120 +125 @@
   if (fSinglePheFit)
     delete fSinglePheFit;
+  if (fSinglePhePedFit)
+    delete fSinglePhePedFit;
   if (fTimeGausFit)
     delete fTimeGausFit;
@@ -155 +162 @@
   fFitLegend->AddText(line1);
 
+  const TString line6 =
+  Form("Mean #lambda (check) = %2.2f #pm %2.2f",GetLambdaCheck(),GetLambdaCheckErr());
+  fFitLegend->AddText(line6);
+
   const TString line2 = 
   Form("Pedestal: #mu_{0} = %2.2f #pm %2.2f",GetMu0(),GetMu0Err());
@@ -215 +226 @@
       {
         if (fFitOK)
-          fSinglePheFit->SetLineColor(kGreen);          
+          fSinglePheFit->SetLineColor(kGreen);          
         else
           fSinglePheFit->SetLineColor(kRed);
@@ -222 +233 @@
         c->Modified();
         c->Update();
+
+        if (fSinglePhePedFit)
+          {
+            fSinglePhePedFit->SetLineColor(kBlue);
+            fSinglePhePedFit->DrawCopy("same");
+          }
       }
+
 
     c->cd(2);
@@ -311 +329 @@
   // otherwise the fit goes gaga because of high number of dimensions ...
   //
-  const Stat_t   entries      = fHBlindPixelCharge->GetSumOfWeights();
-  const Double_t lambda_guess = 0.2;
+  const Stat_t   entries      = fHBlindPixelCharge->GetEntries();
+  const Double_t lambda_guess = 0.5;
   const Double_t mu_0_guess = fHBlindPixelCharge->GetBinCenter(fHBlindPixelCharge->GetMaximumBin());
-  const Double_t si_0_guess = mu_0_guess/5.;
-  const Double_t mu_1_guess = mu_0_guess + 50.;
+  const Double_t si_0_guess = 20.;
+  const Double_t mu_1_guess = mu_0_guess + 100.;
   const Double_t si_1_guess = si_0_guess + si_0_guess;
 
@@ -321 +339 @@
   fSinglePheFit->SetParameters(lambda_guess,mu_0_guess,mu_1_guess,si_0_guess,si_1_guess,entries);
   fSinglePheFit->SetParNames("#lambda","#mu_0","#mu_1","#sigma_0","#sigma_1","area");
-  fSinglePheFit->SetParLimits(0,0.,5.);
+  fSinglePheFit->SetParLimits(0,0.,3.);
   fSinglePheFit->SetParLimits(1,rmin,rmax);
   fSinglePheFit->SetParLimits(2,rmin,rmax);
   fSinglePheFit->SetParLimits(3,1.0,rmax-rmin);
   fSinglePheFit->SetParLimits(4,1.7,rmax-rmin);
-  fSinglePheFit->SetParLimits(5,0.,2.5*entries);
+  fSinglePheFit->SetParLimits(5,0.,1.5*entries);
   //
   // Normalize the histogram to facilitate faster fitting of the area
@@ -355 +373 @@
 
   fHBlindPixelCharge->Fit(fSinglePheFit,opt);
+  fHBlindPixelCharge->Fit(fSinglePheFit,opt);
 
   fLambda = fSinglePheFit->GetParameter(0);
@@ -372 +391 @@
   fNdf       = fSinglePheFit->GetNDF();
 
+  // Perform the cross-check fitting only the pedestal:
+  fSinglePhePedFit = new TF1("GausPed","gaus",rmin,fMu0);
+  fHBlindPixelCharge->Fit(fSinglePhePedFit,opt);
+
+  Double_t pedarea = fSinglePhePedFit->GetParameter(0)*gkSq2Pi*fSinglePhePedFit->GetParameter(2);
+  cout << "Parameter0: " << fSinglePhePedFit->GetParameter(0) << endl;
+  cout << "Parameter2: " << fSinglePhePedFit->GetParameter(2) << endl;
+  cout << "Pedarea: " << pedarea << endl;
+  cout << "entries: " << entries << endl;
+  fLambdaCheck     = TMath::Log((double)entries/pedarea);
+  fLambdaCheckErr  = fSinglePhePedFit->GetParError(0)/fSinglePhePedFit->GetParameter(0)
+                     + fSinglePhePedFit->GetParError(2)/fSinglePhePedFit->GetParameter(2);
+
   *fLog << "Results of the Blind Pixel Fit: " << endl;
   *fLog << "Chisquare: " << fChisquare << endl;
@@ -380 +412 @@
   //
   // The fit result is accepted under condition
-  // The Probability is greater than gkProbLimit (default 0.01 == 99%)
+  // The fit result is accepted under condition
+  // The Probability is greater than gkProbLimit (default 0.001 == 99.7%)
   //
   if (fProb < gkProbLimit)