Changeset 2318 for trunk/MagicSoft/Mars

Timestamp:

08/26/03 13:50:39 (21 years ago)

Author:

wittek

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• manalysis/MCT1FindSupercuts.cc (modified) (8 diffs)
• manalysis/MCT1Supercuts.cc (modified) (1 diff)
• manalysis/MMinuitInterface.cc (modified) (2 diffs)
• mhist/MHFindSignificance.cc (modified) (15 diffs)

trunk/MagicSoft/Mars/manalysis/MCT1FindSupercuts.cc

@@ -38 +38 @@
 
 #include <TFile.h>
+#include <TArrayD.h>
 #include <TMinuit.h>
 #include <TCanvas.h>
@@ -117 +118 @@
     // transfer current parameter values to MCT1Supercuts
     //
-    super->SetParameters(TArrayD(npar, par));
-
+    // Attention : npar is the number of variable parameters
+    //                  not the total number of parameters
+    //
+    Double_t fMin, fEdm, fErrdef;
+    Int_t     fNpari, fNparx, fIstat;
+    gMinuit->mnstat(fMin, fEdm, fErrdef, fNpari, fNparx, fIstat);
+
+    super->SetParameters(TArrayD(fNparx, par));
+
+    //$$$$$$$$$$$$$$$$$$$$$
+    // for testing
+    //TArrayD checkparameters = super->GetParameters();
+    //gLog << "fcnsupercuts : i, par, checkparameters =" << endl;
+    //for (Int_t i=0; i<fNparx; i++)
+    //{
+    //  gLog << i << ",  " << par[i] << ",  " << checkparameters[i] << endl;
+    //}
+    //$$$$$$$$$$$$$$$$$$$$$
 
     //
@@ -629 +646 @@
 //
 // - for the minimization, the starting values of the parameters are taken as 
-//   MCT1Supercuts::GetParams(fVinit)
+//   MCT1Supercuts::GetParameters(fVinit)
 //
 //----------------------------------------------------------------------
@@ -651 +668 @@
     {
       *fLog << "MCT1FindSupercuts::FindParams; training matrix is not defined... aborting"
+            << endl;
+      return kFALSE;
+    }
+
+    if (fMatrixTrain->GetM().GetNrows() <= 0)
+    {
+      *fLog << "MCT1FindSupercuts::FindParams; training matrix has no entries"
             << endl;
       return kFALSE;
@@ -737 +761 @@
     //
 
-    // get initial values of parameters from MCT1SupercutsCalc
+    // get initial values of parameters from MCT1Supercuts
     fVinit = super.GetParameters();
 
     TString name[fVinit.GetSize()];
-
-    for (Int_t i=0; i<fVinit.GetSize(); i++)
+    fStep.Set(fVinit.GetSize());
+    fLimlo.Set(fVinit.GetSize());
+    fLimup.Set(fVinit.GetSize());
+    fFix.Set(fVinit.GetSize());
+
+    fNpar = fVinit.GetSize();
+
+    for (UInt_t i=0; i<fNpar; i++)
     {
         name[i]   = "p";
         name[i]  += i+1;
         fStep[i]  = TMath::Abs(fVinit[i]/10.0);
-        fLimlo[i] = -10.0;
-        fLimup[i] =  10.0;
+        fLimlo[i] = -100.0;
+        fLimup[i] =  100.0;
         fFix[i]   =     0;
+
+        // vary only first 48 parameters
+        if (i >= 48)
+        {
+          fStep[i] = 0.0;
+          fFix[i]  =   1;
+        }
     }
 
@@ -757 +794 @@
     TStopwatch clock;
     clock.Start();
+
+    *fLog << "before calling CallMinuit" << endl;
 
     MMinuitInterface inter;               
@@ -763 +802 @@
                                  &evtloopfcn, "SIMPLEX", kFALSE);
  
+    *fLog << "after calling CallMinuit" << endl;
+
     *fLog << "Time spent for the minimization in MINUIT :   " << endl;;
     clock.Stop();
@@ -812 +853 @@
     if (fMatrixTest->GetM().GetNrows() <= 0)
     {
-        *fLog << "MCT1FindSupercuts::TestParams; test matrix is empty... aborting" << endl;
+        *fLog << "MCT1FindSupercuts::TestParams; test matrix has no entries" 
+              << endl;
         return kFALSE;
     }

trunk/MagicSoft/Mars/manalysis/MCT1Supercuts.cc

@@ -162 +162 @@
 {
     if (d.GetSize() != fParameters.GetSize())
-        // *fLog << err << ...
+    {
+        *fLog << err << "Sizes of d and of fParameters are different : "
+              << d.GetSize() << ",  " << fParameters.GetSize() << endl;
         return kFALSE;
+    }
 
     fParameters = d;
+
     return kTRUE;
 }
+
+
+
+
+
+
+
+
+
+
+
+

trunk/MagicSoft/Mars/manalysis/MMinuitInterface.cc

@@ -89 +89 @@
     //..............................................
     // Set the maximum number of parameters
