Changeset 7059 for trunk/MagicSoft/Mars

Timestamp:

05/18/05 19:22:05 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mcalib/MCalibrationChargeCalc.cc (modified) (2 diffs)
• mcalib/MCalibrationChargeCam.cc (modified) (4 diffs)
• msignal/MExtractPINDiode.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -62 +62 @@
      - for some sceen output the manipulator (inf) was missing
 
-   * msignal/MExtractPINDiode.cc:
+   * msignal/MExtractPINDiode.cc, mcalib/MCalibrationChargeCalc.cc,
+     mcalib/MCalibrationChargeCam.cc:
      - fixed a problem with the fit (it always tried to display
        the fit-function somewhere)

trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc

@@ -1247 +1247 @@
 
       TH1D *hist = camphes.ProjectionS(TArrayI(),TArrayI(1,&i),"_py",100);
-      hist->Fit("gaus","Q");
+      hist->Fit("gaus","Q0");
       const Float_t mean  = hist->GetFunction("gaus")->GetParameter(1);
       const Float_t sigma = hist->GetFunction("gaus")->GetParameter(2);
@@ -1771 +1771 @@
 
       TH1D *hist = camffactor.ProjectionS(TArrayI(),area,"_py",100);
-      hist->Fit("gaus","Q");
+      hist->Fit("gaus","Q0");
       const Float_t mean  = hist->GetFunction("gaus")->GetParameter(1);
       const Float_t sigma = hist->GetFunction("gaus")->GetParameter(2);

trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCam.cc

@@ -768 +768 @@
       // Fix the ranges, as found by Nadia
       if(aidx == 0)
-        {h->Fit("fit","REQ", "",0.4,1.5);}
+        h->Fit(fit, "REQ0", "",0.4,1.5);
       else
-        {h->Fit("fit","REQ", "",1.,5.);}
+        h->Fit(fit ,"REQ0", "",1.,5.);
     }
   else
     {
-      h->Fit("gaus","Q");
+      h->Fit("gaus","Q0");
       fit = h->GetFunction("gaus");
     }
@@ -787 +787 @@
           // Fix the ranges, as found by Nadia
           if(aidx == 0)
-            {h->Fit("fit","REQ", "",0.4,1.5);}
+            h->Fit(fit, "REQ0", "",0.4,1.5);
           else
-            {h->Fit("fit","REQ", "",1.,5.);}
+            h->Fit(fit, "REQ0", "",1.,5.);
         }
       else
         {
-          h->Fit("gaus","MREQ");
+          h->Fit("gaus","MREQ0");
           fit = h->GetFunction("gaus");
         }
@@ -896 +896 @@
       // Fix the ranges, as found by Nadia
       if(aidx == 0)
-        {h->Fit("fit","REQ", "",0.07,0.3);}
+        {h->Fit("fit","REQ0", "",0.07,0.3);}
       else
-        {h->Fit("fit","REQ", "",0.15,1.0);}
+        {h->Fit("fit","REQ0", "",0.15,1.0);}
     }
   else
     {
-      h->Fit("gaus","Q");
+      h->Fit("gaus","Q0");
       fit = h->GetFunction("gaus");
     }
@@ -915 +915 @@
           // Fix the ranges, as found by Nadia
           if(aidx == 0)
-            {h->Fit("fit","REQ", "",0.07,0.3);}
+            {h->Fit("fit","REQ0", "",0.07,0.3);}
           else
-            {h->Fit("fit","REQ", "",0.15,1.0);}
+            {h->Fit("fit","REQ0", "",0.15,1.0);}
         }
       else
         {
-          h->Fit("gaus","MREQ");
+          h->Fit("gaus","MREQ0");
           fit = h->GetFunction("gaus");
         }

trunk/MagicSoft/Mars/msignal/MExtractPINDiode.cc

@@ -354 +354 @@
     }
 
-  // Must be created manually. Otherwise we cannot use N-option
-  TF1 gaus("func", "gaus");
-
-  fSlices->Fit(&gaus, "QN", "", maxpos-fLowerFitLimit,maxpos+fUpperFitLimit);
-  
+  fSlices->Fit("gaus", "Q0", "", maxpos-fLowerFitLimit,maxpos+fUpperFitLimit);
+
+  TF1 &gaus = *fSlices->GetFunction("gaus");
+
   fPINDiode->SetExtractedSignal(gaus.GetParameter(0), gaus.GetParError(0));
   fPINDiode->SetExtractedTime  (gaus.GetParameter(1), gaus.GetParError(1));