Changeset 2973

Timestamp:

01/30/04 10:21:43 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• manalysis/MHPedestalPixel.h (modified) (1 diff)
• mcalib/MHCalibrationBlindPixel.cc (modified) (6 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -23 +23 @@
      - initialize charges histogram with a bigger range
      - use pedestal information to constrain the pedestal fit ranges
+
+   * manalysis/MHPedestalPixel.cc
+     - initialize charges histogram with a bigger range
 
 

trunk/MagicSoft/Mars/manalysis/MHPedestalPixel.h

@@ -17 +17 @@
 
   const Int_t   fChargeNbins;
+  Axis_t  fChargeFirst;
+  Axis_t  fChargeLast;
+
   const Int_t   fChargevsNbins;
-
   const Axis_t  fChargevsNFirst;
   const Axis_t  fChargevsNLast;
   
-  Axis_t  fChargeFirst;
-  Axis_t  fChargeLast;
-
   TH1F* fHPedestalCharge;               //-> Summed FADC slices
   TH1I* fHPedestalChargevsN;            //-> Summed FADC slices vs Event nr.

trunk/MagicSoft/Mars/mcalib/MHCalibrationBlindPixel.cc

@@ -58 +58 @@
 //
 MHCalibrationBlindPixel::MHCalibrationBlindPixel(const char *name, const char *title)
-    :   fBlindPixelChargeNbins(500),
+    :   fBlindPixelChargeNbins(1000),
         fBlindPixelTimeNbins(32),
-        fBlindPixelChargevsNbins(1000),
+        fBlindPixelChargevsNbins(10000),
         fBlindPixelTimeFirst(-0.25),
         fBlindPixelTimeLast(15.75),
@@ -74 +74 @@
 
     // Create a large number of bins, later we will rebin
-    fBlindPixelChargefirst = -100.;
-    fBlindPixelChargelast  = 400.;
+    fBlindPixelChargefirst = -200.;
+    fBlindPixelChargelast  = 800.;
 
     fHBlindPixelCharge = new TH1F("HBlindPixelCharge","Distribution of Summed FADC Slices",
@@ -124 +124 @@
 {
   
-  fBlindPixelChargefirst = -100.;
-  fBlindPixelChargelast  = 400.;
+  fBlindPixelChargefirst = -200.;
+  fBlindPixelChargelast  = 800.;
 
   fLambda    = 0.;
@@ -151 +151 @@
   fLambdaCheckErr = -1.;
   
+  fMeanPedestal     = 0.;
+  fMeanPedestalErr  = 0.;
+  fSigmaPedestal    = 0.;
+  fSigmaPedestalErr = 0.;
+
   fFitFunc = kEPoisson4;
 
@@ -391 +396 @@
     {
     case kEPoisson4:
-      //      fSinglePheFit = new TF1("SinglePheFit",&fPoissonKto4,min,max,5);
       fSinglePheFit = new TF1("SinglePheFit",&fPoissonKto4,min,max,6);
       break;
@@ -436 +440 @@
       
     case kEPoisson4:
-      fSinglePheFit->SetParameters(lambda_guess,mu_0_guess,mu_1_guess,si_0_guess,si_1_guess,norm);
+      if (fMeanPedestal && fSigmaPedestal)
+        fSinglePheFit->SetParameters(lambda_guess,fMeanPedestal,mu_1_guess,fSigmaPedestal,si_1_guess,norm);
+      else
+        fSinglePheFit->SetParameters(lambda_guess,mu_0_guess,mu_1_guess,si_0_guess,si_1_guess,norm);
+
       fSinglePheFit->SetParNames("#lambda","#mu_{0}","#mu_{1}","#sigma_{0}","#sigma_{1}","Area");
+
       fSinglePheFit->SetParLimits(0,0.,1.);
-      fSinglePheFit->SetParLimits(1,-2.,2.);
+
+      if (fMeanPedestal && fSigmaPedestal)
+        fSinglePheFit->SetParLimits(1,fMeanPedestal-fMeanPedestalErr,fMeanPedestal+fMeanPedestalErr);
+      else
+        fSinglePheFit->SetParLimits(1,-3.,0.);
+
       fSinglePheFit->SetParLimits(2,(max-min)/2.,(max-0.05*(max-min)));
-      fSinglePheFit->SetParLimits(3,1.0,(max-min)/2.0);
+
+      if (fMeanPedestal && fSigmaPedestal)
+        fSinglePheFit->SetParLimits(3,fSigmaPedestal-fSigmaPedestalErr,fSigmaPedestal+fSigmaPedestalErr);
+      else
+        fSinglePheFit->SetParLimits(3,1.0,(max-min)/2.0);
+
       fSinglePheFit->SetParLimits(4,1.0,(max-min)/2.5);
       fSinglePheFit->SetParLimits(5,norm-0.5,norm+0.5);