Changeset 4220 for trunk/MagicSoft/Mars

Timestamp:

05/27/04 17:46:26 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mcalib

Files:

• MHCalibrationChargeBlindPix.cc (modified) (2 diffs)
• MHCalibrationChargeBlindPix.h (modified) (4 diffs)

trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeBlindPix.cc

@@ -620 +620 @@
   const Double_t si_1_guess = si_0_guess + si_0_guess;
   // Michele
-  const Double_t lambda_1cat_guess = 0.005;
-  const Double_t lambda_1dyn_guess = 0.002;
+  const Double_t lambda_1cat_guess = 0.05;
+  const Double_t lambda_1dyn_guess = lambda_1cat_guess/10.;
   const Double_t mu_1cat_guess = 1000.;
   const Double_t mu_1dyn_guess = 2500.;
@@ -701 +701 @@
                                  "#sigma_{0}","#sigma_{1cat}","#sigma_{1dyn}",
                                  "Area","offset");
-      fSinglePheFit->SetParLimits(0,0.,0.2);
+      fSinglePheFit->SetParLimits(0,0.,0.5);
       fSinglePheFit->SetParLimits(1,0.,0.05); 
       fSinglePheFit->SetParLimits(2,0.,fSinglePheCut);    
-      fSinglePheFit->SetParLimits(3,fSinglePheCut,3000.);    
-      fSinglePheFit->SetParLimits(4,fSinglePheCut,3500.);    
+      fSinglePheFit->SetParLimits(3,fSinglePheCut,5500.);    
+      fSinglePheFit->SetParLimits(4,1500.,3500.);    
       fSinglePheFit->SetParLimits(5,0.,fSinglePheCut);    
       fSinglePheFit->SetParLimits(6,500.,1000.);    

trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeBlindPix.h

@@ -204 +204 @@
       if (sigma1cat < sigma1dyn)
         return FLT_MAX;
-
+      
       Double_t mu2cat = (2.*mu1cat)-mu0;  
       Double_t mu2dyn = (2.*mu1dyn)-mu0;  
@@ -270 +270 @@
       Double_t sigma0 = par[3];
       Double_t sigma1 = par[4];
+
+      if (sigma0 < 0.0001)
+        return FLT_MAX;
       
       if (sigma1 < sigma0)
@@ -327 +330 @@
       Double_t sigma0 = par[3];
       Double_t sigma1 = par[4];
+      
+      if (sigma0 < 0.0001)
+        return FLT_MAX;
       
       if (sigma1 < sigma0)
@@ -392 +398 @@
       Double_t sigma0 = par[3];
       Double_t sigma1 = par[4];
+      
+      if (sigma0 < 0.0001)
+        return FLT_MAX;
       
       if (sigma1 < sigma0)