-    TMinuit *const save = gMinuit;
+    //TMinuit *const save = gMinuit;
 
     TMinuit &minuit = *new TMinuit(vinit.GetSize());
@@ -284 +284 @@
     minuit.mnexcm("CALL", &iflag, 1, errfcn3);
 
-    delete &minuit;
-    gMinuit = save;
+    // WW : the following statements were commented out because the
+    // Minuit object will still be used;
+    // this may be changed in the future 
+    //delete &minuit;
+    //gMinuit = save;
 
     return kTRUE;

trunk/MagicSoft/Mars/mhist/MHFindSignificance.cc

@@ -68 +68 @@
 #include <TMinuit.h>
 #include <TPaveText.h>
+#include <TStyle.h>
 
 #include "MLog.h"
@@ -297 +298 @@
     delete fGPoly;
     delete fGBackg;
-    delete fCanvas;
+    //delete fCanvas;
 }
 
@@ -348 +349 @@
        Bool_t drawpoly,   Bool_t fitgauss, Bool_t print)
 {
-  *fLog << "MHFindSignificance::FindSigma;" << endl;
+  //*fLog << "MHFindSignificance::FindSigma;" << endl;
 
   fHistOrig = fhist;
@@ -503 +504 @@
   fHist = (TH1*)fHistOrig->Clone("|alpha| plot");
   fHist->Sumw2();
-  fHist->SetNameTitle("Alpha", "alpha plot");
+  fHist->SetNameTitle("alpha", "alpha plot");
   fHist->SetXTitle("|alpha|  [\\circ]");
   fHist->SetYTitle("Counts");
@@ -545 +546 @@
       continue;
     }
-
-
-    *fLog << "before SigmaLiMa : fNon, fNoff, fGamma = " << fNon << ",  "
-          << fNoff << ",  " << fGamma << endl;
 
     Double_t siglima = 0.0;
@@ -570 +567 @@
  
   gROOT->SetSelectedPad(NULL);
+  gStyle->SetPadLeftMargin(0.05);
 
   ccc->cd();
@@ -920 +918 @@
                                          kFALSE);
 
+      *fLog << "FitPolynomial : after CallMinuit()" << endl;
+
       if (rc != 0)
       {
@@ -939 +939 @@
           gMinuit->mnstat(fmin, fedm, errdef, npari, nparx, fIstat);
 
-      //*fLog << "MHFindSignificance::FitPolynomial; fmin, fedm, errdef, npari, nparx, fIstat = "
-      //      << fmin << ",  " << fedm << ",  " << errdef << ",  " << npari
-      //      << ",  " << nparx << ",  " << fIstat << endl;
+      *fLog << "MHFindSignificance::FitPolynomial; fmin, fedm, errdef, npari, nparx, fIstat = "
+            << fmin << ",  " << fedm << ",  " << errdef << ",  " << npari
+            << ",  " << nparx << ",  " << fIstat << endl;
 
 
@@ -969 +969 @@
           fErrors[j] = err;
       }
+
 
       //--------------------------------------------------
@@ -1068 +1069 @@
   for (Int_t i=1; i<=nbins; i++)
       fHist->SetBinError(i, saveError[i-1]);
+
 
   return kTRUE;
@@ -1262 +1264 @@
   TString formulaBackg = "[0]";
   for (Int_t i=1; i<=fDegree; i++)
-      formulaBackg += Form("+[%d]^%d", i, i);
-
-  const TString formulaGauss = Form("[%d]/[%d]*exp(-0.5*((x-[%d])/[%d])^2)",
-                                    fDegree+1, fDegree+3, fDegree+2, fDegree+3);
+      formulaBackg += Form("+[%d]*x^%d", i, i);
+
+  const TString formulaGauss = 
+        Form("[%d]/[%d]*exp(-0.5*((x-[%d])/[%d])^2)",
+             fDegree+1, fDegree+3, fDegree+2, fDegree+3);
 
   TString formula = formulaBackg;
@@ -1723 +1726 @@
 Bool_t MHFindSignificance::DrawFit(const Option_t *opt)
 {
-  *fLog << "entry DrawFit" << endl;
-
     if (fHist == NULL)
       *fLog << "MHFindSignificance::DrawFit; fHist = NULL" << endl;
@@ -1733 +1734 @@
 
     //gStyle->SetOptFit(1011);
+
     gROOT->SetSelectedPad(NULL);    
+    gStyle->SetPadLeftMargin(0.1);
 
     fCanvas->cd();
+
 
     if (fHist)
@@ -1784 +1788 @@
     }
 
-  *fLog << "DrawFit : before text" << endl;
 
     //-------------------------------
@@ -1864 +1867 @@
     pt->SetTextAlign(12);
 
-  *fLog << "DrawFit : before pt->Draw()" << endl;
-
     pt->Draw();
 
     fCanvas->Modified();
     fCanvas->Update();
-
-  *fLog << "exit DrawFit" << endl;
 
     return kTRUE;